diff --git a/.eslintrc.js b/.eslintrc.js
index fb1ac6fce..e872f32e6 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -27,7 +27,7 @@ module.exports = {
     // Rules order is important, please avoid shuffling them
     extends: [
         // Base ESLint recommended rules
-        'eslint:recommended',
+        // 'eslint:recommended',
 
         // https://github.com/typescript-eslint/typescript-eslint/tree/master/packages/eslint-plugin#usage
         // ESLint typescript rules
@@ -90,4 +90,14 @@ module.exports = {
         // allow debugger during development only
         'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
     },
+    overrides: [
+        {
+            files: ['**/*.spec.{js,ts}'],
+            extends: [
+                // Add Cypress-specific lint rules, globals and Cypress plugin
+                // See https://github.com/cypress-io/eslint-plugin-cypress#rules
+                'plugin:cypress/recommended',
+            ],
+        },
+    ],
 };