diff --git a/.travis.yml b/.travis.yml
index dde2ea6..8662b6f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,15 @@
-language: node_js
-before_install:
-  - "npm install npm -g"
-node_js:
-  - 4.2
-  - 0.12
-  - 0.10
-  - iojs
-after_success:
-  - "npm run coveralls"
 sudo: false
+language: node_js
+node_js:
+  - "0.10"
+  - "0.12"
+  - "io.js"
+  - "4"
+  - "5"
+matrix:
+  include:
+    - node_js: "4"
+      env: TEST_SUITE=lint
+env:
+  - TEST_SUITE=unit
+script: npm run-script $TEST_SUITE
diff --git a/package.json b/package.json
index bd8cfc2..f7e85e6 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,9 @@
   "scripts": {
     "coverage": "istanbul cover test.js",
     "coveralls": "npm run coverage && coveralls < coverage/lcov.info",
+    "lint": "standard",
     "test-find": "find ./lib/**/__tests__ -name *.test.js | xargs mocha",
-    "test": "standard && node test.js"
+    "test": "npm run lint && npm run unit",
+    "unit": "node test.js"
   }
 }