diff --git a/Makefile b/Makefile
index ece56acc..7ad36363 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ doc:
 	makedoc lib/abstract-class.js lib/schema.js lib/validatable.js -t "JugglingDB API docs"
 
 test:
-	@ONLY=memory ./support/nodeunit/bin/nodeunit test/*_test.*
+	@./node_modules/.bin/mocha --require should test/*.test.js
 
 .PHONY: test
 .PHONY: doc
diff --git a/package.json b/package.json
index 296d97de..36e923e5 100644
--- a/package.json
+++ b/package.json
@@ -60,5 +60,9 @@
     "semicov": "*",
     "nodeunit": ">= 0.6.4",
     "coffee-script": "latest"
+  },
+  "dependencies": {
+    "should": "~1.2.2",
+    "mocha": "~1.8.2"
   }
 }