diff --git a/.github/workflows/runner-e2e-tests-codeceptjs.yml b/.github/workflows/runner-e2e-tests-codeceptjs.yml
index b2745e97..7e321419 100644
--- a/.github/workflows/runner-e2e-tests-codeceptjs.yml
+++ b/.github/workflows/runner-e2e-tests-codeceptjs.yml
@@ -7,26 +7,26 @@ on:
         required: false
         type: string
       pmm_qa_branch:
-        description: "Branch for PMM-QA to checkout"
+        description: "Branch for qa-integration to checkout"
         required: false
         type: string
       pmm_server_image:
         description: 'PMM Server docker image'
-        default: 'perconalab/pmm-server:dev-latest'
+        default: 'perconalab/pmm-server:3-dev-latest'
         required: false
         type: string
       pmm_client_image:
         description: 'pmm2-client docker image'
-        default: 'perconalab/pmm-client:dev-latest'
+        default: 'perconalab/pmm-client:3-dev-latest'
         required: false
         type: string
       pmm_client_version:
-        description: 'PMM Client version (dev-latest|pmm2-latest|pmm2-rc|x.xx.x|https...)'
-        default: 'dev-latest'
+        description: 'PMM Client version (3-dev-latest|pmm3-rc|x.xx.x|https...)'
+        default: '3-dev-latest'
         required: false
         type: string
       setup_services:
-        description: "Setup arguments, ex.: --addclient=ps,1 --ps-version=5.7"
+        description: "Setup arguments, ex.: --database=ps --database=psmdb"
         required: false
         type: string
       tags_for_tests:
@@ -76,19 +76,15 @@ jobs:
       SHA: ${{ inputs.sha || 'null' }}
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       ADMIN_PASSWORD: 'admin-password'
-      PMM_QA_BRANCH: ${{ inputs.pmm_qa_branch || 'main' }}
-      PMM_QA_GIT_BRANCH: ${{ inputs.pmm_qa_branch || 'main' }}
-      PMM_UI_BRANCH: ${{ inputs.pmm_ui_tests_branch || 'main' }}
-      DOCKER_VERSION: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:dev-latest' }}
-      CLIENT_DOCKER_VERSION: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }}
-      PMM_CLIENT_VERSION: ${{ inputs.pmm_client_version || 'dev-latest' }}
+      PMM_QA_BRANCH: ${{ inputs.pmm_qa_branch || 'v3' }}
+      PMM_QA_GIT_BRANCH: ${{ inputs.pmm_qa_branch || 'v3' }}
+      PMM_UI_BRANCH: ${{ inputs.pmm_ui_tests_branch || 'v3' }}
+      DOCKER_VERSION: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:3-dev-latest' }}
+      CLIENT_DOCKER_VERSION: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:3-dev-latest' }}
+      PMM_CLIENT_VERSION: ${{ inputs.pmm_client_version || '3-dev-latest' }}
       WIZARD_ARGS: ${{ inputs.setup_services || '' }}
       TAGS_FOR_TESTS: ${{ inputs.tags_for_tests || '@settings-fb' }}
 
-#      Environment variables for tests
-      BACKUP_LOCATION_ACCESS_KEY: ${{ secrets.BACKUP_LOCATION_ACCESS_KEY }}
-      BACKUP_LOCATION_SECRET_KEY: ${{ secrets.BACKUP_LOCATION_SECRET_KEY }}
-
 
     steps:
       - name: Create status check
@@ -113,13 +109,13 @@ jobs:
 
       - name: Setup tools
         run: |
-          npm install -g bats
           sudo apt-get install -y apt-transport-https ca-certificates dirmngr ansible libaio1 libaio-dev libnuma-dev libncurses5 socat sysbench
           sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 8919F6BD2B48D754
           echo "deb https://packages.clickhouse.com/deb stable main" | sudo tee \
               /etc/apt/sources.list.d/clickhouse.list
           sudo apt-get update
           sudo apt-get install -y clickhouse-client
+          sudo apt-get install -y ansible
           sudo curl -s https://raw.githubusercontent.com/datacharmer/dbdeployer/master/scripts/dbdeployer-install.sh | bash
           ls -la
           git clone -b ${{ env.PMM_QA_BRANCH }} https://github.com/percona/pmm-qa
@@ -137,17 +133,22 @@ jobs:
           docker exec pmm-server change-admin-password ${{ env.ADMIN_PASSWORD }}
           bash -x testdata/db_setup.sh
 
-      - name: Export path to pmm-qa repo
-        working-directory: ./pmm-qa
+      - name: Export path to qa-integration repo
+        working-directory: ./qa-integration
         run: echo "PATH_TO_PMM_QA=$(pwd)" >> $GITHUB_ENV
 
       - name: Setup PMM2-Client
-        working-directory: ./pmm-qa
-        run: sudo bash -x pmm-tests/pmm2-client-setup.sh --pmm_server_ip 192.168.0.1 --client_version ${{ env.PMM_CLIENT_VERSION }} --admin_password ${{ env.ADMIN_PASSWORD }} --use_metrics_mode no
+        working-directory: ./qa-integration/pmm_qa
+        run: sudo bash -x pmm2-client-setup.sh --pmm_server_ip 192.168.0.1 --client_version ${{ env.PMM_CLIENT_VERSION }} --admin_password ${{ env.ADMIN_PASSWORD }} --use_metrics_mode no
 
       - name: Run Setup for E2E Tests
-        working-directory: ./pmm-qa
-        run: sudo -E bash -x pmm-tests/pmm-framework.sh ${{ env.WIZARD_ARGS }} --pmm2
+        working-directory: ./qa-integration/pmm_qa
+        run: |
+          python3 -m venv virtenv
+          . virtenv/bin/activate
+          pip install --upgrade pip
+          pip install -r requirements.txt
+          sudo python pmm-framework.py --pmm-server-password=${{ env.ADMIN_PASSWORD }} ${{ env.WIZARD_ARGS }}
 
       - name: Setup npm modules for e2e tests
         working-directory: ./pmm-ui-tests