diff --git a/.travis.yml b/.travis.yml
index d6757dd3e44e..4cc48433e7d1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,8 @@ env:
 os:
   - linux
   - osx
-script: npm run-script test
+script: npm run-script lint && npm run-script test
+
 before_install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.30.1/install.sh | bash; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then source ~/.nvm/nvm-exec; fi
diff --git a/package.json b/package.json
index c6fb8ce5e2ed..99316e56249d 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,8 @@
   },
   "keywords": [],
   "scripts": {
-    "test": "eslint -c eslint.json './**/*.js' "
+    "test": "node tests/runner",
+    "lint": "eslint -c eslint.json './**/*.js' "
   },
   "repository": {
     "type": "git",