diff --git a/.gitignore b/.gitignore
index 613fe28f..118a0996 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@ coverage/
 artifacts/
 /dist
 npm-debug.log
+.nyc_output
 test/tools/trigger-appveyor-tests.sh
\ No newline at end of file
diff --git a/package.json b/package.json
index 03e79f6b..65604ea0 100644
--- a/package.json
+++ b/package.json
@@ -4,15 +4,15 @@
   "description": "Git commit, but play nice with conventions.",
   "main": "src/index.js",
   "scripts": {
-    "check-coverage": "istanbul check-coverage --statements 80 --branches 80 --functions 80 --lines 80 ",
+    "check-coverage": "nyc check-coverage --statements 80 --branches 80 --functions 80 --lines 80 ",
     "commit": "node bin/git-cz",
     "build": "babel src --out-dir dist",
     "build:watch": "babel --watch src --out-dir dist",
     "prepublish": "npm run build",
-    "report-coverage": "cat ./coverage/lcov.info | codecov",
+    "report-coverage": "nyc report --reporter=lcov | codecov",
     "semantic-release": "semantic-release pre && npm publish && semantic-release post",
     "start": "npm run test:watch",
-    "test": "istanbul cover -x ./test node_modules/mocha/bin/_mocha -- -R spec test/tests/index.js --compilers js:babel/register",
+    "test": "nyc --require babel-core/register _mocha -- test/tests/index.js",
     "test:watch": "nodemon -q --ignore test/.tmp/ --ignore test/artifacts/ --ignore coverage/ --exec \"npm run test\" --",
     "test:windows": "node ./test/tools/trigger-appveyor-tests.js"
   },
@@ -47,14 +47,17 @@
   "license": "MIT",
   "devDependencies": {
     "axios": "0.9.1",
-    "babel": "5.8.34",
+    "babel-cli": "6.6.5",
+    "babel-core": "6.6.5",
+    "babel-preset-es2015": "6.6.0",
+    "babel-preset-stage-2": "6.5.0",
     "chai": "3.5.0",
     "codecov.io": "0.1.6",
     "ghooks": "1.0.3",
-    "istanbul": "0.3.22",
     "mocha": "2.4.5",
     "node-uuid": "1.4.7",
     "nodemon": "1.9.1",
+    "nyc": "6.0.0",
     "rimraf": "2.5.2",
     "semantic-release": "^4.3.5",
     "semver": "5.1.0"
@@ -65,14 +68,20 @@
     "dedent": "0.6.0",
     "detect-indent": "4.0.0",
     "find-node-modules": "1.0.1",
-    "glob": "7.0.0",
+    "find-root": "^1.0.0",
+    "glob": "7.0.3",
     "gulp": "3.9.1",
     "gulp-git": "1.7.0",
     "inquirer": "0.12.0",
     "lodash": "4.6.1",
-    "find-root": "^1.0.0",
     "minimist": "1.2.0",
     "shelljs": "0.5.3",
     "strip-json-comments": "2.0.1"
+  },
+  "babel": {
+    "presets": [
+      "es2015",
+      "stage-2"
+    ]
   }
 }