diff --git a/tests/all.js b/tests/all.js
index 4ddb0e4eb..456497610 100644
--- a/tests/all.js
+++ b/tests/all.js
@@ -11,23 +11,23 @@ describe('All Tests', function() {
 
   after(function() {});
 
-  require('./tests/classes/ServerlessEndpointTest');
-  require('./tests/classes/ServerlessFunctionTest');
-  require('./tests/classes/ServerlessModuleTest');
-  require('./tests/classes/ServerlessComponentTest');
-  require('./tests/classes/ServerlessProjectTest');
-  require('./tests/classes/ServerlessStateTest');
-  require('./tests/actions/TestPluginCustom');
-  require('./tests/actions/TestDefaultActionHook');
-  require('./tests/actions/ProjectCreate');
-  require('./tests/actions/StageCreate');
-  require('./tests/actions/RegionCreate');
-  require('./tests/actions/ComponentCreate');
-  require('./tests/actions/ModuleCreate');
-  require('./tests/actions/FunctionCreate');
-  require('./tests/actions/EnvList');
-  require('./tests/actions/EnvGet');
-  require('./tests/actions/EnvSetUnset');
+  //require('./tests/classes/ServerlessEndpointTest');
+  //require('./tests/classes/ServerlessFunctionTest');
+  //require('./tests/classes/ServerlessModuleTest');
+  //require('./tests/classes/ServerlessComponentTest');
+  //require('./tests/classes/ServerlessProjectTest');
+  //require('./tests/classes/ServerlessStateTest');
+  //require('./tests/actions/TestPluginCustom');
+  //require('./tests/actions/TestDefaultActionHook');
+  //require('./tests/actions/ProjectCreate');
+  //require('./tests/actions/StageCreate');
+  //require('./tests/actions/RegionCreate');
+  //require('./tests/actions/ComponentCreate');
+  //require('./tests/actions/ModuleCreate');
+  //require('./tests/actions/FunctionCreate');
+  //require('./tests/actions/EnvList');
+  //require('./tests/actions/EnvGet');
+  //require('./tests/actions/EnvSetUnset');
   require('./tests/actions/ResourcesDeploy');
   //require('./tests/actions/FunctionRun');
   //require('./tests/actions/FunctionDeploy');
diff --git a/tests/tests/actions/ResourcesDeploy.js b/tests/tests/actions/ResourcesDeploy.js
index 5dd7a5715..a691ed88e 100644
--- a/tests/tests/actions/ResourcesDeploy.js
+++ b/tests/tests/actions/ResourcesDeploy.js
@@ -51,9 +51,10 @@ describe('Test action: Resources Deploy', function() {
           // generate unique bucket name to get a unique CF template on every test.
           // CF will remove the previous bucket for us!
           Project.cloudFormation.Resources['testBucket' + (new Date).getTime().toString()] = { "Type" : "AWS::S3::Bucket" };
-          Project.save();
-
-          done();
+          Project.save()
+          .then(function() {
+            done();
+          });
         });
   });