diff --git a/package.json b/package.json
index bfe0c416..42c8bba9 100644
--- a/package.json
+++ b/package.json
@@ -13,8 +13,8 @@
     "build": "gulp build --production",
     "start": "node server.js",
     "test": "npm run sauce-test",
-    "sauce-test": "mocha",
-    "tunnel": "node test/tunnel.js",
+    "sauce-test": "mocha ./test/integration/tests/",
+    "tunnel": "node ./test/integration/tunnel.js",
     "vi-clean": "rm -rf gemini-report",
     "vi-phantom": "phantomjs --webdriver=4444",
     "vi-update": "gemini update",
diff --git a/test/README.md b/test/integration/README.md
similarity index 100%
rename from test/README.md
rename to test/integration/README.md
diff --git a/test/config.js b/test/integration/config.js
similarity index 100%
rename from test/config.js
rename to test/integration/config.js
diff --git a/test/setup.js b/test/integration/setup.js
similarity index 100%
rename from test/setup.js
rename to test/integration/setup.js
diff --git a/test/test-login.js b/test/integration/tests/test-login.js
similarity index 97%
rename from test/test-login.js
rename to test/integration/tests/test-login.js
index e2736fe1..853d48e5 100644
--- a/test/test-login.js
+++ b/test/integration/tests/test-login.js
@@ -5,7 +5,7 @@ const wd = require('wd');
 const asserters = wd.asserters;   // Commonly used asserters for async waits in the browser
 const chai = require('chai');
 const chaiAsPromised = require('chai-as-promised');
-const config = require('./config.js');
+const config = require('../config.js');
 
 chai.use(chaiAsPromised);
 chai.should();
diff --git a/test/tunnel.js b/test/integration/tunnel.js
similarity index 100%
rename from test/tunnel.js
rename to test/integration/tunnel.js