--- a/taskcluster/ci/legacy/tasks/tests/fx_android-api-15_cppunit.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_android-api-15_cppunit.yml
@@ -1,16 +1,17 @@
 ---
 $inherits:
   from: 'tasks/tests/fx_android-api-15_generic.yml'
 task:
   payload:
     command:
-      - --test-suite={{suite}}
+      - --test-suite=cppunittest
   metadata:
     name: '[TC] Android 4.3 API15+ cppunit test'
     description: cppunit run
   extra:
     suite:
       name: cppunittest
+      flavor: cppunittest
     treeherder:
       groupSymbol: tc
       symbol: Cpp

--- a/taskcluster/ci/legacy/tasks/tests/fx_android-api-15_crashtest.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_android-api-15_crashtest.yml
@@ -1,19 +1,17 @@
 ---
 $inherits:
   from: 'tasks/tests/fx_android-api-15_generic.yml'
 task:
   workerType: desktop-test-xlarge
-  payload:
-    command:
-      - --test-suite={{suite}}{{chunk}}
   metadata:
     name: '[TC] Android 4.3 API15+ crashtest-{{chunk}}'
     description: Crashtest run {{chunk}}
   extra:
     chunks:
       total: 4
     suite:
-      name: crashtest-{{chunk}}
+      name: crashtest
+      flavor: crashtest
     treeherder:
       groupSymbol: tc-R
       symbol: C{{chunk}}

--- a/taskcluster/ci/legacy/tasks/tests/fx_android-api-15_crashtest_dbg.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_android-api-15_crashtest_dbg.yml
@@ -1,13 +1,12 @@
 $inherits:
   from: 'tasks/tests/fx_android-api-15_crashtest.yml'
 task:
   payload:
     command:
+      - --test-suite=crashtest-debug-{{chunk}}
       - --download-symbols=true
   extra:
-    suite:
-      name: crashtest-debug-{{chunk}}
     chunks:
       total: 10
     treeherder:
       tier: 1

--- a/taskcluster/ci/legacy/tasks/tests/fx_android-api-15_crashtest_opt.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_android-api-15_crashtest_opt.yml
@@ -1,10 +1,11 @@
 ---
 $inherits:
   from: 'tasks/tests/fx_android-api-15_crashtest.yml'
 task:
   payload:
     command:
+      - --test-suite=crashtest-{{chunk}}
       - --download-symbols=ondemand
   extra:
     treeherder:
       tier: 2

--- a/taskcluster/ci/legacy/tasks/tests/fx_android-api-15_jsreftest.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_android-api-15_jsreftest.yml
@@ -1,20 +1,19 @@
 ---
 $inherits:
   from: 'tasks/tests/fx_android-api-15_generic.yml'
 task:
   workerType: desktop-test-xlarge
   payload:
     maxRunTime: 7200
-    command:
-      - --test-suite={{suite}}{{chunk}}
   metadata:
     name: '[TC] Android 4.3 API15+ jsreftest-{{chunk}}'
     description: jsreftest run {{chunk}}
   extra:
     chunks:
       total: 6
     suite:
-      name: jsreftest-{{chunk}}
+      name: reftest
+      flavor: jsreftest
     treeherder:
       groupSymbol: tc-R
       symbol: J{{chunk}}

--- a/taskcluster/ci/legacy/tasks/tests/fx_android-api-15_jsreftest_dbg.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_android-api-15_jsreftest_dbg.yml
@@ -1,13 +1,12 @@
 $inherits:
   from: 'tasks/tests/fx_android-api-15_jsreftest.yml'
 task:
   payload:
     command:
+      - --test-suite=jsreftest-debug-{{chunk}}
       - --download-symbols=true
   extra:
-    suite:
-      name: jsreftest-debug-{{chunk}}
     chunks:
       total: 20
     treeherder:
       tier: 1

--- a/taskcluster/ci/legacy/tasks/tests/fx_android-api-15_jsreftest_opt.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_android-api-15_jsreftest_opt.yml
@@ -1,10 +1,11 @@
 ---
 $inherits:
   from: 'tasks/tests/fx_android-api-15_jsreftest.yml'
 task:
   payload:
     command:
+      - --test-suite=jsreftest-{{chunk}}
       - --download-symbols=ondemand
   extra:
     treeherder:
       tier: 2

--- a/taskcluster/ci/legacy/tasks/tests/fx_android-api-15_mochitest_chrome.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_android-api-15_mochitest_chrome.yml
@@ -1,18 +1,19 @@
 ---
 $inherits:
   from: 'tasks/tests/fx_android-api-15_generic.yml'
 task:
   workerType: desktop-test-xlarge
   payload:
     maxRunTime: 5400
     command:
-      - --test-suite={{suite}}
+      - --test-suite=mochitest-chrome
   metadata:
     name: '[TC] Android API 15 mochitest-chrome'
     description: Mochitest chrome run
   extra:
     suite:
-      name: mochitest-chrome
+      name: mochitest
+      flavor: chrome
     treeherder:
       groupSymbol: tc-M
       symbol: c

--- a/taskcluster/ci/legacy/tasks/tests/fx_android-api-15_mochitest_clipboard.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_android-api-15_mochitest_clipboard.yml
@@ -1,17 +1,18 @@
 ---
 $inherits:
   from: 'tasks/tests/fx_android-api-15_generic.yml'
 task:
   workerType: desktop-test-xlarge
   payload:
     command:
-      - --test-suite={{suite}}
+      - --test-suite=mochitest-plain-clipboard
   metadata:
     name: '[TC] Android 4.3 API15+ mochitest-clipboard'
     description: Mochitest Clipboard run
   extra:
     suite:
-      name: mochitest-plain-clipboard
+      name: mochitest
+      flavor: plain-clipboard
     treeherder:
       groupSymbol: tc-M
       symbol: cl

--- a/taskcluster/ci/legacy/tasks/tests/fx_android-api-15_mochitest_gl.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_android-api-15_mochitest_gl.yml
@@ -1,19 +1,20 @@
 ---
 $inherits:
   from: 'tasks/tests/fx_android-api-15_generic.yml'
 task:
   payload:
     maxRunTime: 7200
     command:
-      - --test-suite={{suite}}{{chunk}}
+      - --test-suite=mochitest-gl-{{chunk}}
   metadata:
     name: '[TC] Android 4.3 API15+ mochitest-gl-{{chunk}}'
     description: Mochitest WebGL run {{chunk}}
   extra:
     chunks:
       total: 10
     suite:
-      name: mochitest-gl-{{chunk}}
+      name: mochitest
+      flavor: mochitest-gl
     treeherder:
       groupSymbol: tc-M
       symbol: gl{{chunk}}

--- a/taskcluster/ci/legacy/tasks/tests/fx_android-api-15_mochitest_gpu.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_android-api-15_mochitest_gpu.yml
@@ -1,16 +1,17 @@
 ---
 $inherits:
   from: 'tasks/tests/fx_android-api-15_generic.yml'
 task:
   payload:
     command:
-      - --test-suite={{suite}}
+      - --test-suite=mochitest-plain-gpu
   metadata:
     name: '[TC] Android 4.3 API15+ mochitest-gpu'
     description: Mochitest GPU run
   extra:
     suite:
-      name: mochitest-plain-gpu
+      name: mochitest
+      flavor: plain-gpu
     treeherder:
       groupSymbol: tc-M
       symbol: gpu

--- a/taskcluster/ci/legacy/tasks/tests/fx_android-api-15_mochitest_media.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_android-api-15_mochitest_media.yml
@@ -1,19 +1,20 @@
 ---
 $inherits:
   from: 'tasks/tests/fx_android-api-15_generic.yml'
 task:
   workerType: desktop-test-xlarge
   payload:
     command:
-      - --test-suite={{suite}}{{chunk}}
+      - --test-suite=mochitest-media-{{chunk}}
   metadata:
     name: '[TC] Android 4.3 API15+ mochitest-media-{{chunk}}'
     description: Mochitest Media run {{chunk}}
   extra:
     chunks:
       total: 2
     suite:
-      name: mochitest-media-{{chunk}}
+      name: mochitest
+      flavor: mochitest-media
     treeherder:
       groupSymbol: tc-M
       symbol: mda{{chunk}}

--- a/taskcluster/ci/legacy/tasks/tests/fx_android-api-15_mochitest_plain.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_android-api-15_mochitest_plain.yml
@@ -1,19 +1,20 @@
 ---
 $inherits:
   from: 'tasks/tests/fx_android-api-15_generic.yml'
 task:
   workerType: desktop-test-xlarge
   payload:
     command:
-      - --test-suite={{suite}}{{chunk}}
+      - --test-suite=mochitest-{{chunk}}
   metadata:
     name: '[TC] Android 4.3 API15+ mochitest-{{chunk}}'
     description: Mochitest plain run {{chunk}}
   extra:
     chunks:
       total: 20
     suite:
-      name: mochitest-{{chunk}}
+      name: mochitest
+      flavor: plain-chunked
     treeherder:
       groupSymbol: tc-M
       symbol: {{chunk}}

--- a/taskcluster/ci/legacy/tasks/tests/fx_android-api-15_reftest.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_android-api-15_reftest.yml
@@ -1,20 +1,19 @@
 ---
 $inherits:
   from: 'tasks/tests/fx_android-api-15_generic.yml'
 task:
   workerType: desktop-test-xlarge
   payload:
     maxRunTime: 10800
-    command:
-      - --test-suite={{suite}}{{chunk}}
   metadata:
     name: '[TC] Android 4.3 API15+ reftest-{{chunk}}'
     description: Reftest run {{chunk}}
   extra:
     chunks:
       total: 16
     suite:
-      name: reftest-{{chunk}}
+      name: reftest
+      flavor: reftest
     treeherder:
       groupSymbol: tc-R
       symbol: R{{chunk}}

--- a/taskcluster/ci/legacy/tasks/tests/fx_android-api-15_reftest_dbg.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_android-api-15_reftest_dbg.yml
@@ -1,13 +1,12 @@
 $inherits:
   from: 'tasks/tests/fx_android-api-15_reftest.yml'
 task:
   payload:
     command:
+      - --test-suite=reftest-debug-{{chunk}}
       - --download-symbols=true
   extra:
-    suite:
-      name: reftest-debug-{{chunk}}
     chunks:
       total: 48
     treeherder:
       tier: 1

--- a/taskcluster/ci/legacy/tasks/tests/fx_android-api-15_reftest_opt.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_android-api-15_reftest_opt.yml
@@ -1,10 +1,11 @@
 ---
 $inherits:
   from: 'tasks/tests/fx_android-api-15_reftest.yml'
 task:
   payload:
     command:
+      - --test-suite=reftest-{{chunk}}
       - --download-symbols=ondemand
   extra:
     treeherder:
       tier: 2

--- a/taskcluster/ci/legacy/tasks/tests/fx_android-api-15_robocop.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_android-api-15_robocop.yml
@@ -1,19 +1,20 @@
 ---
 $inherits:
   from: 'tasks/tests/fx_android-api-15_generic.yml'
 task:
   workerType: desktop-test-xlarge
   payload:
     command:
-      - --test-suite={{suite}}{{chunk}}
+      - --test-suite=robocop-{{chunk}}
   metadata:
     name: '[TC] Android 4.3 API15+ robocop-{{chunk}}'
     description: Robocop run {{chunk}}
   extra:
     chunks:
       total: 4
     suite:
-      name: robocop-{{chunk}}
+      name: robocop
+      flavor: robocop
     treeherder:
       groupSymbol: tc-M
       symbol: rc{{chunk}}

--- a/taskcluster/ci/legacy/tasks/tests/fx_android-api-15_xpcshell.yml
+++ b/taskcluster/ci/legacy/tasks/tests/fx_android-api-15_xpcshell.yml
@@ -1,20 +1,21 @@
 ---
 $inherits:
   from: 'tasks/tests/fx_android-api-15_generic.yml'
 task:
   workerType: desktop-test-xlarge
   payload:
     maxRunTime: 7200
     command:
-      - --test-suite={{suite}}{{chunk}}
+      - --test-suite=xpcshell-{{chunk}}
   metadata:
     name: '[TC] Android 4.3 API15+ xpcshell-{{chunk}}'
     description: XPCShell run {{chunk}}
   extra:
     chunks:
       total: 3
     suite:
-      name: xpcshell-{{chunk}}
+      name: xpcshell
+      flavor: xpcshell
     treeherder:
       groupSymbol: tc-X
       symbol: {{chunk}}