diff --git a/package.json b/package.json
index 7129e7392..f5377d131 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
         "gitbook-markdown-css": "1.0.1"
     },
     "scripts": {
-        "test": "node_modules/.bin/mocha --reporter spec --timeout 15000"
+        "test": "node_modules/.bin/mocha --reporter spec --timeout 15000 ./test/all.js"
     },
     "repository": {
         "type": "git",
diff --git a/test/all.js b/test/all.js
new file mode 100644
index 000000000..0c1debacb
--- /dev/null
+++ b/test/all.js
@@ -0,0 +1,11 @@
+
+// Parsing
+require('./config');
+require('./readme');
+require('./summary');
+require('./glossary');
+require('./langs');
+require('./parse');
+
+// Output
+require('./output-json');
diff --git a/test/1-config.js b/test/config.js
similarity index 100%
rename from test/1-config.js
rename to test/config.js
diff --git a/test/3-glossary.js b/test/glossary.js
similarity index 100%
rename from test/3-glossary.js
rename to test/glossary.js
diff --git a/test/4-langs.js b/test/langs.js
similarity index 100%
rename from test/4-langs.js
rename to test/langs.js
diff --git a/test/output-json.js b/test/output-json.js
new file mode 100644
index 000000000..8d276c627
--- /dev/null
+++ b/test/output-json.js
@@ -0,0 +1,6 @@
+var mock = require('./mock');
+
+describe('JSON Output', function() {
+
+});
+
diff --git a/test/6-parse.js b/test/parse.js
similarity index 100%
rename from test/6-parse.js
rename to test/parse.js
diff --git a/test/2-readme.js b/test/readme.js
similarity index 100%
rename from test/2-readme.js
rename to test/readme.js
diff --git a/test/5-summary.js b/test/summary.js
similarity index 100%
rename from test/5-summary.js
rename to test/summary.js