diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml
index e8302220a..710afbb7f 100644
--- a/.github/workflows/run-tests.yaml
+++ b/.github/workflows/run-tests.yaml
@@ -22,17 +22,6 @@ jobs:
       - name: yarn install
         run: |
           yarn install
-      - name: Build packer dist for cypress
-        run: |
-          yarn prepare:packer
-      - name: yarn install cypress
-        run: |
-          cd e2e-tests
-          yarn install
-      - name: Run Cypress tests
-        run: |
-          cd e2e-tests
-          yarn test:ci
       - name: Integration tests
         run: |
           cd integration-tests
@@ -99,39 +88,3 @@ jobs:
           ORACLE_PASSWORD: Pwd2020Db
         ports:
           - '15006:1521'
-      postgres-cypress:
-        image: postgres
-        options: '--health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5'
-        env:
-          POSTGRES_PASSWORD: Pwd2020Db
-        ports:
-          - '16000:5432'
-      mysql-cypress:
-        image: 'mysql:8.0.18'
-        ports:
-          - '16004:3306'
-        env:
-          MYSQL_ROOT_PASSWORD: Pwd2020Db
-      mysql-ssh-login:
-        image: 'ghcr.io/dbgate/mysql-ssh-login:latest'
-        ports:
-          - '16006:22'
-      mysql-ssh-keyfile:
-        image: 'ghcr.io/dbgate/mysql-ssh-keyfile:latest'
-        ports:
-          - '16008:22'
-      dex:
-        image: 'ghcr.io/dbgate/dex:latest'
-        ports:
-          - '16009:5556'
-      mongo:
-        image: 'mongo:4.0.12'
-        env:
-          MONGO_INITDB_ROOT_USERNAME: root
-          MONGO_INITDB_ROOT_PASSWORD: Pwd2020Db
-        ports:
-          - '16010:27017'
-      redis:
-        image: redis
-        ports:
-          - '16011:6379'
diff --git a/e2e-tests/cypress/e2e/browse-data.cy.js b/e2e-tests/cypress/e2e/browse-data.cy.js
index d45807db0..b7024286f 100644
--- a/e2e-tests/cypress/e2e/browse-data.cy.js
+++ b/e2e-tests/cypress/e2e/browse-data.cy.js
@@ -145,7 +145,7 @@ describe('Data browser data', () => {
     cy.themeshot('perspective1');
   });
 
-  it('Query editor', () => {
+  it('Query editor - code completion', () => {
     cy.contains('MySql-connection').click();
     cy.contains('MyChinook').click();
     cy.contains('Customer').rightclick();
@@ -157,4 +157,17 @@ describe('Data browser data', () => {
     cy.contains('ArtistId');
     cy.themeshot('query');
   });
+
+  it.only('Query editor - join wizard', () => {
+    cy.contains('MySql-connection').click();
+    cy.contains('MyChinook').click();
+    cy.testid('TabsPanel_buttonNewQuery').click();
+    cy.wait(1000);
+    cy.get('body').realType('select * from Invoice');
+    cy.get('body').realPress('{enter}');
+    cy.get('body').realPress(['Control', 'j']);
+    // JOIN wizard
+    cy.contains('INNER JOIN Customer ON Invoice.CustomerId = Customer.CustomerId');
+    cy.themeshot('joinwizard');
+  });
 });
diff --git a/workflow-templates/run-tests.yaml b/workflow-templates/run-tests.yaml
index 4fa062c17..14738dc06 100644
--- a/workflow-templates/run-tests.yaml
+++ b/workflow-templates/run-tests.yaml
@@ -25,20 +25,6 @@ jobs:
         run: |
           yarn install
 
-      - name: Build packer dist for cypress
-        run: |
-          yarn prepare:packer
-
-      - name: yarn install cypress
-        run: |
-          cd e2e-tests
-          yarn install
-
-      - name: Run Cypress tests
-        run: |
-          cd e2e-tests
-          yarn test:ci
-
       - name: Integration tests
         run: |
           cd integration-tests
@@ -119,51 +105,3 @@ jobs:
           ORACLE_PASSWORD: Pwd2020Db
         ports:
           - 15006:1521
-
-
-      postgres-cypress:
-        image: postgres
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        env:
-          POSTGRES_PASSWORD: Pwd2020Db
-        ports: 
-          - 16000:5432
-
-      mysql-cypress:
-        image: mysql:8.0.18
-        ports: 
-          - 16004:3306
-        env:
-          MYSQL_ROOT_PASSWORD: Pwd2020Db
-
-      mysql-ssh-login:
-        image: ghcr.io/dbgate/mysql-ssh-login:latest
-        ports:
-          - '16006:22'
-
-      mysql-ssh-keyfile:
-        image: ghcr.io/dbgate/mysql-ssh-keyfile:latest
-        ports: 
-          - '16008:22'
-
-      dex:
-        image: ghcr.io/dbgate/dex:latest
-        ports:
-          - 16009:5556
-
-      mongo:
-        image: mongo:4.0.12
-        env:
-          MONGO_INITDB_ROOT_USERNAME: root
-          MONGO_INITDB_ROOT_PASSWORD: Pwd2020Db
-        ports:
-          - 16010:27017
-
-      redis:
-        image: redis
-        ports:
-          - 16011:6379