diff --git a/taskcluster/ci/test/compiled.yml b/taskcluster/ci/test/compiled.yml
index 75bac1746a05..22ec4e28cc22 100644
--- a/taskcluster/ci/test/compiled.yml
+++ b/taskcluster/ci/test/compiled.yml
@@ -42,14 +42,17 @@ gtest:
     instance-size: xlarge
     run-on-projects:
         by-test-platform:
-            windows.*-pgo/.*: []  # permafails on pgo
+            windows.*-shippable/.*: []  # permafails on shippable
+            windows.*-pgo/.*: []  # permafails on pgo too
             windows.*-nightly/.*: []  # permafails on nightly too
             windows10-64-asan/opt: []  # permafails on asan too
             .*-devedition/.*: []  # don't run on devedition
             default: built-projects
     tier:
         by-test-platform:
+            windows7-32-shippable.*: 3
             windows7-32-pgo.*: 3
+            windows10-64-shippable.*: 3
             windows10-64-pgo.*: 3
             windows10-64-asan.*: 3
             default: default
diff --git a/taskcluster/ci/test/mochitest.yml b/taskcluster/ci/test/mochitest.yml
index 312ce31c938e..32d591d39b45 100644
--- a/taskcluster/ci/test/mochitest.yml
+++ b/taskcluster/ci/test/mochitest.yml
@@ -130,7 +130,7 @@ browser-instrumentation:
     tier: 3
     run-on-projects:
         by-test-platform:
-            windows.*-nightly/.*: ["mozilla-central"]
+            windows.*-(?:nightly|shippable)/.*: ["mozilla-central"]
             default: []
     max-run-time: 14400
     mozharness:
@@ -144,12 +144,11 @@ browser-screenshots:
     loopback-video: true
     run-on-projects:
         by-test-platform:
-            # We don't want debug, pgo, devedition or nightly builds
-            windows7-32-pgo(?:-qr)?/opt: ['mozilla-central', 'integration']
-            windows10-64-pgo(?:-qr)?/opt: ['mozilla-central', 'integration']
+            windows7-32(?:-pgo|-shippable)(?:-qr)?/opt: ['mozilla-central', 'integration']
+            windows10-64(?:-pgo|-shippable)(?:-qr)?/opt: ['mozilla-central', 'integration']
             (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central']
-            linux64-pgo(?:-qr)?/opt: ['mozilla-central', 'integration']
-            macosx64/opt: ['mozilla-central', 'integration']
+            linux64-(?:pgo|shippable)(?:-qr)?/opt: ['mozilla-central', 'integration']
+            macosx64(?:-shippable)?/opt: ['mozilla-central', 'integration']
             default: []
     max-run-time: 3600
     mozharness:
diff --git a/taskcluster/ci/test/web-platform.yml b/taskcluster/ci/test/web-platform.yml
index 5774cbfcd3a0..d30f22878ed5 100644
--- a/taskcluster/ci/test/web-platform.yml
+++ b/taskcluster/ci/test/web-platform.yml
@@ -107,13 +107,13 @@ web-platform-tests-reftests:
         by-test-platform:
             android.*: ['mozilla-central', 'try']
             windows10-aarch64/opt: ['try', 'mozilla-central']
-            linux64-pgo-qr/.*: ['release', 'try']  # skip on integration branches due to high load
+            linux64(?:-pgo|-shippable)?-qr/.*: ['release', 'try']  # skip on integration branches due to high load
             default: built-projects
     tier:
         by-test-platform:
             android.*: 2
             linux64-asan/opt: 2
-            linux64-qr/.*: 2  # can't be tier-1 if it's not running on integration branches
+            linux64(?:-pgo|-shippable)?-qr/.*: 2  # can't be tier-1 if it's not running on integration branches
             default: default
     mozharness:
         extra-options: