--- a/testing/taskcluster/tasks/branches/base_job_flags.yml
+++ b/testing/taskcluster/tasks/branches/base_job_flags.yml
@@ -38,26 +38,25 @@ flags:
     jsreftest-e10s: /jsreftest-e10s.*/
     luciddream: /luciddream.*/
     marionette: /marionette.*/
     mochitest: /mochitest.*/
     mochitests: /mochitest.*/
     mochitest-e10s: /mochitest-e10s.*/
     mochitests-e10s: /mochitest-e10s.*/
     mochitest-debug: /mochitest-debug-.*/
-    mochitest-a11y: /.*mochitest-o.*/
+    mochitest-a11y: /.*mochitest-a11y.*/
     mochitest-bc: /mochitest-browser-chrome.*/
+    mochitest-bc-e10s: /mochitest-browser-chrome-e10s.*/
     mochitest-browser-chrome: /mochitest-browser-chrome.*/
-    mochitest-bc-e10s: /mochitest-browser-chrome-e10s.*/
     mochitest-browser-chrome-e10s: /mochitest-browser-chrome-e10s.*/
+    mochitest-chrome: /.*mochitest-chrome.*/
     mochitest-dt: /mochitest-devtools-chrome.*/
     mochitest-dt-e10s: /mochitest-devtools-chrome-e10s.*/
     mochitest-gl: /mochitest-webgl.*/
-    mochitest-o: /.*mochitest-o.*/
-    mochitest-other: /mochitest-other.*/
     mochitest-push: /mochitest-push.*/
     reftest: /(plain-)?reftest.*/
     reftest-no-accel: /(plain-)?reftest-no-accel.*/
     reftests: /(plain-)?reftest.*/
     reftests-e10s: /(plain-)?reftest-e10s.*/
     robocop: /robocop.*/
     web-platform-test: /web-platform-tests.*/
     web-platform-tests: /web-platform-tests.*/
@@ -125,25 +124,26 @@ flags:
     - jetpack
     - jittests
     - jsreftest
     - jsreftest-e10s
     - luciddream
     - marionette
     - marionette-webapi
     - mochitest
+    - mochitest-a11y
     - mochitest-browser-chrome
     - mochitest-browser-chrome-e10s
+    - mochitest-chrome
     - mochitest-devtools-chrome
     - mochitest-devtools-chrome-e10s
     - mochitest-e10s
     - mochitest-jetpack
     - mochitest-media
     - mochitest-oop
-    - mochitest-other
     - mochitest-push
     - mochitest-webgl
     - mozmill
     - reftest
     - reftest-e10s
     - reftest-ipc
     - reftest-no-accel
     - reftest-sanity-oop

--- a/testing/taskcluster/tasks/branches/base_jobs.yml
+++ b/testing/taskcluster/tasks/branches/base_jobs.yml
@@ -227,16 +227,24 @@ tests:
       tasks/builds/b2g_emulator_x86_kk_opt.yml:
         task: tasks/tests/b2g_emulator_marionette_webapi.yml
   mochitest:
     allowed_build_tasks:
       tasks/builds/mulet_linux.yml:
         task: tasks/tests/mulet_mochitests.yml
       tasks/builds/b2g_emulator_x86_kk_opt.yml:
         task: tasks/tests/b2g_emulator_mochitest.yml
+  mochitest-a11y:
+    allowed_build_tasks:
+      tasks/builds/dbg_linux64.yml:
+        task: tasks/tests/fx_linux64_mochitest_a11y.yml
+  mochitest-chrome:
+    allowed_build_tasks:
+      tasks/builds/dbg_linux64.yml:
+        task: tasks/tests/fx_linux64_mochitest_chrome.yml
   mochitest-push:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
         task: tasks/tests/fx_linux64_mochitest_push.yml
   mochitest-webgl:
     allowed_build_tasks:
       tasks/builds/dbg_linux64.yml:
         task: tasks/tests/fx_linux64_mochitest_gl.yml

--- a/testing/taskcluster/tasks/branches/try/job_flags.yml
+++ b/testing/taskcluster/tasks/branches/try/job_flags.yml
@@ -165,16 +165,24 @@ tests:
       tasks/builds/b2g_emulator_x86_kk_opt.yml:
         task: tasks/tests/b2g_emulator_marionette.yml
   mochitest:
     allowed_build_tasks:
       tasks/builds/b2g_emulator_x86_l_opt.yml:
         task: tasks/tests/b2g_emulator_mochitest.yml
       tasks/builds/b2g_emulator_x86_kk_opt.yml:
         task: tasks/tests/b2g_emulator_mochitest.yml
+  mochitest-a11y:
+    allowed_build_tasks:
+      tasks/builds/dbg_linux64_clobber.yml:
+        task: tasks/tests/fx_linux64_mochitest_a11y.yml
+  mochitest-chrome:
+    allowed_build_tasks:
+      tasks/builds/dbg_linux64_clobber.yml:
+        task: tasks/tests/fx_linux64_mochitest_chrome.yml
   mochitest-push:
     allowed_build_tasks:
       tasks/builds/dbg_linux64_clobber.yml:
         task: tasks/tests/fx_linux64_mochitest_push.yml
   mochitest-webgl:
     allowed_build_tasks:
       tasks/builds/dbg_linux64_clobber.yml:
         task: tasks/tests/fx_linux64_mochitest_gl.yml

new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/tests/fx_linux64_mochitest_a11y.yml
@@ -0,0 +1,22 @@
+$inherits:
+  from: 'tasks/tests/fx_desktop_unittest.yml'
+task:
+  scopes:
+    - 'docker-worker:capability:device:loopbackVideo'
+    - 'docker-worker:capability:device:loopbackAudio'
+  metadata:
+    name: '[TC] Linux64 mochitest-a11y'
+    description: Mochitest a11y run
+  payload:
+    capabilities:
+      devices:
+        loopbackVideo: true
+        loopbackAudio: true
+  extra:
+    suite:
+      name: mochitest
+      flavor: a11y
+    treeherder:
+      groupName: Desktop mochitests
+      groupSymbol: tc-M
+      symbol: a11y

new file mode 100644
--- /dev/null
+++ b/testing/taskcluster/tasks/tests/fx_linux64_mochitest_chrome.yml
@@ -0,0 +1,24 @@
+$inherits:
+  from: 'tasks/tests/fx_desktop_unittest.yml'
+task:
+  scopes:
+    - 'docker-worker:capability:device:loopbackVideo'
+    - 'docker-worker:capability:device:loopbackAudio'
+  metadata:
+    name: '[TC] Linux64 mochitest-chrome {{chunk}}'
+    description: Mochitest chrome run {{chunk}}
+  payload:
+    capabilities:
+      devices:
+        loopbackVideo: true
+        loopbackAudio: true
+  extra:
+    chunks:
+      total: 3
+    suite:
+      name: mochitest
+      flavor: chrome
+    treeherder:
+      groupName: Desktop mochitests
+      groupSymbol: tc-M
+      symbol: c{{chunk}}

deleted file mode 100644
--- a/testing/taskcluster/tasks/tests/fx_linux64_mochitest_other.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-$inherits:
-  from: 'tasks/tests/fx_desktop_unittest.yml'
-task:
-  scopes:
-    - 'docker-worker:capability:device:loopbackVideo'
-    - 'docker-worker:capability:device:loopbackAudio'
-  metadata:
-    name: '[TC] Linux64 mochitest-other'
-    description: Mochitest other run
-  payload:
-    capabilities:
-      devices:
-        loopbackVideo: true
-        loopbackAudio: true
-  extra:
-    suite:
-      name: mochitest
-      flavor: chrome,a11y
-    treeherder:
-      groupName: Desktop mochitests
-      groupSymbol: tc-M
-      symbol: oth