diff --git a/.eslintignore b/.eslintignore
index 5131e6201..22c20bea9 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -2,9 +2,13 @@
 *_uncompressed*.js
 /msg/*
 /core/css.js
+/tests/blocks/*
+/tests/compile/*
 /tests/jsunit/*
 /tests/generators/*
+/tests/workspace_svg/*
 /generators/*
 /demos/*
 /accessible/*
-/appengine/*
\ No newline at end of file
+/appengine/*
+/externs/svg-externs.js
diff --git a/.travis.yml b/.travis.yml
index 98803f097..b370eb809 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,5 +28,6 @@ before_script:
 
 script:
   - set -x
+  - npm run lint
   - npm test
   - cd tests/compile; compile.sh; cd ..
diff --git a/package.json b/package.json
index 5a6e9fa18..985c15170 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "name": "Neil Fraser"
   },
   "scripts": {
-    "lint": "jshint .",
+    "lint": "eslint .",
     "pretest": "tests/scripts/test_setup.sh",
     "test": "node tests/jsunit/test_runner.js"
   },
@@ -45,5 +45,8 @@
     "npm": "^4.4.4",
     "closure-library": "^1.43629075.2",
     "webdriverio": "^4.6.2"
+  },
+  "devDependencies": {
+    "eslint": "2.9.0"
   }
 }