diff --git a/package.json b/package.json
index 1fb26b813..06ecc7918 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "description": "Ethereum wallet library.",
   "main": "index.js",
   "scripts": {
-    "test": "cd tests && node index.js",
+    "test": "./node_modules/.bin/mocha tests/test-*.js",
     "version": "grunt dist"
   },
   "dependencies": {
@@ -16,7 +16,8 @@
   "devDependencies": {
     "grunt": "^0.4.5",
     "grunt-browserify": "^5.0.0",
-    "grunt-contrib-uglify": "^1.0.1"
+    "grunt-contrib-uglify": "^1.0.1",
+    "mocha": "^3.2.0"
   },
   "keywords": [
     "ethereum",
diff --git a/tests/index.js b/tests/index.js
deleted file mode 100644
index 5be54a9ef..000000000
--- a/tests/index.js
+++ /dev/null
@@ -1,11 +0,0 @@
-'use strict';
-
-var reporter = require('nodeunit').reporters.default;
-
-reporter.run([
-    'run-contract-interface.js',
-    'run-hdnode.js',
-    'run-providers.js',
-    'run-utils.js',
-    'run-wallet.js',
-]);
diff --git a/tests/package.json b/tests/package.json
index b5930ba02..d01b7fe09 100644
--- a/tests/package.json
+++ b/tests/package.json
@@ -3,9 +3,6 @@
   "version": "2.0.0",
   "description": "Scripts to generate Ethereum test cases and run ethers.js against them.",
   "main": "index.js",
-  "dependencies": {
-    "nodeunit": "0.9.1"
-  },
   "devDependencies": {
     "bip39": "2.2.0",
     "bitcoinjs-lib": "2.3.0",
@@ -15,8 +12,6 @@
     "grunt": "^0.4.5",
     "grunt-browserify": "^5.0.0",
     "grunt-contrib-uglify": "^1.0.1",
-    "promise-rationing": "0.0.1",
-    "mocha": "^3.2.0",
     "rlp": "2.0.0",
     "solc": "0.3.5",
     "web3": "0.20.2"