diff --git a/.ci/jobs.yml b/.ci/jobs.yml
index fc3e80064fa6fa..8f23e7bfc06955 100644
--- a/.ci/jobs.yml
+++ b/.ci/jobs.yml
@@ -1,33 +1,69 @@
 JOB:
-  - kibana-intake
-  - x-pack-intake
-  - kibana-firefoxSmoke
-  - kibana-ciGroup1
-  - kibana-ciGroup2
-  - kibana-ciGroup3
-  - kibana-ciGroup4
-  - kibana-ciGroup5
-  - kibana-ciGroup6
-  - kibana-ciGroup7
-  - kibana-ciGroup8
-  - kibana-ciGroup9
-  - kibana-ciGroup10
-  - kibana-ciGroup11
-  - kibana-ciGroup12
+  # - kibana-intake
+  # - x-pack-intake
+  - kibana-firefoxSmoke-1
+  - kibana-firefoxSmoke-2
+  - kibana-firefoxSmoke-3
+  - kibana-firefoxSmoke-4
+  - kibana-firefoxSmoke-5
+  - kibana-firefoxSmoke-6
+  - kibana-firefoxSmoke-7
+  - kibana-firefoxSmoke-8
+  - kibana-firefoxSmoke-9
+  - kibana-firefoxSmoke-10
+  # - kibana-ciGroup1
+  # - kibana-ciGroup2
+  # - kibana-ciGroup3
+  # - kibana-ciGroup4
+  # - kibana-ciGroup5
+  - kibana-ciGroup6-1
+  - kibana-ciGroup6-2
+  - kibana-ciGroup6-3
+  - kibana-ciGroup6-4
+  - kibana-ciGroup6-5
+  - kibana-ciGroup6-6
+  - kibana-ciGroup6-7
+  - kibana-ciGroup6-8
+  - kibana-ciGroup6-9
+  - kibana-ciGroup6-10
+  # - kibana-ciGroup7
+  # - kibana-ciGroup8
+  # - kibana-ciGroup9
+  # - kibana-ciGroup10
+  # - kibana-ciGroup11
+  - kibana-ciGroup12-1
+  - kibana-ciGroup12-2
+  - kibana-ciGroup12-3
+  - kibana-ciGroup12-4
+  - kibana-ciGroup12-5
+  - kibana-ciGroup12-6
+  - kibana-ciGroup12-7
+  - kibana-ciGroup12-8
+  - kibana-ciGroup12-9
+  - kibana-ciGroup12-10
   # - kibana-visualRegression
 
   # make sure all x-pack-ciGroups are listed in test/scripts/jenkins_xpack_ci_group.sh
-  - x-pack-firefoxSmoke
-  - x-pack-ciGroup1
-  - x-pack-ciGroup2
-  - x-pack-ciGroup3
-  - x-pack-ciGroup4
-  - x-pack-ciGroup5
-  - x-pack-ciGroup6
-  - x-pack-ciGroup7
-  - x-pack-ciGroup8
-  - x-pack-ciGroup9
-  - x-pack-ciGroup10
+  # - x-pack-firefoxSmoke
+  - x-pack-ciGroup1-1
+  - x-pack-ciGroup1-2
+  - x-pack-ciGroup1-3
+  - x-pack-ciGroup1-4
+  - x-pack-ciGroup1-5
+  - x-pack-ciGroup1-6
+  - x-pack-ciGroup1-7
+  - x-pack-ciGroup1-8
+  - x-pack-ciGroup1-9
+  - x-pack-ciGroup1-10
+  # - x-pack-ciGroup2
+  # - x-pack-ciGroup3
+  # - x-pack-ciGroup4
+  # - x-pack-ciGroup5
+  # - x-pack-ciGroup6
+  # - x-pack-ciGroup7
+  # - x-pack-ciGroup8
+  # - x-pack-ciGroup9
+  # - x-pack-ciGroup10
   # - x-pack-visualRegression
 
 # `~` is yaml for `null`
diff --git a/src/functional_test_runner/lib/mocha/setup_mocha.js b/src/functional_test_runner/lib/mocha/setup_mocha.js
index c39db58cf9a5de..d8ba2721041b5d 100644
--- a/src/functional_test_runner/lib/mocha/setup_mocha.js
+++ b/src/functional_test_runner/lib/mocha/setup_mocha.js
@@ -60,8 +60,10 @@ export async function setupMocha(lifecycle, log, config, providers) {
   filterSuitesByTags({
     log,
     mocha,
-    include: config.get('suiteTags.include'),
-    exclude: config.get('suiteTags.exclude'),
+    include: config.get('suiteTags.include')
+      .map(tag => tag.replace(/-\d+$/, '')),
+    exclude: config.get('suiteTags.exclude')
+      .map(tag => tag.replace(/-\d+$/, ''))
   });
 
   return mocha;
diff --git a/test/scripts/jenkins_ci_group.sh b/test/scripts/jenkins_ci_group.sh
index fb532e9ec71dba..65ce56840ee4ef 100755
--- a/test/scripts/jenkins_ci_group.sh
+++ b/test/scripts/jenkins_ci_group.sh
@@ -3,7 +3,7 @@
 set -e
 trap 'node "$KIBANA_DIR/src/dev/failed_tests/cli"' EXIT
 
-yarn run grunt functionalTests:ensureAllTestsInCiGroup;
+#yarn run grunt functionalTests:ensureAllTestsInCiGroup;
 
 node scripts/build --debug --oss;
 
diff --git a/test/scripts/jenkins_xpack_ci_group.sh b/test/scripts/jenkins_xpack_ci_group.sh
index 3527aa5eedfa9c..b85c93d51483d9 100755
--- a/test/scripts/jenkins_xpack_ci_group.sh
+++ b/test/scripts/jenkins_xpack_ci_group.sh
@@ -7,17 +7,17 @@ export TEST_BROWSER_HEADLESS=1
 
 echo " -> Ensuring all functional tests are in a ciGroup"
 cd "$XPACK_DIR"
-node scripts/functional_tests --assert-none-excluded \
-  --include-tag ciGroup1 \
-  --include-tag ciGroup2 \
-  --include-tag ciGroup3 \
-  --include-tag ciGroup4 \
-  --include-tag ciGroup5 \
-  --include-tag ciGroup6 \
-  --include-tag ciGroup7 \
-  --include-tag ciGroup8 \
-  --include-tag ciGroup9 \
-  --include-tag ciGroup10
+# node scripts/functional_tests --assert-none-excluded \
+#   --include-tag ciGroup1 \
+#   --include-tag ciGroup2 \
+#   --include-tag ciGroup3 \
+#   --include-tag ciGroup4 \
+#   --include-tag ciGroup5 \
+#   --include-tag ciGroup6 \
+#   --include-tag ciGroup7 \
+#   --include-tag ciGroup8 \
+#   --include-tag ciGroup9 \
+#   --include-tag ciGroup10
 
 echo " -> building and extracting default Kibana distributable for use in functional tests"
 cd "$KIBANA_DIR"