diff --git a/package.json b/package.json
index 0582f20cb4..c415f0f03d 100644
--- a/package.json
+++ b/package.json
@@ -13,8 +13,7 @@
     "start": "node loader.js",
     "lint": "eslint --cache .",
     "pretest": "npm run lint",
-    "test": "./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha -- ./tests -t 10000",
-    "test-windows": "./node_modules/.bin/_mocha.cmd ./tests -t 10000"
+    "test": "istanbul cover _mocha tests"
   },
   "dependencies": {
     "async": "~1.5.0",
diff --git a/tests/.mocha.opts b/tests/.mocha.opts
new file mode 100644
index 0000000000..5f4ab1a224
--- /dev/null
+++ b/tests/.mocha.opts
@@ -0,0 +1,2 @@
+--reporter dot
+--timeout 5000