diff --git a/circle.yml b/circle.yml
index ff3c0e32facd879421449fbe77e92b73ba273a0b..a5aff461dfc82eeeb5abc12076750bfcd33aa4bb 100644
--- a/circle.yml
+++ b/circle.yml
@@ -17,8 +17,6 @@ test:
   pre:
     - yarn run update-docs
   override:
-    - yarn run test-dirty
-    - yarn run eslint
-    - yarn run jest
+    - yarn test
   post:
     - bash <(curl -s https://codecov.io/bash)
diff --git a/package.json b/package.json
index 9113b39b8b02b2ca1caa36566a432bb21933d044..5f07adcce56067897ef2dd24a0d6a2213f6bf07a 100644
--- a/package.json
+++ b/package.json
@@ -6,20 +6,19 @@
   "main": "dist/index.js",
   "scripts": {
     "build": "yarn run transpile",
-    "eslint": "eslint --ignore-path .gitignore .",
-    "eslint-fix": "eslint --ignore-path .gitignore --fix .",
     "heroku-push": "git push heroku master",
     "heroku-scheduler": "heroku addons:open scheduler",
-    "npm-publish": "yarn run update-docs && np && yarn install",
+    "lint-fix": "eslint --ignore-path .gitignore --fix .",
     "prepublish": "yarn run build",
     "start": "node dist/renovate",
     "start-babel": "babel-node lib/renovate",
     "start-raw": "node lib/renovate",
     "test-dirty": "git diff --exit-code",
-    "test": "yarn run eslint && yarn run jest",
-    "jest": "jest",
+    "test-lint": "eslint --ignore-path .gitignore .",
+    "test-unit": "jest",
+    "test": "yarn run test-dirty && yarn run test-lint && yarn run test-unit",
     "transpile": "rimraf dist && mkdirp dist && babel lib --out-dir dist",
-    "update-docs": "yarn run build && bash bin/update-docs.sh"
+    "update-docs": "bash bin/update-docs.sh"
   },
   "repository": {
     "type": "git",
diff --git a/yarn.lock b/yarn.lock
index 33068b12affe60e1d43b90a3fef165f1b31af414..7f08f56a5c21ef0868a13ea3407cb14a6b8f945c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2544,14 +2544,10 @@ mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1:
   dependencies:
     minimist "0.0.8"
 
-moment@2.17.1:
+moment@2.17.1, moment@2.x.x:
   version "2.17.1"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.17.1.tgz#fed9506063f36b10f066c8b59a144d7faebe1d82"
 
-moment@2.x.x:
-  version "2.18.1"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"
-
 ms@0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"