diff --git a/taskcluster/ci/test/test-platforms.yml b/taskcluster/ci/test/test-platforms.yml
index 25ab5ddbd00c..6578cc06ffc2 100644
--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@@ -373,21 +373,22 @@ windows10-32-mingwclang/opt:
 macosx1015-64-shippable/opt:
     build-platform: macosx64-shippable/opt
     test-sets:
-        - macosx64-talos
         - awsy
         - browsertime
+        - macosx64-talos
 
 macosx1015-64-shippable-qr/opt:
     build-platform: macosx64-shippable/opt
     test-sets:
-        - macosx64-talos
         - awsy
         - browsertime
+        - desktop-screenshot-capture
+        - macosx1015-64-qr-tests
+        - macosx64-talos
         - raptor-chrome
         - raptor-firefox
         - raptor-firefox-power
         - talos-profiling
-        - macosx1015-64-qr-tests
         - web-platform-tests
         - web-platform-tests-backlog
         - web-platform-tests-wdspec-headless
@@ -405,11 +406,13 @@ macosx1015-64-devedition/opt:
 macosx1015-64-devedition-qr/opt:
     build-platform: macosx64-devedition/opt
     test-sets:
+        - macosx1015-64-qr-tests
         - web-platform-tests
 
 macosx1015-64-qr/opt:
     build-platform: macosx64/opt
     test-sets:
+        - desktop-screenshot-capture
         - macosx1015-64-qr-failure-tests
         - macosx1015-64-qr-tests
         - web-platform-tests
@@ -427,29 +430,11 @@ macosx1015-64-ccov-qr/opt:
     test-sets:
         - macosx1015-64-qr-tests
 
-macosx1014-64-qr/opt:
-    build-platform: macosx64/opt
-    test-sets:
-        - macosx1014-64-qr-tests
-        - desktop-screenshot-capture
-
 macosx1014-64-shippable-qr/opt:
     build-platform: macosx64-shippable/opt
     test-sets:
-        - macosx1014-64-qr-tests
-        - desktop-screenshot-capture
         - browsertime
-        - talos
-
-macosx1014-64-devedition-qr/opt:
-    build-platform: macosx64-devedition/opt
-    test-sets:
-        - macosx1014-64-qr-tests
-
-macosx1014-64-qr/debug:
-    build-platform: macosx64/debug
-    test-sets:
-        - macosx1014-64-qr-tests
+        - macosx64-talos
 
 ##
 # Android platforms (matching /android-em.*/)
diff --git a/taskcluster/ci/test/test-sets.yml b/taskcluster/ci/test/test-sets.yml
index ee7db8c2ac27..30037f74e57f 100644
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -443,6 +443,9 @@ macosx1015-64-qr-tests:
     - mochitest-webgpu
     - reftest
     - telemetry-tests-client
+    - test-verify
+    - test-verify-gpu
+    - test-verify-wpt
     - xpcshell
 
 # debug only
@@ -451,11 +454,6 @@ macosx1015-64-tests:
     - reftest
     - web-platform-tests-reftest
 
-macosx1014-64-qr-tests:
-    - test-verify
-    - test-verify-gpu
-    - test-verify-wpt
-
 macosx64-talos:
     - talos-bcv
     - talos-chrome
diff --git a/taskcluster/ci/test/xpcshell.yml b/taskcluster/ci/test/xpcshell.yml
index 41871152e77e..1bd6bfcf58fc 100644
--- a/taskcluster/ci/test/xpcshell.yml
+++ b/taskcluster/ci/test/xpcshell.yml
@@ -63,7 +63,6 @@ xpcshell:
             default: 5
     max-run-time:
         by-test-platform:
-            macosx1014-64(-shippable|-devedition|-asan)?(-qr)?/.*: 5400
             windows.*(-shippable)/opt: 5400
             .*64-ccov(-qr)?/.*: 7200
             .*-tsan/opt: 7200