diff --git a/taskcluster/ci/test/mochitest.yml b/taskcluster/ci/test/mochitest.yml
index 87c69cc132c5..3efc579bcfa4 100644
--- a/taskcluster/ci/test/mochitest.yml
+++ b/taskcluster/ci/test/mochitest.yml
@@ -656,7 +656,6 @@ mochitest-media:
         - socketprocess
         - socketprocess+fission
         - wayland
-        - webgl-ipc
         - webgl-ipc+fission
         - webrender-sw
         - webrender-sw+fission
@@ -675,13 +674,6 @@ mochitest-media:
                     (android|linux|windows10-64-2004|macos)(?!.*-qr).*: []
                     windows10-aarch64-qr/.*: ['mozilla-central', 'mozilla-beta', 'mozilla-release']
                     default: built-projects
-            webgl-ipc:
-                by-test-platform:
-                    linux.*64(-shippable|-asan|-tsan)?-qr/opt: ['autoland', 'mozilla-central']
-                    macosx.*64(-shippable)?-qr/(opt|debug): ['autoland', 'mozilla-central']
-                    windows10-(32|64)-2004(-shippable)?-qr/(opt|debug): ['autoland', 'mozilla-central']
-                    windows10-64-2004-asan-qr/opt: ['autoland', 'mozilla-central']
-                    default: []
             webgl-ipc+fission:
                 by-test-platform:
                     android.*: []
@@ -694,11 +686,8 @@ mochitest-media:
                 by-test-platform:
                     android-em-7.0-x86_64-qr/debug: ['autoland', 'mozilla-central']
                     android-hw-.*-aarch64-qr/debug: built-projects
-                    linux.*64(-asan|-devedition|-shippable)?-qr/(opt|debug): built-projects
-                    linux.*64-tsan-qr/opt: ['autoland', 'mozilla-central']
-                    macosx.*-64(-devedition|-shippable)?-qr/(opt|debug): built-projects
-                    windows10-(32|64)-2004(-devedition|-shippable)?-qr/(opt|debug): built-projects
-                    windows10-64-2004-asan-qr/opt: ['autoland', 'mozilla-central']
+                    linux1804-64-qr/debug: ['trunk']
+                    linux1804-64(-shippable|-asan)?-qr/opt: ['trunk']
                     default: []
             socketprocess+fission:
                 by-test-platform:
@@ -716,7 +705,8 @@ mochitest-media:
             webrender-sw:
                 by-test-platform:
                     android-em-7.0-x86_64-qr/debug: ['autoland', 'mozilla-central']
-                    linux1804-64-qr/debug: ['autoland', 'mozilla-central']
+                    linux1804-64-qr/debug: ['trunk']
+                    linux1804-64(-shippable|-asan)?-qr/opt: ['trunk']
                     default: []
             webrender-sw+fission:
                 by-test-platform:
@@ -729,9 +719,8 @@ mochitest-media:
                     android-hw-.*-arm7.*/(?:debug)?: ['trunk', 'mozilla-beta', 'mozilla-release']
                     android-em-7.0-x86_64-qr/debug-isolated-process: []
                     android.*: built-projects
-                    .*-tsan-qr/opt: []
-                    linux.*(asan|ccov)/opt: []
-                    linux.*: ['trunk']  # opt / debug (asan doesn't run normally)
+                    linux1804-64-qr/debug: ['trunk']
+                    linux1804-64(-shippable|-asan)?-qr/opt: ['trunk']
                     default: []
     loopback-video: true
     instance-size: