diff --git a/.eslintignore b/.eslintignore
index c4c7fe5067..c4f7298047 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1 +1,4 @@
 src/component-index.js
+test/end-to-end-tests/node_modules/
+test/end-to-end-tests/riot/
+test/end-to-end-tests/synapse/
diff --git a/.eslintignore.errorfiles b/.eslintignore.errorfiles
index 36b03b121c..ffd398cb14 100644
--- a/.eslintignore.errorfiles
+++ b/.eslintignore.errorfiles
@@ -61,3 +61,7 @@ test/mock-clock.js
 test/notifications/ContentRules-test.js
 test/notifications/PushRuleVectorState-test.js
 test/stores/RoomViewStore-test.js
+src/component-index.js
+test/end-to-end-tests/node_modules/
+test/end-to-end-tests/riot/
+test/end-to-end-tests/synapse/
diff --git a/scripts/generate-eslint-error-ignore-file b/scripts/generate-eslint-error-ignore-file
index 3a635f5a7d..54aacfc9fa 100755
--- a/scripts/generate-eslint-error-ignore-file
+++ b/scripts/generate-eslint-error-ignore-file
@@ -14,8 +14,10 @@ echo "generating $out"
 # autogenerated file: run scripts/generate-eslint-error-ignore-file to update.
 
 EOF
-    
-    ./node_modules/.bin/eslint --no-ignore -f json src test |
+
+    ./node_modules/.bin/eslint -f json src test |
         jq -r '.[] | select((.errorCount + .warningCount) > 0) | .filePath' |
         sed -e 's/.*matrix-react-sdk\///';
 } > "$out"
+# also append rules from eslintignore file
+cat .eslintignore >> $out