diff --git a/package.json b/package.json
index cb83742b5b..a2d80e6df6 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 test"
   },
   "dependencies": {
     "async": "~1.5.0",
@@ -98,7 +97,7 @@
     "grunt": "~0.4.5",
     "grunt-contrib-watch": "^1.0.0",
     "istanbul": "^0.4.2",
-    "mocha": "~1.13.0"
+    "mocha": "~3.1.0"
   },
   "bugs": {
     "url": "https://github.com/NodeBB/NodeBB/issues"
diff --git a/tests/.jshintrc b/test/.jshintrc
similarity index 100%
rename from tests/.jshintrc
rename to test/.jshintrc
diff --git a/tests/categories.js b/test/categories.js
similarity index 100%
rename from tests/categories.js
rename to test/categories.js
diff --git a/tests/database.js b/test/database.js
similarity index 100%
rename from tests/database.js
rename to test/database.js
diff --git a/tests/database/hash.js b/test/database/hash.js
similarity index 100%
rename from tests/database/hash.js
rename to test/database/hash.js
diff --git a/tests/database/keys.js b/test/database/keys.js
similarity index 100%
rename from tests/database/keys.js
rename to test/database/keys.js
diff --git a/tests/database/list.js b/test/database/list.js
similarity index 100%
rename from tests/database/list.js
rename to test/database/list.js
diff --git a/tests/database/sets.js b/test/database/sets.js
similarity index 100%
rename from tests/database/sets.js
rename to test/database/sets.js
diff --git a/tests/database/sorted.js b/test/database/sorted.js
similarity index 100%
rename from tests/database/sorted.js
rename to test/database/sorted.js
diff --git a/tests/groups.js b/test/groups.js
similarity index 100%
rename from tests/groups.js
rename to test/groups.js
diff --git a/tests/messaging.js b/test/messaging.js
similarity index 100%
rename from tests/messaging.js
rename to test/messaging.js
diff --git a/test/mocha.opts b/test/mocha.opts
new file mode 100644
index 0000000000..5f4ab1a224
--- /dev/null
+++ b/test/mocha.opts
@@ -0,0 +1,2 @@
+--reporter dot
+--timeout 5000
diff --git a/tests/mocks/databasemock.js b/test/mocks/databasemock.js
similarity index 100%
rename from tests/mocks/databasemock.js
rename to test/mocks/databasemock.js
diff --git a/tests/topics.js b/test/topics.js
similarity index 100%
rename from tests/topics.js
rename to test/topics.js
diff --git a/tests/translator-new.js b/test/translator-new.js
similarity index 100%
rename from tests/translator-new.js
rename to test/translator-new.js
diff --git a/tests/translator.js b/test/translator.js
similarity index 100%
rename from tests/translator.js
rename to test/translator.js
diff --git a/tests/user.js b/test/user.js
similarity index 100%
rename from tests/user.js
rename to test/user.js
diff --git a/tests/utils.js b/test/utils.js
similarity index 100%
rename from tests/utils.js
rename to test/utils.js