diff --git a/Gruntfile.js b/Gruntfile.js
index ca48bd216..336e4373a 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -27,7 +27,7 @@ module.exports = function(grunt) {
                     ui: 'bdd',
                     reporter: 'tap'
                 },
-                all: { src: ['test/*.js'] }
+                all: { src: ['test/**/*.js'] }
             },
             jshint: {
                 options: {
diff --git a/test/node_spec.js b/test/red/nodes/Node_spec.js
similarity index 99%
rename from test/node_spec.js
rename to test/red/nodes/Node_spec.js
index 123fbf827..9f5111424 100644
--- a/test/node_spec.js
+++ b/test/red/nodes/Node_spec.js
@@ -15,7 +15,7 @@
  **/
  
 var should = require("should");
-var RedNode = require("../red/nodes/Node");
+var RedNode = require("../../../red/nodes/Node");
 
 describe('Node', function() {
     describe('#constructor',function() {
diff --git a/test/credentials_spec.js b/test/red/nodes/credentials_spec.js
similarity index 100%
rename from test/credentials_spec.js
rename to test/red/nodes/credentials_spec.js
diff --git a/test/node_flows_spec.js b/test/red/nodes/flows_spec.js
similarity index 95%
rename from test/node_flows_spec.js
rename to test/red/nodes/flows_spec.js
index e23c07cfc..45cf63af0 100644
--- a/test/node_flows_spec.js
+++ b/test/red/nodes/flows_spec.js
@@ -16,10 +16,10 @@
  
 var should = require("should");
 var when = require("when");
-var flows = require("../red/nodes/flows");
-var RedNode = require("../red/nodes/Node");
-var RED = require("../red/nodes");
-var events = require("../red/events");
+var flows = require("../../../red/nodes/flows");
+var RedNode = require("../../../red/nodes/Node");
+var RED = require("../../../red/nodes");
+var events = require("../../../red/events");
 
 function loadFlows(testFlows, cb) {
     var storage = {
diff --git a/test/node_registry_spec.js b/test/red/nodes/registry_spec.js
similarity index 91%
rename from test/node_registry_spec.js
rename to test/red/nodes/registry_spec.js
index c83ac15e8..38dde7a5c 100644
--- a/test/node_registry_spec.js
+++ b/test/red/nodes/registry_spec.js
@@ -15,9 +15,9 @@
  **/
 
 var should = require("should");
-var RedNodes = require("../red/nodes");
+var RedNodes = require("../../../red/nodes");
 
-var RedNode = require("../red/nodes/Node");
+var RedNode = require("../../../red/nodes/Node");
 
 describe('NodeRegistry', function() {
     it('automatically registers new nodes',function() {
diff --git a/test/storage_localfilesystem_spec.js b/test/red/storage/localfilesystem_spec.js
similarity index 99%
rename from test/storage_localfilesystem_spec.js
rename to test/red/storage/localfilesystem_spec.js
index 2eaa16353..a13117090 100644
--- a/test/storage_localfilesystem_spec.js
+++ b/test/red/storage/localfilesystem_spec.js
@@ -18,7 +18,7 @@ var should = require("should");
 var fs = require('fs-extra');
 var path = require('path');
 
-var localfilesystem = require("../red/storage/localfilesystem");
+var localfilesystem = require("../../../red/storage/localfilesystem");
 
 describe('LocalFileSystem', function() {
     var userDir = path.join(__dirname,".testUserHome");