diff --git a/.gitignore b/.gitignore
index d8c86bc6f4..d8308b059e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ coverage
 beta/
 translation/
 www
+.nyc_output/
diff --git a/package.json b/package.json
index 12c11c5fa8..7f79623cf1 100644
--- a/package.json
+++ b/package.json
@@ -16,9 +16,7 @@
   },
   "scripts": {
     "test": "./node_modules/.bin/eslint src/ && ./node_modules/.bin/babel-node ./node_modules/.bin/mocha --compilers js:babel-core/register -r babel-polyfill -r ./src/common/mochaHelper.js src/**/__tests__/*.js src/**/**/__tests__/*.js src/**/**/**/__tests__/*.js",
-    "coverage": "./node_modules/.bin/babel-node ./node_modules/.bin/babel-istanbul cover ./node_modules/.bin/_mocha --  --compilers js:babel-core/register -r babel-polyfill -r ./src/common/mochaHelper.js src/**/__tests__/*.js src/**/**/__tests__/*.js src/**/**/**/__tests__/*.js",
-    "coveralls": "npm run coverage && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage",
-    "test:full": "npm test && npm run coveralls",
+    "test:full": "./node_modules/.bin/nyc --reporter=lcov npm test && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage",
     "dev": "gulp watch",
     "deploy": "git checkout master ; npm prune ; npm install ; gulp deploy",
     "gen-beta": "git checkout beta; npm prune ; npm install ; gulp build-min; rm -rf beta; mkdir beta ; cp -r www/ beta/beta; git checkout -- src",
@@ -62,7 +60,6 @@
     "babel-cli": "^6.16.0",
     "babel-core": "^6.17.0",
     "babel-eslint": "^7.0.0",
-    "babel-istanbul": "^0.11.0",
     "babel-loader": "^6.2.5",
     "babel-preset-es2015": "^6.16.0",
     "babel-preset-react": "^6.16.0",
@@ -98,6 +95,7 @@
     "json-loader": "^0.5.4",
     "loader-utils": "^0.2.16",
     "mocha": "^3.1.0",
+    "nyc": "^10.0.0",
     "through2": "^2.0.1",
     "underscore": "^1.8.3",
     "vinyl-paths": "^2.1.0",