diff --git a/.gitignore b/.gitignore
index 93f13619..2d6ddb5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 node_modules
 npm-debug.log
+yarn.lock
diff --git a/.travis.yml b/.travis.yml
index 9f2b522c..7f84d147 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,16 @@
-git:
-  depth: 1
 sudo: false
 language: node_js
+node_js:
+  - "4"
+  - "5"
+  - "6"
+
 matrix:
+  fast_finish: true
   include:
-    - node_js: "4"
-    - node_js: "5"
-    - node_js: "6"
+    - node_js: "node"
+      env: LINT=true
 
-script: npm run test-ci
+script:
+  - 'if [ -n "${LINT-}" ]; then npm run lint ; fi'
+  - 'if [ -z "${LINT-}" ]; then npm test ; fi'
diff --git a/package.json b/package.json
index 67d0dc49..b3fd1282 100644
--- a/package.json
+++ b/package.json
@@ -20,8 +20,8 @@
   "scripts": {
     "bootstrap": "git submodule update --init && cd eslint && npm install",
     "eslint": "cd eslint && mocha -c tests/lib/rules/*.js -r ../eslint-tester.js",
-    "test": "mocha",
-    "test-ci": "npm test && npm run lint",
+    "test": "npm run lint && npm run test-only",
+    "test-only": "mocha",
     "lint": "eslint index.js babylon-to-espree test",
     "fix": "eslint index.js babylon-to-espree test --fix",
     "preversion": "npm test",
diff --git a/test/non-regression.js b/test/non-regression.js
index 996cc66b..4ddead6e 100644
--- a/test/non-regression.js
+++ b/test/non-regression.js
@@ -1196,7 +1196,7 @@ describe("verify", function () {
     verifyAndAssertMessages(
       "const {Bacona} = require('baconjs')",
       { "no-undef": 1, "no-unused-vars": 1 },
-      [ "1:8 'Bacona' is defined but never used. no-unused-vars" ]
+      [ "1:8 'Bacona' is assigned a value but never used. no-unused-vars" ]
     );
   });