--- a/taskcluster/ci/test/tests.yml
+++ b/taskcluster/ci/test/tests.yml
@@ -1020,41 +1020,29 @@ reftest:
             linux64-qr/.*: 1
             windows10-64-asan.*: 3
             default: default
 
 reftest-gpu:
     description: "Reftest GPU run"
     suite: reftest/reftest-gpu
     treeherder-symbol: tc-R(Rg)
-    chunks:
-        by-test-platform:
-            # Remove special casing when debug isn't using BBB anymore
-            windows7-32.*/debug: 1
-            default: 8
+    chunks: 8
     run-on-projects:
         by-test-platform:
             windows10.*: []
             windows8-64.*: []
             default: built-projects
-    worker-type:
-        by-test-platform:
-            windows7-32.*/debug: buildbot-bridge/buildbot-bridge
-            default: null
     instance-size: default
     virtualization: virtual-with-gpu
     max-run-time: 3600
     mozharness:
         script: desktop_unittest.py
         no-read-buildbot-config: true
-        chunked:
-            # Remove special casing when debug isn't using BBB anymore
-            by-test-platform:
-                windows7-32.*/debug: false
-                default: true
+        chunked: true
         config:
             by-test-platform:
                 windows.*:
                     - unittests/win_taskcluster_unittest.py
                 macosx.*:
                     - unittests/mac_unittest.py
                 linux.*:
                     - unittests/linux_unittest.py