diff --git a/test/integration/yaml_suite/run.js b/test/integration/yaml_suite/run.js
index e0b3d0a75..42f66fce2 100644
--- a/test/integration/yaml_suite/run.js
+++ b/test/integration/yaml_suite/run.js
@@ -16,7 +16,7 @@ module.exports = function (branch) {
     // before running any tests...
     before(function (done) {
       // start our personal ES Server
-      this.timeout(0);
+      this.timeout(5 * 60 * 1000);
       clientManager.create(branch, done);
     });
 
diff --git a/test/unit/specs/http_connector.js b/test/unit/specs/http_connector.js
index 517a36a0b..63d7f8839 100644
--- a/test/unit/specs/http_connector.js
+++ b/test/unit/specs/http_connector.js
@@ -364,7 +364,7 @@ describe('Http Connector', function () {
     }
 
     it('destroys any connections created', function (done) {
-      this.timeout(0);
+      this.timeout(5 * 60 * 1000);
       var cp = require('child_process');
       var path = require('path');
       var fixture = _.partial(path.join, __dirname, '../../fixtures');