diff --git a/.travis.yml b/.travis.yml
index 31e6113ac4..79aae443ee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,2 +1,5 @@
 sudo: false
 language: node_js
+install:
+  - npm install
+  - bower install
diff --git a/package.json b/package.json
index b45a199a0b..9f61ee419f 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,9 @@
     "watch_ru_all": "npm run watch_ru_core | npm run watch_ru_demo",
     "watch_ru_core": "rollup --config rollup/core.js --watch",
     "watch_ru_demo": "rollup --config rollup/demo.js --watch",
-    "test": "eslint src panels --ext html && ls -1 src/**/*.html panels/**/*.html | xargs polymer lint --input"
+    "lint_js": "eslint src panels --ext html",
+    "lint_html": "ls -1 src/**/*.html panels/**/*.html | xargs polymer lint --input",
+    "test": "npm run lint_js && npm run lint_html"
   },
   "author": "Paulus Schoutsen <Paulus@PaulusSchoutsen.nl> (http://paulusschoutsen.nl)",
   "license": "MIT",