diff --git a/.travis.yml b/.travis.yml
index ff35c1e..4ceb584 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,9 @@
 language: "node_js"
 node_js:
+  - "8"
   - "7"
   - "6"
   - "5"
   - "4"
-  - 'iojs'
-  - '0.12'
-  - "0.10"
 services:
   - mongodb
diff --git a/index.js b/index.js
index 0c2ac09..9e572f7 100644
--- a/index.js
+++ b/index.js
@@ -7,7 +7,8 @@
 function findOrCreatePlugin(schema, options) {
   schema.statics.findOrCreate = function findOrCreate(conditions, doc, options, callback) {
     var self = this;
-    var Promise = self.base.Promise.ES6;
+    // When using Mongoose 5.0.x and upper, we must use self.base.Promise
+    var Promise = self.base.Promise.ES6 ? self.base.Promise.ES6 : self.base.Promise;
     if (arguments.length < 4) {
       if (typeof options === 'function') {
         // Scenario: findOrCreate(conditions, doc, callback)
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..5620587
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,368 @@
+{
+    "name": "mongoose-findorcreate",
+    "version": "3.0.0",
+    "lockfileVersion": 1,
+    "requires": true,
+    "dependencies": {
+        "async": {
+            "version": "2.1.4",
+            "resolved": "https://registry.npmjs.org/async/-/async-2.1.4.tgz",
+            "integrity": "sha1-LSFgx3iAMuTdbL4lAvH5osj2zeQ=",
+            "dev": true,
+            "requires": {
+                "lodash": "4.17.5"
+            }
+        },
+        "bluebird": {
+            "version": "3.5.0",
+            "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz",
+            "integrity": "sha1-eRQg1/VR7qKJdFOop3ZT+WYG1nw=",
+            "dev": true
+        },
+        "bson": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/bson/-/bson-1.0.4.tgz",
+            "integrity": "sha1-k8ENOeqltYQVy8QFLz5T5WKwtyw=",
+            "dev": true
+        },
+        "commander": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/commander/-/commander-2.3.0.tgz",
+            "integrity": "sha1-/UMOiJgy7DU7ms0d4hfBHLPu+HM=",
+            "dev": true
+        },
+        "debug": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+            "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
+            "dev": true,
+            "requires": {
+                "ms": "0.7.1"
+            },
+            "dependencies": {
+                "ms": {
+                    "version": "0.7.1",
+                    "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
+                    "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
+                    "dev": true
+                }
+            }
+        },
+        "diff": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz",
+            "integrity": "sha1-fyjS657nsVqX79ic5j3P2qPMur8=",
+            "dev": true
+        },
+        "escape-string-regexp": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz",
+            "integrity": "sha1-Tbwv5nTnGUnK8/smlc5/LcHZqNE=",
+            "dev": true
+        },
+        "glob": {
+            "version": "3.2.11",
+            "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
+            "integrity": "sha1-Spc/Y1uRkPcV0QmH1cAP0oFevj0=",
+            "dev": true,
+            "requires": {
+                "inherits": "2.0.3",
+                "minimatch": "0.3.0"
+            }
+        },
+        "growl": {
+            "version": "1.9.2",
+            "resolved": "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz",
+            "integrity": "sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=",
+            "dev": true
+        },
+        "inherits": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+            "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+            "dev": true
+        },
+        "jade": {
+            "version": "0.26.3",
+            "resolved": "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz",
+            "integrity": "sha1-jxDXl32NefL2/4YqgbBRPMslaGw=",
+            "dev": true,
+            "requires": {
+                "commander": "0.6.1",
+                "mkdirp": "0.3.0"
+            },
+            "dependencies": {
+                "commander": {
+                    "version": "0.6.1",
+                    "resolved": "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz",
+                    "integrity": "sha1-+mihT2qUXVTbvlDYzbMyDp47GgY=",
+                    "dev": true
+                },
+                "mkdirp": {
+                    "version": "0.3.0",
+                    "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz",
+                    "integrity": "sha1-G79asbqCevI1dRQ0kEJkVfSB/h4=",
+                    "dev": true
+                }
+            }
+        },
+        "kareem": {
+            "version": "2.0.4",
+            "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.0.4.tgz",
+            "integrity": "sha512-emosNz0ruOjDkyH2QvnL8m65Mzl8D0IBP3PukQmGl2cjhqMrQajq3OcLdLeBV5GzPfqmsuDQB0WkZOHVhyK6jg==",
+            "dev": true
+        },
+        "lodash": {
+            "version": "4.17.5",
+            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz",
+            "integrity": "sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw==",
+            "dev": true
+        },
+        "lodash.get": {
+            "version": "4.4.2",
+            "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
+            "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
+            "dev": true
+        },
+        "lru-cache": {
+            "version": "2.7.3",
+            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz",
+            "integrity": "sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=",
+            "dev": true
+        },
+        "minimatch": {
+            "version": "0.3.0",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
+            "integrity": "sha1-J12O2qxPG7MyZHIInnlJyDlGmd0=",
+            "dev": true,
+            "requires": {
+                "lru-cache": "2.7.3",
+                "sigmund": "1.0.1"
+            }
+        },
+        "minimist": {
+            "version": "0.0.8",
+            "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+            "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+            "dev": true
+        },
+        "mkdirp": {
+            "version": "0.5.1",
+            "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+            "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+            "dev": true,
+            "requires": {
+                "minimist": "0.0.8"
+            }
+        },
+        "mocha": {
+            "version": "2.5.3",
+            "resolved": "https://registry.npmjs.org/mocha/-/mocha-2.5.3.tgz",
+            "integrity": "sha1-FhvlvetJZ3HrmzV0UFC2IrWu/Fg=",
+            "dev": true,
+            "requires": {
+                "commander": "2.3.0",
+                "debug": "2.2.0",
+                "diff": "1.4.0",
+                "escape-string-regexp": "1.0.2",
+                "glob": "3.2.11",
+                "growl": "1.9.2",
+                "jade": "0.26.3",
+                "mkdirp": "0.5.1",
+                "supports-color": "1.2.0",
+                "to-iso-string": "0.0.2"
+            }
+        },
+        "mongodb": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.0.2.tgz",
+            "integrity": "sha512-E50FmpSQchZAimn2uPIegoNoH9UQYR1yiGHtQPmmg8/Ekc97w6owHoqaBoz+assnd9V5LxMzmQ/VEWMsQMgZhQ==",
+            "dev": true,
+            "requires": {
+                "mongodb-core": "3.0.2"
+            }
+        },
+        "mongodb-core": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-3.0.2.tgz",
+            "integrity": "sha512-p1B0qwFQUw6C1OlFJnrOJp8KaX7MuGoogRbTaupRt0y+pPRkMllHWtE9V6i1CDtTvI3/3sy2sQwqWez7zuXEAA==",
+            "dev": true,
+            "requires": {
+                "bson": "1.0.4",
+                "require_optional": "1.0.1"
+            }
+        },
+        "mongoose": {
+            "version": "5.0.4",
+            "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.0.4.tgz",
+            "integrity": "sha512-FHH27E2vXemU0Nb6z3so7mO1/UwEZHyM/XMBJcVkmfpTcKRSZ5CmJoIk12yN/U2pFNFTILVbLFWCTD+mB5kU5w==",
+            "dev": true,
+            "requires": {
+                "async": "2.1.4",
+                "bson": "1.0.4",
+                "kareem": "2.0.4",
+                "lodash.get": "4.4.2",
+                "mongodb": "3.0.2",
+                "mongoose-legacy-pluralize": "1.0.2",
+                "mpath": "0.3.0",
+                "mquery": "3.0.0",
+                "ms": "2.0.0",
+                "regexp-clone": "0.0.1",
+                "sliced": "1.0.1"
+            }
+        },
+        "mongoose-legacy-pluralize": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/mongoose-legacy-pluralize/-/mongoose-legacy-pluralize-1.0.2.tgz",
+            "integrity": "sha512-Yo/7qQU4/EyIS8YDFSeenIvXxZN+ld7YdV9LqFVQJzTLye8unujAWPZ4NWKfFA+RNjh+wvTWKY9Z3E5XM6ZZiQ==",
+            "dev": true
+        },
+        "mpath": {
+            "version": "0.3.0",
+            "resolved": "https://registry.npmjs.org/mpath/-/mpath-0.3.0.tgz",
+            "integrity": "sha1-elj3iem1/TyUUgY0FXlg8mvV70Q=",
+            "dev": true
+        },
+        "mquery": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/mquery/-/mquery-3.0.0.tgz",
+            "integrity": "sha512-WL1Lk8v4l8VFSSwN3yCzY9TXw+fKVYKn6f+w86TRzOLSE8k1yTgGaLBPUByJQi8VcLbOdnUneFV/y3Kv874pnQ==",
+            "dev": true,
+            "requires": {
+                "bluebird": "3.5.0",
+                "debug": "2.6.9",
+                "regexp-clone": "0.0.1",
+                "sliced": "0.0.5"
+            },
+            "dependencies": {
+                "debug": {
+                    "version": "2.6.9",
+                    "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+                    "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+                    "dev": true,
+                    "requires": {
+                        "ms": "2.0.0"
+                    }
+                },
+                "sliced": {
+                    "version": "0.0.5",
+                    "resolved": "https://registry.npmjs.org/sliced/-/sliced-0.0.5.tgz",
+                    "integrity": "sha1-XtwETKTrb3gW1Qui/GPiXY/kcH8=",
+                    "dev": true
+                }
+            }
+        },
+        "ms": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+            "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+            "dev": true
+        },
+        "regexp-clone": {
+            "version": "0.0.1",
+            "resolved": "https://registry.npmjs.org/regexp-clone/-/regexp-clone-0.0.1.tgz",
+            "integrity": "sha1-p8LgmJH9vzj7sQ03b7cwA+aKxYk=",
+            "dev": true
+        },
+        "require_optional": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.1.tgz",
+            "integrity": "sha512-qhM/y57enGWHAe3v/NcwML6a3/vfESLe/sGM2dII+gEO0BpKRUkWZow/tyloNqJyN6kXSl3RyyM8Ll5D/sJP8g==",
+            "dev": true,
+            "requires": {
+                "resolve-from": "2.0.0",
+                "semver": "5.5.0"
+            }
+        },
+        "resolve-from": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz",
+            "integrity": "sha1-lICrIOlP+h2egKgEx+oUdhGWa1c=",
+            "dev": true
+        },
+        "semver": {
+            "version": "5.5.0",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
+            "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==",
+            "dev": true
+        },
+        "should": {
+            "version": "13.2.1",
+            "resolved": "https://registry.npmjs.org/should/-/should-13.2.1.tgz",
+            "integrity": "sha512-l+/NwEMO+DcstsHEwPHRHzC9j4UOE3VQwJGcMWSsD/vqpqHbnQ+1iSHy64Ihmmjx1uiRPD9pFadTSc3MJtXAgw==",
+            "dev": true,
+            "requires": {
+                "should-equal": "2.0.0",
+                "should-format": "3.0.3",
+                "should-type": "1.4.0",
+                "should-type-adaptors": "1.1.0",
+                "should-util": "1.0.0"
+            }
+        },
+        "should-equal": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/should-equal/-/should-equal-2.0.0.tgz",
+            "integrity": "sha512-ZP36TMrK9euEuWQYBig9W55WPC7uo37qzAEmbjHz4gfyuXrEUgF8cUvQVO+w+d3OMfPvSRQJ22lSm8MQJ43LTA==",
+            "dev": true,
+            "requires": {
+                "should-type": "1.4.0"
+            }
+        },
+        "should-format": {
+            "version": "3.0.3",
+            "resolved": "https://registry.npmjs.org/should-format/-/should-format-3.0.3.tgz",
+            "integrity": "sha1-m/yPdPo5IFxT04w01xcwPidxJPE=",
+            "dev": true,
+            "requires": {
+                "should-type": "1.4.0",
+                "should-type-adaptors": "1.1.0"
+            }
+        },
+        "should-type": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/should-type/-/should-type-1.4.0.tgz",
+            "integrity": "sha1-B1bYzoRt/QmEOmlHcZ36DUz/XPM=",
+            "dev": true
+        },
+        "should-type-adaptors": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/should-type-adaptors/-/should-type-adaptors-1.1.0.tgz",
+            "integrity": "sha512-JA4hdoLnN+kebEp2Vs8eBe9g7uy0zbRo+RMcU0EsNy+R+k049Ki+N5tT5Jagst2g7EAja+euFuoXFCa8vIklfA==",
+            "dev": true,
+            "requires": {
+                "should-type": "1.4.0",
+                "should-util": "1.0.0"
+            }
+        },
+        "should-util": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/should-util/-/should-util-1.0.0.tgz",
+            "integrity": "sha1-yYzaN0qmsZDfi6h8mInCtNtiAGM=",
+            "dev": true
+        },
+        "sigmund": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
+            "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=",
+            "dev": true
+        },
+        "sliced": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/sliced/-/sliced-1.0.1.tgz",
+            "integrity": "sha1-CzpmK10Ewxd7GSa+qCsD+Dei70E=",
+            "dev": true
+        },
+        "supports-color": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.2.0.tgz",
+            "integrity": "sha1-/x7R5hFp0Gs88tWI4YixjYhH4X4=",
+            "dev": true
+        },
+        "to-iso-string": {
+            "version": "0.0.2",
+            "resolved": "https://registry.npmjs.org/to-iso-string/-/to-iso-string-0.0.2.tgz",
+            "integrity": "sha1-TcGeZk38y+Jb2NtQiwDG2hWCVdE=",
+            "dev": true
+        }
+    }
+}
diff --git a/package.json b/package.json
index ba60591..2fcebea 100644
--- a/package.json
+++ b/package.json
@@ -1,23 +1,28 @@
 {
-    "name": "mongoose-findorcreate"
-  , "description": "Mongoose plugin that adds findOrCreate"
-  , "version": "2.0.0"
-  , "author": "Nicholas Penree <nick@penree.com>"
-  , "keywords": ["mongodb", "mongoose", "plugin", "findOrCreate"]
-  , "repository": {
-      "type": "git"
-    , "url": "git://github.com/drudge/mongoose-findorcreate"
-    }
-  , "devDependencies": {
-      "should": ">= 0.2.1"
-    , "mocha": ">= 0.13.0"
-    , "mongoose": ">= 3.0"
-    }
-  , "scripts": {
-      "test": "mocha -u bdd -R spec -c ./test/*test.js"
-    }
-  , "license": "MIT"
-  , "engine": {
-      "node": ">= 0.10"
+    "name": "mongoose-findorcreate",
+    "description": "Mongoose plugin that adds findOrCreate",
+    "version": "3.0.0",
+    "author": "Nicholas Penree <nick@penree.com>",
+    "keywords": [
+        "mongodb",
+        "mongoose",
+        "plugin",
+        "findOrCreate"
+    ],
+    "repository": {
+        "type": "git",
+        "url": "git://github.com/drudge/mongoose-findorcreate"
+    },
+    "devDependencies": {
+        "should": ">= 0.2.1",
+        "mocha": ">= 2.0.0",
+        "mongoose": ">= 3.0"
+    },
+    "scripts": {
+        "test": "mocha -u bdd -R spec -c ./test/*test.js"
+    },
+    "license": "MIT",
+    "engine": {
+        "node": ">= 4.0"
     }
 }
diff --git a/test/index_test.js b/test/index_test.js
index d991ca8..47939a5 100644
--- a/test/index_test.js
+++ b/test/index_test.js
@@ -9,7 +9,7 @@ var mongoose = require('mongoose');
 var Schema = mongoose.Schema;
 var findOrCreate = require('../');
 
-mongoose.connect('mongodb://localhost/findOrCreate')
+mongoose.connect('mongodb://localhost/findOrCreate');
 mongoose.connection.on('error', function (err) {
   console.error('MongoDB error: ' + err.message);
   console.error('Make sure a mongoDB server is running and accessible by this application')
@@ -25,8 +25,10 @@ ClickSchema.plugin(findOrCreate);
 var Click = mongoose.model('Click', ClickSchema);
 
 after(function(done) {
-  mongoose.connection.db.dropDatabase()
-  done();
+  mongoose.connection.db.dropDatabase(function() {
+    mongoose.connection.close();
+    done();
+  });
 })
 
 describe('findOrCreate', function() {