diff --git a/package.json b/package.json
index 7cc4292a..2e90e5f0 100644
--- a/package.json
+++ b/package.json
@@ -71,9 +71,12 @@
     "lint:fix": "eslint --fix app.js \"lib/**/*.js\" \"test/**/*.js\"",
     "lint": "eslint app.js \"lib/**/*.js\" \"test/**/*.js\"",
     "preinstall": "make pre-install",
-    "pretest": "NODE_ENV=test node test setup",
+    "pretest:setup": "npm run lint",
+    "test:setup": "NODE_ENV=test node test setup",
+    "pretest": "npm run test:setup",
     "test": "NODE_ENV=test mocha -t 5000 --exit --recursive test/acceptance test/integration test/unit",
-    "posttest": "NODE_ENV=test node test teardown",
+    "posttest": "npm run test:teardown",
+    "test:teardown": "NODE_ENV=test node test teardown",
     "update-internal-deps": "rm -rf node_modules && npm install",
     "docker-test": "./docker-test.sh",
     "docker-bash": "./docker-bash.sh"