diff --git a/.buildkite/pipelines/flaky_tests/pipeline.js b/.buildkite/pipelines/flaky_tests/pipeline.js
index 208924aefe80e8..37e8a97406eb55 100644
--- a/.buildkite/pipelines/flaky_tests/pipeline.js
+++ b/.buildkite/pipelines/flaky_tests/pipeline.js
@@ -23,11 +23,16 @@ for (let i = 1; i <= OSS_CI_GROUPS; i++) {
   inputs.push(stepInput(`oss/cigroup/${i}`, `OSS CI Group ${i}`));
 }
 
+inputs.push(stepInput(`oss/firefox`, 'OSS Firefox'));
+inputs.push(stepInput(`oss/accessibility`, 'OSS Accessibility'));
+
 for (let i = 1; i <= XPACK_CI_GROUPS; i++) {
   inputs.push(stepInput(`xpack/cigroup/${i}`, `Default CI Group ${i}`));
 }
 
 inputs.push(stepInput(`xpack/cigroup/Docker`, 'Default CI Group Docker'));
+inputs.push(stepInput(`xpack/firefox`, 'Default Firefox'));
+inputs.push(stepInput(`xpack/accessibility`, 'Default Accessibility'));
 
 const pipeline = {
   steps: [
diff --git a/.buildkite/pipelines/flaky_tests/runner.js b/.buildkite/pipelines/flaky_tests/runner.js
index bdb163504f46c1..b5ccab137fd01c 100644
--- a/.buildkite/pipelines/flaky_tests/runner.js
+++ b/.buildkite/pipelines/flaky_tests/runner.js
@@ -65,34 +65,67 @@ for (const testSuite of testSuites) {
 
   const JOB_PARTS = TEST_SUITE.split('/');
   const IS_XPACK = JOB_PARTS[0] === 'xpack';
+  const TASK = JOB_PARTS[1];
   const CI_GROUP = JOB_PARTS.length > 2 ? JOB_PARTS[2] : '';
 
   if (RUN_COUNT < 1) {
     continue;
   }
 
-  if (IS_XPACK) {
-    steps.push({
-      command: `CI_GROUP=${CI_GROUP} .buildkite/scripts/steps/functional/xpack_cigroup.sh`,
-      label: `Default CI Group ${CI_GROUP}`,
-      agents: { queue: 'ci-group-6' },
-      depends_on: 'build',
-      parallelism: RUN_COUNT,
-      concurrency: concurrency,
-      concurrency_group: UUID,
-      concurrency_method: 'eager',
-    });
-  } else {
-    steps.push({
-      command: `CI_GROUP=${CI_GROUP} .buildkite/scripts/steps/functional/oss_cigroup.sh`,
-      label: `OSS CI Group ${CI_GROUP}`,
-      agents: { queue: 'ci-group-4d' },
-      depends_on: 'build',
-      parallelism: RUN_COUNT,
-      concurrency: concurrency,
-      concurrency_group: UUID,
-      concurrency_method: 'eager',
-    });
+  switch (TASK) {
+    case 'cigroup':
+      if (IS_XPACK) {
+        steps.push({
+          command: `CI_GROUP=${CI_GROUP} .buildkite/scripts/steps/functional/xpack_cigroup.sh`,
+          label: `Default CI Group ${CI_GROUP}`,
+          agents: { queue: 'ci-group-6' },
+          depends_on: 'build',
+          parallelism: RUN_COUNT,
+          concurrency: concurrency,
+          concurrency_group: UUID,
+          concurrency_method: 'eager',
+        });
+      } else {
+        steps.push({
+          command: `CI_GROUP=${CI_GROUP} .buildkite/scripts/steps/functional/oss_cigroup.sh`,
+          label: `OSS CI Group ${CI_GROUP}`,
+          agents: { queue: 'ci-group-4d' },
+          depends_on: 'build',
+          parallelism: RUN_COUNT,
+          concurrency: concurrency,
+          concurrency_group: UUID,
+          concurrency_method: 'eager',
+        });
+      }
+      break;
+
+    case 'firefox':
+      steps.push({
+        command: `.buildkite/scripts/steps/functional/${IS_XPACK ? 'xpack' : 'oss'}_firefox.sh`,
+        label: `${IS_XPACK ? 'Default' : 'OSS'} Firefox`,
+        agents: { queue: IS_XPACK ? 'ci-group-6' : 'ci-group-4d' },
+        depends_on: 'build',
+        parallelism: RUN_COUNT,
+        concurrency: concurrency,
+        concurrency_group: UUID,
+        concurrency_method: 'eager',
+      });
+      break;
+
+    case 'accessibility':
+      steps.push({
+        command: `.buildkite/scripts/steps/functional/${
+          IS_XPACK ? 'xpack' : 'oss'
+        }_accessibility.sh`,
+        label: `${IS_XPACK ? 'Default' : 'OSS'} Accessibility`,
+        agents: { queue: IS_XPACK ? 'ci-group-6' : 'ci-group-4d' },
+        depends_on: 'build',
+        parallelism: RUN_COUNT,
+        concurrency: concurrency,
+        concurrency_group: UUID,
+        concurrency_method: 'eager',
+      });
+      break;
   }
 }