diff --git a/.travis.yml b/.travis.yml
index 1932865..4909f83 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,3 @@
 language: node_js
 node_js:
-  - "0.11"
+  - "6"
diff --git a/package.json b/package.json
index f7bf717..86088c8 100644
--- a/package.json
+++ b/package.json
@@ -10,15 +10,17 @@
     "lodash": "^4.6.1"
   },
   "devDependencies": {
-    "async": "^2.0.0-rc.1",
+    "async": "^2.0.0",
     "chai": "^3.5.0",
     "mocha": "^2.4.5",
-    "mockgoose": "^6.0.0",
-    "mongodb": "^2.1.11",
-    "mongoose": "^4.4.9"
+    "mockgoose": "^7.0.0",
+    "mongoose": "^4.8.6"
+  },
+  "peerDependencies": {
+    "mongoose": "^4.8.6"
   },
   "scripts": {
-    "test": "mocha"
+    "test": "mocha --timeout 60000"
   },
   "repository": {
     "type": "git",
diff --git a/test/index.js b/test/index.js
index 79dc88a..d4b8fe7 100644
--- a/test/index.js
+++ b/test/index.js
@@ -4,8 +4,9 @@ var swaggerMongoose = require('./../lib/index');
 var fs = require('fs');
 var async = require('async');
 var mongoose = require('mongoose');
-var mockgoose = require('mockgoose');
-// mockgoose(mongoose);
+mongoose.Promise = global.Promise; // Mongoose's default Promise is deprecated
+var Mockgoose = require('mockgoose').Mockgoose;
+var mockgoose = new Mockgoose(mongoose);
 var assert = require('chai').assert;
 var Schema = mongoose.Schema;
 var _ = require('lodash');
@@ -13,16 +14,15 @@ var _ = require('lodash');
 describe('swagger-mongoose tests', function () {
 
   before(function(done) {
- 		mockgoose(mongoose).then(function() {
-         	mongoose.connect('mongodb://127.0.0.1:27017/TestingDB', function(err) {
-         	    done(err);
-         	});
- 		     });
-     });
+    mockgoose.prepareStorage().then(function() {
+      mongoose.connect('mongodb://127.0.0.1:27017/TestingDB', function(err) {
+        done(err);
+      });
+    });
+  });
 
 
   afterEach(function (done) {
-
     delete mongoose.models.Pet;
     delete mongoose.models.Address;
     delete mongoose.models.Error;
@@ -30,10 +30,10 @@ describe('swagger-mongoose tests', function () {
     delete mongoose.models.House;
     delete mongoose.models.Car;
     delete mongoose.models.Human;
-    mockgoose.reset(function(){
-      done()
+    mockgoose.helper.reset()
+    .then(function () {
+      done();
     });
-
   });
 
   it('should create an example pet and return all valid properties', function (done) {