1 files changed, 8 insertions, 10 deletions

diff --git a/taskcluster/ci/test/test-sets.yml b/taskcluster/ci/test/test-sets.yml
index 16807b5b9e..4a8f3d019b 100644
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -15,6 +15,10 @@
 
 ### Feature-specific test groups
 
+webgpu:
+    - mochitest-webgpu
+    - web-platform-tests-webgpu
+
 web-platform-tests:
     - web-platform-tests
     - web-platform-tests-crashtest
@@ -22,7 +26,6 @@ web-platform-tests:
     - web-platform-tests-print-reftest
     - web-platform-tests-reftest
     - web-platform-tests-wdspec
-    - web-platform-tests-webgpu
     - web-platform-tests-canvas
 
 web-platform-tests-backlog:
@@ -32,9 +35,6 @@ web-platform-tests-backlog:
 mochitest-devtools-chrome:
     - mochitest-devtools-chrome
 
-mochitest-webgpu:
-    - mochitest-webgpu
-
 talos:
     - talos-bcv
     - talos-chrome
@@ -55,6 +55,7 @@ talos:
     - talos-tabswitch
     - talos-realworld-webextensions
     - talos-webgl
+    - talos-pdfpaint
     # - talos-h1 Bug 1487031 - Disabled for not finding actionable regressions
     # - talos-h2 Bug 1487031 - Disabled for not finding actionable regressions
 
@@ -83,6 +84,7 @@ talos-ref-hw:
 
 browsertime:
     - browsertime-tp6
+    - browsertime-tp7
     - browsertime-tp6-essential
     - browsertime-tp6-bytecode
     - browsertime-tp6-live
@@ -235,7 +237,6 @@ windows32-2009-tests:
     - mochitest-plain
     - mochitest-plain-gpu
     - mochitest-remote
-    - mochitest-webgpu
     - reftest
     - telemetry-tests-client
     - test-verify
@@ -279,7 +280,6 @@ windows11-2009-tests:
     - mochitest-plain
     - mochitest-plain-gpu
     - mochitest-remote
-    - mochitest-webgpu
     - mochitest-webgl1-core
     - mochitest-webgl1-ext
     - mochitest-webgl2-core
@@ -301,7 +301,6 @@ mingwclang-tests-debug:
     - mochitest-webgl1-ext
     - mochitest-webgl2-core
     - mochitest-webgl2-ext
-    - mochitest-webgpu
     - reftest
     - telemetry-tests-client
 
@@ -318,7 +317,6 @@ mingwclang-win32-tests-debug:
     - mochitest-webgl1-ext
     - mochitest-webgl2-core
     - mochitest-webgl2-ext
-    - mochitest-webgpu
     # - reftest - disabled, see bug 1642719
     - telemetry-tests-client
 
@@ -346,6 +344,7 @@ windows-talos:
     - talos-tabswitch
     - talos-realworld-webextensions
     - talos-webgl
+    - talos-pdfpaint
     # - talos-h1 Bug 1487031 - Disabled for not finding actionable regressions
 
 windows-ref-hw-tests:
@@ -366,7 +365,6 @@ macosx1100-64-qr-tests:
     - mochitest-browser-media
     - mochitest-chrome-gpu
     - mochitest-media
-    - mochitest-webgpu
     - mochitest-webgl1-core
     - mochitest-webgl1-ext
     - mochitest-webgl2-core
@@ -400,7 +398,6 @@ macosx1015-64-qr-tests:
     - mochitest-webgl1-ext
     - mochitest-webgl2-core
     - mochitest-webgl2-ext
-    - mochitest-webgpu
     - reftest
     - telemetry-tests-client
     - test-verify
@@ -427,6 +424,7 @@ macosx64-talos:
     - talos-realworld-webextensions
     - talos-webgl
     - talos-tabswitch
+    - talos-pdfpaint
     # - talos-h1 # too long to unpack profile- Bug 1442893
 
 macosx1400-64-qr-tests: