diff --git a/.github/workflows/fb-integration-suite.yml b/.github/workflows/fb-integration-suite.yml
index 3c17c199..a987647c 100644
--- a/.github/workflows/fb-integration-suite.yml
+++ b/.github/workflows/fb-integration-suite.yml
@@ -34,6 +34,20 @@ on:
         type: string
 
 jobs:
+  help-tests:
+    name: 'CLI / Integration'
+    uses: ./.github/workflows/runner-integration-cli-tests.yml
+    secrets: inherit
+    with:
+      sha: ${{ inputs.sha || github.event.pull_request.head.sha ||  'null' }}
+      pmm_ui_tests_branch: ${{ inputs.pmm_ui_tests_branch || 'main' }}
+      pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }}
+      pmm_server_image: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:dev-latest' }}
+      pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }}
+      pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }}
+      cli_test: 'pmm-ui-tests/cli/tests/help.spec.ts'
+      test_name: 'help tests'
+
   pmm-server-tests:
     name: 'CLI / Integration'
     uses: ./.github/workflows/runner-integration-cli-tests.yml
@@ -48,8 +62,6 @@ jobs:
       cli_test: 'pmm-server-only'
       test_name: 'pmm-server container tests'
 
-  # [ps5.7, ps8, ms8.0, pdpgsql13, pdpgsql14, pdpgsql15, modb4.4, modb5, modb6, help, generic, clientContainer, haproxy, proxysql, remove]
-
   pmm-client-container-tests:
     name: 'CLI / Integration'
     uses: ./.github/workflows/runner-integration-cli-tests.yml
@@ -63,4 +75,70 @@ jobs:
       pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }}
       cli_test: 'pmm-client-docker'
       services_list: '--setup-pmm-client-docker'
-      test_name: ${{ inputs.test_name > '' && format('{0} {1}', inputs.test_name, matrix.os) || matrix.os }}
\ No newline at end of file
+      test_name: 'pmm-client docker'
+
+  ps-57-tests:
+    name: 'CLI / Integration'
+    uses: ./.github/workflows/runner-integration-cli-tests.yml
+    secrets: inherit
+    with:
+      sha: ${{ inputs.sha || github.event.pull_request.head.sha ||  'null' }}
+      pmm_ui_tests_branch: ${{ inputs.pmm_ui_tests_branch || 'main' }}
+      pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }}
+      pmm_server_image: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:dev-latest' }}
+      pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }}
+      pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }}
+      cli_test: 'pmm-ui-tests/cli/tests/perconaMySqlServer.spec.ts'
+      services_list: '--ps-version=5.7 --addclient=ps,1'
+      test_name: 'Percona Server 5.7'
+
+  ps-80-tests:
+    name: 'CLI / Integration'
+    uses: ./.github/workflows/runner-integration-cli-tests.yml
+    secrets: inherit
+    with:
+      sha: ${{ inputs.sha || github.event.pull_request.head.sha ||  'null' }}
+      pmm_ui_tests_branch: ${{ inputs.pmm_ui_tests_branch || 'main' }}
+      pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }}
+      pmm_server_image: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:dev-latest' }}
+      pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }}
+      pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }}
+      cli_test: 'pmm-ui-tests/cli/tests/perconaMySqlServer.spec.ts'
+      services_list: '--ps-version=8.0 --addclient=ps,1'
+      test_name: 'Percona Server 8.0'
+
+  mysql-80-tests:
+    name: 'CLI / Integration'
+    uses: ./.github/workflows/runner-integration-cli-tests.yml
+    secrets: inherit
+    with:
+      sha: ${{ inputs.sha || github.event.pull_request.head.sha ||  'null' }}
+      pmm_ui_tests_branch: ${{ inputs.pmm_ui_tests_branch || 'main' }}
+      pmm_qa_branch: ${{ inputs.pmm_qa_branch || 'main' }}
+      pmm_server_image: ${{ inputs.pmm_server_image || 'perconalab/pmm-server:dev-latest' }}
+      pmm_client_image: ${{ inputs.pmm_client_image || 'perconalab/pmm-client:dev-latest' }}
+      pmm_client_version: ${{ inputs.pmm_client_version || 'dev-latest' }}
+      cli_test: 'pmm-ui-tests/cli/tests/mysql.spec.ts pmm-ui-tests/cli/tests/mysql-conf-file.spec.ts'
+      services_list: '--ms-version=8.0 --addclient=ms,1'
+      test_name: 'MySQL 8.0'
+
+#      pdpgsql13,
+
+#      pdpgsql14,
+
+#      pdpgsql15,
+
+#      modb4.4,
+
+#      modb5,
+
+#      modb6,
+
+#      generic,
+
+#      haproxy,
+
+#      proxysql,
+
+#      remove ]
+
diff --git a/.github/workflows/runner-integration-cli-tests.yml b/.github/workflows/runner-integration-cli-tests.yml
index 4d60c261..fe4602e6 100644
--- a/.github/workflows/runner-integration-cli-tests.yml
+++ b/.github/workflows/runner-integration-cli-tests.yml
@@ -114,17 +114,11 @@ jobs:
       - name: 'Setup PMM Client: <${{ env.PMM_CLIENT_VERSION }}>'
         run: sudo -E bash -x ./pmm-tests/pmm2-client-setup.sh --pmm_server_ip 127.0.0.1 --client_version ${{ env.PMM_CLIENT_VERSION }} --admin_password admin --use_metrics_mode no
 
-      - name: 'Run env setup'
+      - name: 'Run env setup: ${{ inputs.services_list }}'
         if: ${{ !!inputs.services_list }}
         run: |
           sudo -E bash -x ./pmm-tests/pmm-framework.sh ${{ inputs.services_list }} --pmm2
 
-      - name: Run Client Container Setup
-        if: ${{ matrix.db-type == 'clientContainer' }}
-        run: |
-          sudo -E bash -x ./pmm-tests/pmm-framework.sh --setup-pmm-client-docker --pmm2
-
-
       - name: 'Run CLI tests: ${{ inputs.cli_test }}'
         working-directory: ./pmm-ui-tests/cli
         run: npx playwright test ${{ inputs.cli_test }} --quiet