diff --git a/package.json b/package.json
index 3c4934d29..0cdd11afe 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
   },
   "scripts": {
     "start": "grunt dev",
-    "test": "grunt build && standard && mocha test/api"
+    "test": "grunt build && standard && mocha test"
   },
   "dependencies": {
     "async": "^1.2.1",
@@ -74,7 +74,8 @@
       "afterEach",
       "before",
       "beforeEach",
-      "describe"
+      "describe",
+      "include"
     ]
   }
 }
diff --git a/test/api/index.js b/test/api/index.js
new file mode 100644
index 000000000..3bdcdae2d
--- /dev/null
+++ b/test/api/index.js
@@ -0,0 +1,10 @@
+;(function () {
+  'use strict'
+
+  // Order of the tests we want to execute
+  require('./checkParams')
+  require('./friendsBasic')
+  require('./singlePod')
+  require('./multiplePods')
+  require('./friendsAdvanced')
+})()
diff --git a/test/index.js b/test/index.js
new file mode 100644
index 000000000..ccebbfe51
--- /dev/null
+++ b/test/index.js
@@ -0,0 +1,6 @@
+;(function () {
+  'use strict'
+
+  // Order of the tests we want to execute
+  require('./api/')
+})()