diff --git a/package.json b/package.json
index 7194b9d..b29d382 100644
--- a/package.json
+++ b/package.json
@@ -25,8 +25,8 @@
     "supertest": "~1.0.1"
   },
   "scripts": {
-    "test-local": "NODE_ENV=test mocha",
-    "test": "NODE_ENV=test ./node_modules/istanbul/lib/cli.js cover ./node_modules/mocha/bin/_mocha -- -R spec",
+    "test-local": "NODE_ENV=test mocha test/*",
+    "test": "NODE_ENV=test ./node_modules/istanbul/lib/cli.js cover ./node_modules/mocha/bin/_mocha -- -R spec test/*",
     "start": "app.js",
     "stop": "pkill -SIGINT CloudBudget"
   }
diff --git a/test/accounts.js b/test/server/accounts.js
similarity index 99%
rename from test/accounts.js
rename to test/server/accounts.js
index b3f2d57..7580f64 100644
--- a/test/accounts.js
+++ b/test/server/accounts.js
@@ -1,6 +1,6 @@
 var should      = require('should'), 
     request     = require('supertest'),
-    app         = require('../server.js'),
+    app         = require('../../server.js'),
     Db          = require('./db.js'),
     globalServer, token, hacker_token, account_id;
 
diff --git a/test/db.js b/test/server/db.js
similarity index 98%
rename from test/db.js
rename to test/server/db.js
index 11fe873..aebfa20 100644
--- a/test/db.js
+++ b/test/server/db.js
@@ -1,6 +1,6 @@
 var mongoose    = require('mongoose'),
     jwt         = require('jsonwebtoken'),
-    security    = require('../config/security');
+    security    = require('../../config/security');
     
 
 var USER_ID = '55c9e2e3d300cc798928cc87',
diff --git a/test/server.js b/test/server/server.js
similarity index 92%
rename from test/server.js
rename to test/server/server.js
index 6b5c6f0..e1c1d2d 100644
--- a/test/server.js
+++ b/test/server/server.js
@@ -1,6 +1,6 @@
 var should = require('should'), 
     request = require('supertest'),
-    app  = require('../server.js'),
+    app  = require('../../server.js'),
     globalServer;
 
 describe('Static resources', function(){
diff --git a/test/users.js b/test/server/users.js
similarity index 98%
rename from test/users.js
rename to test/server/users.js
index cad7dd7..63bba7e 100644
--- a/test/users.js
+++ b/test/server/users.js
@@ -1,11 +1,11 @@
 var should          = require('should'), 
     request         = require('supertest'),
-    app             = require('../server.js'),
+    app             = require('../../server.js'),
     mongoose        = require('mongoose'),
     User            = mongoose.model('User'),
     Db              = require('./db.js'),
     sinon           = require('sinon'),
-    EventEmitter    = require('../app/events/listeners'),
+    EventEmitter    = require('../../app/events/listeners'),
     globalServer, token, hacker_token, account_id, user_id;
 
 describe('API /users', function() {