diff --git a/package.json b/package.json
index 50f5dca89..3a48885d3 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
     "js-yaml": "~2.1.3",
     "load-grunt-config": "~0.7.0",
     "load-grunt-tasks": "~0.2.0",
-    "mocha": "^1.21",
+    "mocha": "^1.21.3",
     "mocha-lcov-reporter": "0.0.1",
     "moment": "~2.4.0",
     "nock": "~0.28.1",
diff --git a/test/integration/yaml_suite/run.js b/test/integration/yaml_suite/run.js
index 93c02019b..e0b3d0a75 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(null);
+      this.timeout(0);
       clientManager.create(branch, done);
     });
 
diff --git a/test/unit/specs/http_connector.js b/test/unit/specs/http_connector.js
index 5c5a1e3b7..517a36a0b 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(null);
+      this.timeout(0);
       var cp = require('child_process');
       var path = require('path');
       var fixture = _.partial(path.join, __dirname, '../../fixtures');