diff --git a/taskcluster/ci/test/web-platform.yml b/taskcluster/ci/test/web-platform.yml
index 2dbf33c0a46c..88c6ea3bbb27 100644
--- a/taskcluster/ci/test/web-platform.yml
+++ b/taskcluster/ci/test/web-platform.yml
@@ -71,11 +71,8 @@ web-platform-tests:
             default: 7200
     e10s: true
     variants:
-        by-test-platform:
-            linux1804-64-qr/debug: ['webrender-sw', 'fission']
-            windows10-64-2004-qr/debug: ['webrender-sw', 'fission']
-            android-em-7.0-x86_64-qr/debug: ['webrender-sw', 'fission']
-            default: ['fission']
+        - fission
+        - webrender-sw
     run-on-projects:
         by-variant:
             fission:
@@ -85,6 +82,12 @@ web-platform-tests:
                     linux.*64-(asan|tsan)(-qr)?/opt: ['trunk']
                     linux.*64-ccov-qr/opt: ['mozilla-central']
                     default: []
+            webrender-sw:
+                by-test-platform:
+                    android-em-7.0-x86_64-qr/debug: built-projects
+                    linux.*64-qr/debug: built-projects
+                    windows10-64-2004-qr/debug: built-projects
+                    default: []
             default:
                 by-test-platform:
                     .*-tsan-qr/opt: ['trunk']
@@ -158,11 +161,8 @@ web-platform-tests-reftest:
             default: 4
     e10s: true
     variants:
-        by-test-platform:
-            linux1804-64-qr/debug: ['webrender-sw', 'fission']
-            windows10-64-2004-qr/debug: ['webrender-sw', 'fission']
-            android-em-7.0-x86_64-qr/debug: ['webrender-sw', 'fission']
-            default: ['fission']
+        - fission
+        - webrender-sw
     run-on-projects:
         by-variant:
             fission:
@@ -171,6 +171,12 @@ web-platform-tests-reftest:
                     (linux.*64|windows10-64-2004)(-shippable)?-qr/opt: ['trunk']
                     linux.*64-(asan|tsan)(-qr)?/opt: ['trunk']
                     default: []
+            webrender-sw:
+                by-test-platform:
+                    android-em-7.0-x86_64-qr/debug: built-projects
+                    linux.*64-qr/debug: built-projects
+                    windows10-64-2004-qr/debug: built-projects
+                    default: []
             default:
                 by-test-platform:
                     .*-tsan-qr/opt: ['trunk']
@@ -242,11 +248,8 @@ web-platform-tests-wdspec:
             - --test-type=wdspec
             - --setpref=toolkit.asyncshutdown.log=true
     variants:
-        by-test-platform:
-            linux1804-64-qr/debug: ['webrender-sw', 'fission']
-            windows10-64-2004-qr/debug: ['webrender-sw', 'fission']
-            android-em-7.0-x86_64-qr/debug: ['webrender-sw', 'fission']
-            default: ['fission']
+        - fission
+        - webrender-sw
     run-on-projects:
         by-variant:
             fission:
@@ -255,6 +258,12 @@ web-platform-tests-wdspec:
                     (linux.*64|windows10-64-2004)(-shippable)?-qr/opt: ['trunk']
                     linux.*64-asan(-qr)?/opt: ['trunk']
                     default: []
+            webrender-sw:
+                by-test-platform:
+                    android-em-7.0-x86_64-qr/debug: built-projects
+                    linux.*64-qr/debug: built-projects
+                    windows10-64-2004-qr/debug: built-projects
+                    default: []
             default: built-projects
     tier:
         by-variant:
@@ -305,11 +314,8 @@ web-platform-tests-wdspec-headless:
     treeherder-symbol: W(WdH)
     chunks: 2
     variants:
-        by-test-platform:
-            linux1804-64-qr/debug: ['webrender-sw', 'fission']
-            windows10-64-2004-qr/debug: ['webrender-sw', 'fission']
-            android-em-7.0-x86_64-qr/debug: ['webrender-sw', 'fission']
-            default: ['fission']
+        - fission
+        - webrender-sw
     run-on-projects:
         by-variant:
             fission:
@@ -379,13 +385,8 @@ web-platform-tests-crashtest:
         extra-options:
             - --test-type=crashtest
     variants:
-        by-test-platform:
-            linux1804-64-qr/debug: ['webrender-sw', 'fission']
-            windows10-64-2004-qr/debug: ['webrender-sw', 'fission']
-            macosx101.*64-qr/debug: ['webrender-sw', 'fission']
-            android-em-7.0-x86_64-qr/debug: ['webrender-sw', 'fission']
-            linux.*64/debug: ['fission']
-            default: ['fission']
+        - fission
+        - webrender-sw
     run-on-projects:
         by-variant:
             fission:
@@ -394,6 +395,13 @@ web-platform-tests-crashtest:
                     (linux.*64|windows10-64-2004)(-shippable)?-qr/opt: ['trunk']
                     linux.*64-asan(-qr)?/opt: ['trunk']
                     default: []
+            webrender-sw:
+                by-test-platform:
+                    android-em-7.0-x86_64-qr/debug: built-projects
+                    linux.*64-qr/debug: built-projects
+                    macosx101.*64-qr/debug: built-projects
+                    windows10-64-2004-qr/debug: built-projects
+                    default: []
             default: built-projects
     tier:
         by-variant:
@@ -421,11 +429,8 @@ web-platform-tests-print-reftest:
                     default: 2
             default: default
     variants:
-        by-test-platform:
-            linux1804-64-qr/debug: ['webrender-sw', 'fission']
-            windows10-64-2004-qr/debug: ['webrender-sw', 'fission']
-            android-em-7.0-x86_64-qr/debug: ['webrender-sw', 'fission']
-            default: ['fission']
+        - fission
+        - webrender-sw
     run-on-projects:
         by-variant:
             fission:
@@ -434,6 +439,12 @@ web-platform-tests-print-reftest:
                     (linux.*64|windows10-64-2004)(-shippable)?-qr/opt: ['trunk']
                     linux.*64-asan(-qr)?/opt: ['trunk']
                     default: []
+            webrender-sw:
+                by-test-platform:
+                    android-em-7.0-x86_64-qr/debug: built-projects
+                    linux.*64-qr/debug: built-projects
+                    windows10-64-2004-qr/debug: built-projects
+                    default: []
             default: built-projects
     mozharness:
         extra-options:
@@ -489,11 +500,8 @@ test-coverage-wpt:
     treeherder-symbol: TCw
     max-run-time: 10800
     variants:
-        by-test-platform:
-            linux1804-64-qr/debug: ['webrender-sw', 'fission']
-            windows10-64-2004-qr/debug: ['webrender-sw', 'fission']
-            android-em-7.0-x86_64-qr/debug: ['webrender-sw', 'fission']
-            default: ['fission']
+        - fission
+        - webrender-sw
     run-on-projects:
         by-variant:
             fission:
@@ -502,6 +510,12 @@ test-coverage-wpt:
                     linux.*64(-shippable)?-qr/opt: ['trunk']
                     windows10-64-2004(-shippable)?-qr/opt: ['trunk']
                     default: []
+            webrender-sw:
+                by-test-platform:
+                    android-em-7.0-x86_64-qr/debug: built-projects
+                    linux.*64-qr/debug: built-projects
+                    windows10-64-2004-qr/debug: built-projects
+                    default: []
             default:
                 by-test-platform:
                     .*-ccov.*/.*: built-projects