diff --git a/.eslintignore.errorfiles b/.eslintignore.errorfiles
new file mode 100644
index 00000000..1dfa4205
--- /dev/null
+++ b/.eslintignore.errorfiles
@@ -0,0 +1,7 @@
+# autogenerated file: run scripts/generate-eslint-error-ignore-file to update.
+
+src/components/structures/VectorHomePage.js
+src/vector/index.js
+src/vector/modernizr.js
+test/app-tests/joining.js
+test/app-tests/loading.js
diff --git a/.travis.yml b/.travis.yml
index 0099fcd0..6778aef6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,3 +22,6 @@ install:
     # clone the deps with depth 1: we know we will only ever need that one
     # commit.
     - scripts/fetch-develop.deps.sh --depth 1 && npm install
+script:
+    - npm run test
+    - npm run lintwithexclusions
diff --git a/package.json b/package.json
index 4c339705..f5e72015 100644
--- a/package.json
+++ b/package.json
@@ -54,6 +54,7 @@
     "start:prod": "npm run build:js-sdk && npm run build:react-sdk && concurrently --kill-others-on-fail --prefix \"{time} [{name}]\" -n js-sdk,react-sdk,reskindex,res,riot-js \"npm run start:js-sdk:prod\" \"npm run start:react-sdk:prod\" \"npm run reskindex:watch\" \"npm run start:res\" \"npm run start:js:prod\"",
     "lint": "eslint src/",
     "lintall": "eslint src/ test/",
+    "lintwithexclusions": "eslint --max-warnings 20 --ignore-path .eslintignore.errorfiles src test",
     "clean": "rimraf lib webapp electron_app/dist",
     "prepublish": "npm run clean && npm run build:compile",
     "test": "karma start --single-run=true --autoWatch=false --browsers ChromeHeadless",
diff --git a/scripts/generate-eslint-error-ignore-file b/scripts/generate-eslint-error-ignore-file
new file mode 100755
index 00000000..ac3d4ae4
--- /dev/null
+++ b/scripts/generate-eslint-error-ignore-file
@@ -0,0 +1,21 @@
+#!/bin/sh
+#
+# generates .eslintignore.errorfiles to list the files which have errors in,
+# so that they can be ignored in future automated linting.
+
+out=.eslintignore.errorfiles
+
+cd `dirname $0`/..
+
+echo "generating $out"
+
+{
+    cat <<EOF
+# autogenerated file: run scripts/generate-eslint-error-ignore-file to update.
+
+EOF
+
+    ./node_modules/.bin/eslint --no-ignore -f json src test |
+        jq -r '.[] | select((.errorCount) > 0) | .filePath' |
+        sed -e 's/.*riot-web\///';
+} > "$out"
diff --git a/src/vector/platform/VectorBasePlatform.js b/src/vector/platform/VectorBasePlatform.js
index 746b5aaf..16b9d178 100644
--- a/src/vector/platform/VectorBasePlatform.js
+++ b/src/vector/platform/VectorBasePlatform.js
@@ -60,8 +60,8 @@ export default class VectorBasePlatform extends BasePlatform {
             // This needs to be in in a try block as it will throw
             // if there are more than 100 badge count changes in
             // its internal queue
-            let bgColor = "#d00",
-                notif = this.notificationCount;
+            let bgColor = "#d00";
+            let notif = this.notificationCount;
 
             if (this.errorDidOccur) {
                 notif = notif || "×";