diff --git a/migrations/2_deploy_contracts.js b/migrations/2_deploy_contracts.js
index b52a6d09c..8b198c15d 100644
--- a/migrations/2_deploy_contracts.js
+++ b/migrations/2_deploy_contracts.js
@@ -1,3 +1,9 @@
+var Ownable = artifacts.require("ownership/Ownable.sol");
+var Claimable = artifacts.require("ownership/Claimable.sol");
+var LimitBalance = artifacts.require("LimitBalance.sol");
+var SecureTargetBounty = artifacts.require("test-helpers/SecureTargetBounty.sol");
+var InsecureTargetBounty = artifacts.require("test-helpers/InsecureTargetBounty.sol");
+
 module.exports = function(deployer) {
   deployer.deploy(Ownable);
   deployer.deploy(Claimable);
diff --git a/package.json b/package.json
index 24e5ff5dd..ba6e5f71d 100644
--- a/package.json
+++ b/package.json
@@ -8,10 +8,10 @@
     "babel-preset-stage-2": "^6.18.0",
     "babel-preset-stage-3": "^6.17.0",
     "ethereumjs-testrpc": "^3.0.2",
-    "truffle": "^2.1.1"
+    "truffle": "^3.1.1"
   },
   "scripts": {
-    "test": "truffle test",
+    "test": "scripts/test.sh",
     "console": "truffle console",
     "install": "scripts/install.sh"
   },
diff --git a/scripts/test.sh b/scripts/test.sh
new file mode 100755
index 000000000..74383d5ed
--- /dev/null
+++ b/scripts/test.sh
@@ -0,0 +1,7 @@
+#! /bin/bash
+
+testrpc &
+trpc_pid=$!
+node_modules/truffle/cli.js test
+kill -9 $trpc_pid
+
diff --git a/truffle.js b/truffle.js
index dc2d3eaf9..11afd3012 100644
--- a/truffle.js
+++ b/truffle.js
@@ -1,6 +1,9 @@
 module.exports = {
-  rpc: {
-    host: "localhost",
-    port: 8545
+  networks: {
+    development: {
+      host: "localhost",
+      port: 8545,
+      network_id: "*"
+    }
   }
 };