diff --git a/.npmignore b/.npmignore
index 35956e4..57cc857 100644
--- a/.npmignore
+++ b/.npmignore
@@ -1,4 +1,4 @@
 coverage/
 .travis.yml
-.min-wid
+.min-wd
 Makefile
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index ee6d926..d1b25cb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,9 +2,10 @@ language: node_js
 before_install:
   - "npm install npm -g"
 node_js:
-  - 0.11
+  - 0.12
   - 0.10
+  - iojs
 env:
-  - TEST_SUITE=unit
+  - TEST_SUITE=test
   - TEST_SUITE=coveralls
 script: "npm run-script $TEST_SUITE"
\ No newline at end of file
diff --git a/Makefile b/Makefile
deleted file mode 100644
index d9bbd4f..0000000
--- a/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-test: node-test browser-test
-
-node-test:
-	@./node_modules/.bin/mocha 
-
-browser-test:
-	@./node_modules/.bin/mochify --wd -R spec
-
-.PHONY: node-test browser-test
\ No newline at end of file
diff --git a/package.json b/package.json
index 174f020..a62b55b 100644
--- a/package.json
+++ b/package.json
@@ -21,13 +21,12 @@
   },
   "homepage": "https://github.com/cryptocoinjs/hdkey",
   "devDependencies": {
-    "mocha": "^1.19.0",
     "coveralls": "^2.10.0",
+    "istanbul": "^0.3.17",
+    "mocha": "^2.2.5",
     "mocha-lcov-reporter": "0.0.1",
-    "istanbul": "^0.2.10",
-    "secure-random": "^1.0.0",
-    "mochify": "^1.1.2",
-    "crypto-browserify": "^3.2.4"
+    "mochify": "^2.10.0",
+    "secure-random": "^1.0.0"
   },
   "dependencies": {
     "bigi": "^1.1.0",
@@ -35,7 +34,8 @@
     "coinstring": "^2.0.0"
   },
   "scripts": {
-    "unit": "./node_modules/.bin/mocha",
+    "browser-test": "mochify --wd -R spec",
+    "test": "standard && mocha",
     "coverage": "./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha -- --reporter list test/*.js",
     "coveralls": "npm run-script coverage && node ./node_modules/.bin/coveralls < coverage/lcov.info"
   }