diff --git a/.github/workflows/tugboat.yml b/.github/workflows/tugboat.yml
index 4cd53bfc66e40..bb5257b7c6fab 100644
--- a/.github/workflows/tugboat.yml
+++ b/.github/workflows/tugboat.yml
@@ -97,7 +97,7 @@ jobs:
         uses: actions/upload-artifact@v1
         with:
           name: cypress-videos
-          path: ./cypress/videos
+          path: ./cypress/cypress/videos
 
       - name: set status
         if: ${{ failure() }}
diff --git a/cypress/.eslintrc.js b/cypress/.eslintrc.js
index 2c41ed2cd3db3..d7498649a04e5 100644
--- a/cypress/.eslintrc.js
+++ b/cypress/.eslintrc.js
@@ -11,20 +11,7 @@ module.exports = {
         bundledDependencies: false,
       },
     ],
+    'jest/expect-expect': 'off',
+    'no-restricted-syntax': 'off',
   },
-
-  overrides: [
-    {
-      files: ['**/cypress/integration/**'],
-      rules: {
-        'jest/expect-expect': 'off',
-      },
-    },
-    {
-      files: ['src/commands/cypress.ts'],
-      rules: {
-        'no-restricted-syntax': 'off',
-      },
-    },
-  ],
 };
diff --git a/packages/e2e-test/.eslintrc.js b/packages/e2e-test/.eslintrc.js
index 2c41ed2cd3db3..7c8a092081154 100644
--- a/packages/e2e-test/.eslintrc.js
+++ b/packages/e2e-test/.eslintrc.js
@@ -12,19 +12,4 @@ module.exports = {
       },
     ],
   },
-
-  overrides: [
-    {
-      files: ['**/cypress/integration/**'],
-      rules: {
-        'jest/expect-expect': 'off',
-      },
-    },
-    {
-      files: ['src/commands/cypress.ts'],
-      rules: {
-        'no-restricted-syntax': 'off',
-      },
-    },
-  ],
 };
diff --git a/packages/e2e-test/src/commands/index.ts b/packages/e2e-test/src/commands/index.ts
index 0d14f371352af..78ff3343f1b6b 100644
--- a/packages/e2e-test/src/commands/index.ts
+++ b/packages/e2e-test/src/commands/index.ts
@@ -16,13 +16,7 @@
 
 import { CommanderStatic } from 'commander';
 import { run } from './run';
-import { run as cypress } from './cypress';
 
 export function registerCommands(program: CommanderStatic) {
   program.command('run').description('Run e2e tests').action(run);
-  program
-    .command('cypress')
-    .description('Run cypress e2e tests')
-    .option('-w, --watch', 'watch/open mode')
-    .action(cypress);
 }