diff --git a/.travis.yml b/.travis.yml
index f6bcd19d..8fec527c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,8 @@
 language: node_js
 sudo: false
 node_js:
-  - 0.10
-  - 0.12
   - 4
+  - 6
   - stable
 env:
   - CXX=g++-4.8 CXXFLAGS=-std=c++11
diff --git a/package.json b/package.json
index e67f031d..0c664b78 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,7 @@
     "concat-stream": "^1.5.1",
     "eslint": "^2.9.0",
     "istanbul": "^0.4.5",
-    "mocha": "^2.5.3",
+    "mocha": "^4.0.1",
     "nsp": "^2.6.3",
     "request": "^2.81.0",
     "sinon": "^1.17.7",
diff --git a/test/unit/providers/memory.spec.js b/test/unit/providers/memory.spec.js
index e825bfc2..126bc089 100644
--- a/test/unit/providers/memory.spec.js
+++ b/test/unit/providers/memory.spec.js
@@ -27,7 +27,7 @@ describe('memory provider', function() {
 
   it('should return a stream of the content if found', function(done) {
     store['/index.html'] = 'foobar';
-    return provider({}, '/index.html').then(function(result) {
+    provider({}, '/index.html').then(function(result) {
       var out = '';
       result.stream.on('data', function(data) {
         out += data;
@@ -36,7 +36,7 @@ describe('memory provider', function() {
         expect(out).to.eq('foobar');
         done();
       });
-    });
+    }, done);
   });
 
   it('should return an etag of the content', function() {