--- a/taskcluster/ci/test/tests.yml
+++ b/taskcluster/ci/test/tests.yml
@@ -29,16 +29,20 @@ awsy-stylo:
     treeherder-symbol: tc-SY-stylo(sy)
     run-on-projects:
         by-test-platform:
             macosx64-stylo/.*: ['mozilla-central', 'try']
             default: built-projects
     max-run-time: 7200
     instance-size: xlarge
     allow-software-gl-layers: false
+    run-on-projects:
+        by-test-platform:
+            .*-stylo.*: ['autoland', 'mozilla-central', 'try']
+            default: built-projects
     mozharness:
         script: awsy_script.py
         config:
             by-test-platform:
                 # Do not run on Windows until
                 # bug 1385027 (stylo tests on win) is fixed.
                 #windows10-64-stylo/opt:
                 #    - awsy/taskcluster_windows_config.py
@@ -55,16 +59,20 @@ awsy-stylo-sequential:
     treeherder-symbol: tc-SY-stylo-seq(sy)
     run-on-projects:
         by-test-platform:
             macosx64-stylo/.*: ['mozilla-central', 'try']
             default: built-projects
     max-run-time: 7200
     instance-size: xlarge
     allow-software-gl-layers: false
+    run-on-projects:
+        by-test-platform:
+            .*-stylo.*: ['autoland', 'mozilla-central', 'try']
+            default: built-projects
     mozharness:
         script: awsy_script.py
         config:
             # Only run on Linux64.
             by-test-platform:
                 linux64-stylo-sequential/opt:
                     - awsy/linux_config.py
         extra-options:
@@ -75,17 +83,17 @@ cppunit:
     description: "CPP Unit Tests"
     suite: cppunittest
     treeherder-symbol: tc(Cpp)
     e10s: false
     run-on-projects:
         by-test-platform:
             windows10-64-asan/opt: []  # as an exception to windows.*
             linux64-qr/.*: ['mozilla-central', 'try']
-            macosx64-stylo/.*: ['autoland', 'mozilla-central', 'try']
+            .*-stylo.*: ['autoland', 'mozilla-central', 'try']
             default: built-projects
     mozharness:
         by-test-platform:
             android.*:
                 script: android_emulator_unittest.py
                 no-read-buildbot-config: true
                 config:
                     - android/androidarm_4_3.py
@@ -115,17 +123,19 @@ crashtest:
             android.*: xlarge
             default: default
     run-on-projects:
         by-test-platform:
             # Deactivate try on Buildbot, by default. We don't have enough machines
             windows8-64.*: ['mozilla-release', 'mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland']
             windows8-64-devedition/opt: built-projects  # No dev edition outside of supported branches
             windows10.*: []
-            macosx64-stylo/.*: ['autoland', 'mozilla-central', 'try']
+            linux64-stylo.*: ['autoland', 'mozilla-central', 'try']
+            macosx64-stylo.*: ['autoland', 'mozilla-central', 'try']
+            windows7-32-stylo.*: ['autoland', 'mozilla-central', 'try']
             default: built-projects
     worker-type:
         by-test-platform:
             windows8-64.*: buildbot-bridge/buildbot-bridge
             default: null
     chunks:
         by-test-platform:
             android-4.3-arm7-api-15/debug: 10
@@ -678,17 +688,17 @@ mochitest-chrome:
 
 mochitest-chrome-style:
     description: "Mochitest chrome run for style system"
     suite: mochitest/chrome-style
     treeherder-symbol: tc-M(cs)
     loopback-video: true
     run-on-projects:
         by-test-platform:
-            macosx64-stylo/.*: ['autoland', 'mozilla-central', 'try']
+            .*-stylo.*: ['autoland', 'mozilla-central', 'try']
             default: built-projects
     e10s: false
     mozharness:
         mochitest-flavor: chrome
         script: desktop_unittest.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
@@ -947,17 +957,17 @@ mochitest-media:
 
 mochitest-style:
     description: "Mochitest plain run for style system"
     suite: mochitest/plain-style
     treeherder-symbol: tc-M(s)
     loopback-video: true
     run-on-projects:
         by-test-platform:
-            macosx64-stylo/.*: ['autoland', 'mozilla-central', 'try']
+            .*-stylo.*: ['autoland', 'mozilla-central', 'try']
             default: built-projects
     mozharness:
         mochitest-flavor: plain
         script: desktop_unittest.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 windows.*:
@@ -1067,17 +1077,19 @@ reftest:
     suite: reftest/reftest
     treeherder-symbol: tc-R(R)
     run-on-projects:
         by-test-platform:
             # Deactivate try on Buildbot, by default. We don't have enough machines
             windows8-64.*: ['mozilla-release', 'mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland']
             windows8-64-devedition/opt: built-projects  # No dev edition outside of supported branches
             windows10.*: []
-            macosx64-stylo/.*: ['autoland', 'mozilla-central', 'try']
+            linux64-stylo.*: ['autoland', 'mozilla-central', 'try']
+            macosx64-stylo.*: ['autoland', 'mozilla-central', 'try']
+            windows7-32-stylo.*: ['autoland', 'mozilla-central', 'try']
             default: built-projects
     worker-type:
         by-test-platform:
             windows8-64.*: buildbot-bridge/buildbot-bridge
             default: null
     instance-size:
         by-test-platform:
             android.*: xlarge
@@ -1218,19 +1230,17 @@ reftest-stylo:
     description: "Reftest run for Stylo"
     suite: reftest/reftest-stylo
     treeherder-symbol: tc-R(Rs)
     virtualization: virtual-with-gpu
     docker-image: {"in-tree": "desktop1604-test"}
     chunks: 16
     run-on-projects:
         by-test-platform:
-            .*-stylo/opt: [ 'autoland', 'mozilla-central', 'try' ] # not on mozilla-inbound
-            macosx64-stylo/debug: [ 'autoland', 'mozilla-central', 'try' ] # not on mozilla-inbound
-            linux64-stylo-sequential/opt: [ 'mozilla-central']
+            .*-stylo.*: ['autoland', 'mozilla-central', 'try']
             default: built-projects
     mozharness:
         script: desktop_unittest.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 windows.*:
                     - unittests/win_taskcluster_unittest.py
@@ -1265,19 +1275,17 @@ robocop:
 talos-chrome:
     description: "Talos chrome"
     suite: talos
     try-name: chromez
     treeherder-symbol: tc-T(c)
     virtualization: hardware
     run-on-projects:
         by-test-platform:
-            linux64-stylo-sequential/.*: ['mozilla-central','try']
-            linux64-stylo/.*: ['mozilla-central', 'try']
-            macosx64-stylo/.*: ['autoland', 'mozilla-central', 'try']
+            .*-stylo.*: ['mozilla-central', 'try']
             default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     max-run-time: 3600
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
@@ -1294,19 +1302,17 @@ talos-chrome:
 talos-dromaeojs:
     description: "Talos dromaeojs"
     suite: talos
     try-name: dromaeojs
     treeherder-symbol: tc-T(d)
     virtualization: hardware
     run-on-projects:
         by-test-platform:
-            linux64-stylo-sequential/.*: ['mozilla-central','try']
-            linux64-stylo/.*: ['mozilla-central', 'try']
-            macosx64-stylo/.*: ['autoland', 'mozilla-central', 'try']
+            .*-stylo.*: ['mozilla-central', 'try']
             default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     max-run-time: 3600
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
@@ -1323,19 +1329,17 @@ talos-dromaeojs:
 talos-g1:
     description: "Talos g1"
     suite: talos
     try-name: g1
     treeherder-symbol: tc-T(g1)
     virtualization: hardware
     run-on-projects:
         by-test-platform:
-            linux64-stylo-sequential/.*: ['mozilla-central','try']
-            linux64-stylo/.*: ['mozilla-central', 'try']
-            macosx64-stylo/.*: ['autoland', 'mozilla-central', 'try']
+            .*-stylo.*: ['mozilla-central', 'try']
             default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     max-run-time: 7200
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
@@ -1353,19 +1357,17 @@ talos-g2:
     description: "Talos g2"
     suite: talos
     try-name: g2
     treeherder-symbol: tc-T(g2)
     virtualization: hardware
     max-run-time: 7200
     run-on-projects:
         by-test-platform:
-            linux64-stylo-sequential/.*: ['mozilla-central','try']
-            linux64-stylo/.*: ['mozilla-central', 'try']
-            macosx64-stylo/.*: ['autoland', 'mozilla-central', 'try']
+            .*-stylo.*: ['mozilla-central', 'try']
             default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
                     - talos/mac_config.py
@@ -1381,19 +1383,17 @@ talos-g2:
 talos-g3:
     description: "Talos g3"
     suite: talos
     try-name: g3
     treeherder-symbol: tc-T(g3)
     virtualization: hardware
     run-on-projects:
         by-test-platform:
-            linux64-stylo-sequential/.*: ['mozilla-central','try']
-            linux64-stylo/.*: ['mozilla-central', 'try']
-            macosx64-stylo/.*: ['autoland', 'mozilla-central', 'try']
+            .*-stylo.*: ['mozilla-central', 'try']
             default: ['mozilla-beta','mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     max-run-time: 3600
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
@@ -1410,19 +1410,17 @@ talos-g3:
 talos-g4:
     description: "Talos g4"
     suite: talos
     try-name: g4
     treeherder-symbol: tc-T(g4)
     virtualization: hardware
     run-on-projects:
         by-test-platform:
-            linux64-stylo-sequential/.*: ['mozilla-central','try']
-            linux64-stylo/.*: ['mozilla-central', 'try']
-            macosx64-stylo/.*: ['autoland', 'mozilla-central', 'try']
+            .*-stylo.*: ['mozilla-central', 'try']
             default: ['mozilla-beta','mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     max-run-time: 3600
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
@@ -1439,19 +1437,17 @@ talos-g4:
 talos-g5:
     description: "Talos g5"
     suite: talos
     try-name: g5
     treeherder-symbol: tc-T(g5)
     virtualization: hardware
     run-on-projects:
         by-test-platform:
-            linux64-stylo-sequential/.*: ['mozilla-central','try']
-            linux64-stylo/.*: ['mozilla-central', 'try']
-            macosx64-stylo/.*: ['autoland', 'mozilla-central', 'try']
+            .*-stylo.*: ['mozilla-central', 'try']
             default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     max-run-time: 3600
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
@@ -1469,19 +1465,17 @@ talos-g5:
 talos-other:
     description: "Talos other"
     suite: talos
     try-name: other
     treeherder-symbol: tc-T(o)
     virtualization: hardware
     run-on-projects:
         by-test-platform:
-            linux64-stylo-sequential/.*: ['mozilla-central','try']
-            linux64-stylo/.*: ['mozilla-central', 'try']
-            macosx64-stylo/.*: ['autoland', 'mozilla-central', 'try']
+            .*-stylo.*: ['mozilla-central', 'try']
             default: ['mozilla-beta','mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     max-run-time: 3600
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
@@ -1498,19 +1492,17 @@ talos-other:
 talos-perf-reftest:
     description: "Talos perf-reftest"
     suite: talos
     try-name: perf-reftest
     treeherder-symbol: tc-T(p)
     virtualization: hardware
     run-on-projects:
         by-test-platform:
-            linux64-stylo-sequential/.*: ['mozilla-central', 'try']
-            linux64-stylo/.*: ['mozilla-central', 'try']
-            macosx64-stylo/.*: ['autoland', 'mozilla-central', 'try']
+            .*-stylo.*: ['mozilla-central', 'try']
             default: ['mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     max-run-time: 3600
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 windows.*:
@@ -1521,17 +1513,20 @@ talos-perf-reftest:
             - --suite=perf-reftest
 
 talos-perf-reftest-singletons:
     description: "Talos perf-reftest singletons"
     suite: talos
     try-name: perf-reftest-singletons
     treeherder-symbol: tc-T(ps)
     virtualization: hardware
-    run-on-projects: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
+    run-on-projects:
+        by-test-platform:
+            .*-stylo.*: ['mozilla-central', 'try']
+            default: ['mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     max-run-time: 3600
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
                     - talos/mac_config.py
@@ -1545,19 +1540,17 @@ talos-perf-reftest-singletons:
 talos-svgr:
     description: "Talos svgr"
     suite: talos
     try-name: svgr
     treeherder-symbol: tc-T(s)
     virtualization: hardware
     run-on-projects:
         by-test-platform:
-            linux64-stylo-sequential/.*: ['mozilla-central','try']
-            linux64-stylo/.*: ['mozilla-central', 'try']
-            macosx64-stylo/.*: ['autoland', 'mozilla-central', 'try']
+            .*-stylo.*: ['mozilla-central', 'try']
             default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     max-run-time: 3600
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
@@ -1574,19 +1567,17 @@ talos-svgr:
 talos-tp5o:
     description: "Talos tp5o"
     suite: talos
     try-name: tp5o
     treeherder-symbol: tc-T(tp)
     virtualization: hardware
     run-on-projects:
         by-test-platform:
-            linux64-stylo-sequential/.*: ['mozilla-central','try']
-            linux64-stylo/.*: ['mozilla-central', 'try']
-            macosx64-stylo/.*: ['autoland', 'mozilla-central', 'try']
+            .*-stylo.*: ['mozilla-central', 'try']
             default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     max-run-time: 3600
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
@@ -1681,16 +1672,17 @@ talos-tp6-stylo-threads:
 talos-xperf:
     description: "Talos xperf"
     suite: talos
     try-name: xperf
     treeherder-symbol: tc-T(x)
     run-on-projects:
         by-test-platform:
             windows7-32.*: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try', 'date']
+            .*-stylo.*: ['mozilla-central', 'try']
             default: []
     max-run-time: 3600
     mozharness:
         script: talos_script.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 macosx.*:
@@ -1728,17 +1720,17 @@ web-platform-tests:
       by-test-platform:
         macosx64/opt: 5
         macosx64/debug: 10
         default: 12
     max-run-time: 7200
     instance-size: xlarge
     run-on-projects:
         by-test-platform:
-            macosx64-stylo/.*: ['autoland', 'mozilla-central', 'try']
+            .*-stylo.*: ['autoland', 'mozilla-central', 'try']
             default: built-projects
     mozharness:
         script: web_platform_tests.py
         no-read-buildbot-config: true
         chunked: true
         config:
             by-test-platform:
                 windows.*:
@@ -1800,17 +1792,17 @@ web-platform-tests-reftests:
     instance-size: xlarge
     chunks:
       by-test-platform:
         macosx.*: 1
         windows.*: 1
         default: 6
     run-on-projects:
         by-test-platform:
-            macosx64-stylo/.*: ['autoland', 'mozilla-central', 'try']
+            .*-stylo.*: ['autoland', 'mozilla-central', 'try']
             default: built-projects
     mozharness:
         script: web_platform_tests.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
                 windows.*:
                     - web_platform_tests/prod_config_windows_taskcluster.py