diff --git a/taskcluster/ci/test/compiled.yml b/taskcluster/ci/test/compiled.yml
index c7172e7cf278..dca7e284d255 100644
--- a/taskcluster/ci/test/compiled.yml
+++ b/taskcluster/ci/test/compiled.yml
@@ -80,7 +80,7 @@ jittest:
     chunks:
         by-test-platform:
             windows.*: 1
-            windows10-64-ccov/opt: 8
+            windows10-64-ccov-qr/opt: 8
             macosx.*/opt: 1
             macosx.*/debug: 3
             android.*: 10
diff --git a/taskcluster/ci/test/mochitest.yml b/taskcluster/ci/test/mochitest.yml
index 4a292235b990..c7bde2f80b3e 100644
--- a/taskcluster/ci/test/mochitest.yml
+++ b/taskcluster/ci/test/mochitest.yml
@@ -186,6 +186,7 @@ mochitest-chrome:
         by-test-platform:
             .*-ccov.*/.*: 3
             .*-qr/.*: 3
+            windows10-64-ccov-qr/opt: 3
             .*-asan/opt: 3
             .*-tsan/opt: 6
             (linux.*64|windows.*-..|macosx10..)/debug: 3
diff --git a/taskcluster/ci/test/reftest.yml b/taskcluster/ci/test/reftest.yml
index c84d36f94e89..dbf8c2d9f8e1 100644
--- a/taskcluster/ci/test/reftest.yml
+++ b/taskcluster/ci/test/reftest.yml
@@ -94,7 +94,7 @@ jsreftest:
             android-hw.*/(opt|pgo)?: 6
             windows.*\/opt: 2
             windows10-64-asan/opt: 3
-            windows10-64-ccov/opt: 5
+            windows10-64-ccov-qr/opt: 5
             linux.*64-ccov.*/.*: 5
             linux1804-64-qr/opt: 4
             linux1804-64-qr/debug: 5
@@ -140,7 +140,7 @@ reftest:
             windows.*/opt: 2
             windows.*/debug: 4
             windows10-64-asan/opt: 3
-            windows10-64-ccov/opt: 9
+            windows10-64-ccov-qr/opt: 9
             default: 8
     e10s: true
     run-on-projects:
diff --git a/taskcluster/ci/test/talos.yml b/taskcluster/ci/test/talos.yml
index c1d49c03f960..df3e7b041092 100644
--- a/taskcluster/ci/test/talos.yml
+++ b/taskcluster/ci/test/talos.yml
@@ -24,7 +24,7 @@ job-defaults:
                     - talos/mac_config.py
                 windows.*:
                     - talos/windows_config.py
-                windows10-64-ccov/opt:
+                windows10-64-ccov-qr/opt:
                     - talos/windows_vm_config.py
                 linux64-ccov.*/.*:
                     - talos/linux64_config_taskcluster.py
@@ -556,6 +556,7 @@ talos-webgl:
             .*-ccov.*/.*: []
             android.*: []
             (linux64|windows|macos).*-qr.*: ['webgl-ipc', 'webrender-sw']
+            windows10-64-ccov-qr/opt: []
             default: ['webgl-ipc']
     run-on-projects:
         by-test-platform:
diff --git a/taskcluster/ci/test/test-platforms.yml b/taskcluster/ci/test/test-platforms.yml
index ce3fa5ff24fd..552e03b15261 100644
--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@@ -224,13 +224,17 @@ windows7-32-qr/opt:
 
 # win64
 windows10-64-ccov/opt:
+    build-platform: win64-ccov/opt
+    test-sets:
+        - marionette-gpu-tests  # fails on -qr because one test requires WR disabled
+
+windows10-64-ccov-qr/opt:
     build-platform: win64-ccov/opt
     test-sets:
         - awsy
         - desktop-screenshot-capture
         - windows-reftest-gpu
         - windows-talos
-        - marionette-gpu-tests
         - windows-tests
         - windows-ccov-tests
         - windows10-tests
diff --git a/taskcluster/ci/test/web-platform.yml b/taskcluster/ci/test/web-platform.yml
index 7b9dd69108d1..752428dfbd20 100644
--- a/taskcluster/ci/test/web-platform.yml
+++ b/taskcluster/ci/test/web-platform.yml
@@ -117,7 +117,7 @@ web-platform-tests-reftest:
     treeherder-symbol: W(Wr)
     virtualization:
         by-test-platform:
-            windows10-64(?:-pgo|-shippable)?-qr/.*: virtual-with-gpu
+            windows10-64.*-qr/.*: virtual-with-gpu
             default: virtual
     chunks:
         by-test-platform:
diff --git a/taskcluster/ci/test/xpcshell.yml b/taskcluster/ci/test/xpcshell.yml
index 4dfb3f95ca67..c38aa4946e99 100644
--- a/taskcluster/ci/test/xpcshell.yml
+++ b/taskcluster/ci/test/xpcshell.yml
@@ -50,6 +50,7 @@ xpcshell:
     chunks:
         by-test-platform:
             .*-ccov.*/.*: 6
+            windows10-64-ccov-qr/opt: 6
             android-em-7.*: 4
             macosx1014-64(-shippable|-devedition|-asan)?(-qr)?/.*: 2
             linux1804-64(-qr)?/debug: 6
diff --git a/taskcluster/taskgraph/transforms/tests.py b/taskcluster/taskgraph/transforms/tests.py
index c915dc396858..d8cc06816fca 100644
--- a/taskcluster/taskgraph/transforms/tests.py
+++ b/taskcluster/taskgraph/transforms/tests.py
@@ -109,6 +109,11 @@ WINDOWS_WORKER_TYPES = {
         "virtual-with-gpu": "t-win10-64-gpu-s",
         "hardware": "t-win10-64-1803-hw",
     },
+    "windows10-64-ccov-qr": {
+        "virtual": "t-win10-64",
+        "virtual-with-gpu": "t-win10-64-gpu-s",
+        "hardware": "t-win10-64-1803-hw",
+    },
     "windows10-64-devedition": {
         "virtual": "t-win10-64",
         "virtual-with-gpu": "t-win10-64-gpu-s",