--- a/taskcluster/ci/test/tests.yml
+++ b/taskcluster/ci/test/tests.yml
@@ -1119,16 +1119,17 @@ reftest-gpu:
     docker-image: {"in-tree": "desktop1604-test"}
     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:
         by-test-platform:
             default: default
     virtualization: virtual-with-gpu
     max-run-time:
         by-test-platform:
             default: 3600

--- a/taskcluster/taskgraph/transforms/job/mozharness_test.py
+++ b/taskcluster/taskgraph/transforms/job/mozharness_test.py
@@ -33,16 +33,17 @@ BUILDER_NAME_PREFIX = {
     'android-4.3-arm7-api-15': 'Android 4.3 armv7 API 15+',
     'android-4.2-x86': 'Android 4.2 x86 Emulator',
     'android-4.3-arm7-api-15-gradle': 'Android 4.3 armv7 API 15+',
     'windows10-64': 'Windows 10 64-bit',
     'windows10-64-nightly': 'Windows 10 64-bit',
     'windows10-64-pgo': 'Windows 10 64-bit',
     'windows10-64-asan': '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-pgo': 'Windows 7 32-bit',
     'windows8-64': 'Windows 8 64-bit',
     'windows8-64-nightly': 'Windows 8 64-bit',
     'windows8-64-pgo': 'Windows 8 64-bit',
 }
 
 VARIANTS = [
@@ -487,21 +488,24 @@ def mozharness_test_buildbot_bridge(conf
         if buildername.startswith('Ubuntu'):
             buildername = buildername.replace('VM', 'HW')
     else:
         variant = get_variant(test['test-platform'])
         # If we are a pgo type, munge the build_type for the
         # Unittest builder name generation
         if 'pgo' in variant:
             build_type = variant
-        buildername = '{} {} {} test {}'.format(
-            BUILDER_NAME_PREFIX[test_platform],
-            branch,
-            build_type,
-            test_name
+        prefix = BUILDER_NAME_PREFIX.get(
+            (test_platform, test.get('virtualization')),
+            BUILDER_NAME_PREFIX[test_platform])
+        buildername = '{prefix} {branch} {build_type} test {test_name}'.format(
+            prefix=prefix,
+            branch=branch,
+            build_type=build_type,
+            test_name=test_name
         )
 
     worker.update({
         'buildername': buildername,
         'sourcestamp': {
             'branch': branch,
             'repository': config.params['head_repository'],
             'revision': config.params['head_rev'],