--- a/taskcluster/ci/test/mochitest.yml
+++ b/taskcluster/ci/test/mochitest.yml
@@ -247,16 +247,20 @@ mochitest-devtools-chrome:
         by-test-platform:
             windows10-64-asan.*: 3
             default: default
 
 mochitest-gpu:
     description: "Mochitest GPU run"
     suite: mochitest/gpu
     treeherder-symbol: tc-M(gpu)
+    run-on-projects:
+        by-test-platform:
+            .*-qr/.*: ['mozilla-central', 'autoland', 'mozilla-inbound', 'try']  # exclude beta and project branches
+            default: built-projects
     loopback-video: true
     virtualization: virtual-with-gpu
     e10s:
         by-test-platform:
             windows7-32/debug: both
             default: true
     mozharness:
         mochitest-flavor: plain

--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@@ -108,27 +108,27 @@ linux64-stylo-disabled/opt:
 
 # Stylo sequential runs check memory and performance when using a single thread.
 linux64-stylo-sequential/opt:
     build-platform: linux64/opt
     test-sets:
         - awsy-stylo-sequential
 
 # QR builds just run a subset right now. Note that the tests in this
-# test set are further restricted in tests.yml to run on certain projects
-# only, to avoid adding too much infra load.
+# test set are further restricted in {reftests,talos,...}.yml to run on
+# certain projects only, to avoid adding too much infra load.
 linux64-qr/opt:
     build-platform: linux64/opt
     test-sets:
-        - qr-tests
-        - qr-talos
+        - linux-qr-tests
+        - linux-qr-talos
 linux64-qr/debug:
     build-platform: linux64/debug
     test-sets:
-        - qr-tests
+        - linux-qr-tests
 
 linux64-ccov/opt:
     build-platform: linux64-ccov/opt
     test-sets:
         - common-tests
         - web-platform-tests
         - awsy
         - talos
@@ -227,16 +227,30 @@ windows10-64-devedition/opt:
         - desktop-screenshot-capture
         - windows-tests
 
 windows10-64-asan/opt:
     build-platform: win64-asan/opt
     test-sets:
         - common-tests
 
+# QR builds just run a subset right now. Note that the tests in this
+# test set are further restricted in {reftests,talos,...}.yml to run on
+# certain projects only, to avoid adding too much infra load.
+windows10-64-qr/debug:
+    build-platform: win64/debug
+    test-sets:
+        - windows-qr-tests
+
+windows10-64-qr/opt:
+    build-platform: win64/opt
+    test-sets:
+        - windows-qr-tests
+
+
 ##
 # MacOS X platforms (matching /macosx.*/)
 
 macosx64/debug:
     build-platform: macosx64/debug
     test-sets:
         - macosx64-tests
 

--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -99,17 +99,17 @@ stylo-disabled-tests:
     - mochitest-clipboard
     - mochitest-gpu
     - mochitest-media
     - mochitest-webgl
 
 reftest-stylo:
     - reftest-stylo
 
-qr-talos:
+linux-qr-talos:
     - talos-chrome
     - talos-dromaeojs
     - talos-g1
     # - talos-g2 # doesn't work with QR yet
     - talos-g3
     - talos-g4
     - talos-g5
     - talos-other
@@ -118,30 +118,33 @@ qr-talos:
     - talos-perf-reftest
     - talos-perf-reftest-singletons
     - talos-tp6
     - talos-tp6-stylo-threads
     - talos-speedometer
     - talos-h1
     - talos-h2
 
-qr-tests:
+linux-qr-tests:
     - cppunit
     - crashtest
     - gtest
     - jittest
     - jsreftest
     - mochitest
     - mochitest-a11y
     - mochitest-gpu
     - mochitest-media
     - mochitest-webgl
     - reftest
     - xpcshell
 
+windows-qr-tests:
+    - mochitest-gpu
+
 jsdcov-code-coverage-tests:
     - mochitest
     - mochitest-browser-chrome
     - mochitest-devtools-chrome
     - xpcshell
 
 linux-talos-stylo-disabled:
     - talos-chrome-stylo-disabled

--- a/taskcluster/taskgraph/transforms/job/mozharness_test.py
+++ b/taskcluster/taskgraph/transforms/job/mozharness_test.py
@@ -37,16 +37,17 @@ BUILDER_NAME_PREFIX = {
     'android-4.3-arm7-api-16-gradle': 'Android 4.3 armv7 api-16+',
     'windows10-64': 'Windows 10 64-bit',
     'windows10-64-nightly': 'Windows 10 64-bit',
     'windows10-64-devedition': 'Windows 10 64-bit DevEdition',
     'windows10-64-pgo': 'Windows 10 64-bit',
     'windows10-64-asan': 'Windows 10 64-bit',
     'windows10-64-stylo-disabled': 'Windows 10 64-bit',
     'windows10-64-ccov': 'Windows 10 64-bit Code Coverage',
+    'windows10-64-qr': 'Windows 10 64-bit',
     'windows7-32': 'Windows 7 32-bit',
     ('windows7-32', 'virtual-with-gpu'): 'Windows 7 VM-GFX 32-bit',
     'windows7-32-nightly': 'Windows 7 32-bit',
     'windows7-32-devedition': 'Windows 7 32-bit DevEdition',
     'windows7-32-pgo': 'Windows 7 32-bit',
     'windows7-32-stylo-disabled': 'Windows 7 32-bit',
     'windows8-64': 'Windows 8 64-bit',
     'windows8-64-nightly': 'Windows 8 64-bit',

--- a/taskcluster/taskgraph/transforms/tests.py
+++ b/taskcluster/taskgraph/transforms/tests.py
@@ -101,16 +101,21 @@ WINDOWS_WORKER_TYPES = {
       'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win10-64-gpu',
       'hardware': 'releng-hardware/gecko-t-win10-64-hw',
     },
     'windows10-64-asan': {
       'virtual': 'aws-provisioner-v1/gecko-t-win10-64',
       'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win10-64-gpu',
       'hardware': 'releng-hardware/gecko-t-win10-64-hw',
     },
+    'windows10-64-qr': {
+      'virtual': 'aws-provisioner-v1/gecko-t-win10-64',
+      'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win10-64-gpu',
+      'hardware': 'releng-hardware/gecko-t-win10-64-hw',
+    },
     # These values don't really matter since BBB will be executing them
     'windows8-64': {
       'virtual': 'aws-provisioner-v1/gecko-t-win10-64',
       'virtual-with-gpu': 'aws-provisioner-v1/gecko-t-win10-64-gpu',
       'hardware': 'releng-hardware/gecko-t-win10-64-hw',
     },
     'windows8-64-pgo': {
       'virtual': 'aws-provisioner-v1/gecko-t-win10-64',