--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -3425,32 +3425,34 @@ for platform in PLATFORMS.keys():
 for name, branch in items_before(BRANCHES, 'gecko_version', 49):
     if nested_haskey(BRANCHES[name]['platforms'], 'win32', 'win7_vm'):
         del BRANCHES[name]['platforms']['win32']['win7_vm']
     if nested_haskey(BRANCHES[name]['platforms'], 'win32', 'win7_vm_gfx'):
         del BRANCHES[name]['platforms']['win32']['win7_vm_gfx']
 
 # Only enable suites in AWS that are working
 WORKING_WIN7_AWS_OPT_SUITES = WEB_PLATFORM_TESTS_CHUNKED + WEB_PLATFORM_REFTESTS + GTEST + CPPUNIT + JITTEST + OTHER_REFTESTS + MARIONETTE + XPCSHELL + MOCHITEST_DT_8 + MOCHITEST_DT_8_E10S + MOCHITEST_JP + MARIONETTE_E10S + MOCHITEST_MEDIA + WEB_PLATFORM_TESTS_CHUNKED_E10S + WEB_PLATFORM_REFTESTS_E10S
-WORKING_WIN7_AWS_DEBUG_SUITES = GTEST + CPPUNIT + JITTEST + WEB_PLATFORM_TESTS_CHUNKED_MORE + WEB_PLATFORM_REFTESTS + OTHER_REFTESTS + MARIONETTE + XPCSHELL + MOCHITEST_DT_8 + MOCHITEST_DT_8_E10S + MOCHITEST_JP + MARIONETTE_E10S + MOCHITEST_MEDIA + WEB_PLATFORM_TESTS_CHUNKED_E10S + WEB_PLATFORM_REFTESTS_E10S
+WORKING_WIN7_AWS_DEBUG_SUITES = GTEST + CPPUNIT + JITTEST + WEB_PLATFORM_TESTS_CHUNKED_MORE + WEB_PLATFORM_REFTESTS + OTHER_REFTESTS + MARIONETTE + XPCSHELL + MOCHITEST_DT_8 + MOCHITEST_DT_8_E10S + MOCHITEST_JP + MARIONETTE_E10S + MOCHITEST_MEDIA + WEB_PLATFORM_TESTS_CHUNKED_E10S + WEB_PLATFORM_REFTESTS_E10S + CRASHTEST_E10S + JSREFTEST_E10S
 for name, branch in items_at_least(BRANCHES, 'gecko_version', 49):
     # Skip branches where win32 isn't running
     if not nested_haskey(branch, 'platforms', 'win32'):
         continue
     win32 = branch['platforms']['win32']
 
     # Strip out suites that we don't want on the VM/GFX instances
     if 'win7_vm' in win32:
         for test_type in ('opt_unittest_suites', 'debug_unittest_suites'):
             for t in win32['win7_vm'][test_type][:]:
                 suite_name, suite_config = t
                 if suite_name.startswith('reftest'):
                     win32['win7_vm'][test_type].remove(t)
                 if suite_name.startswith('mochitest-gl'):
                     win32['win7_vm'][test_type].remove(t)
+                if suite_name.startswith('mochitest-gpu'):
+                    win32['win7_vm'][test_type].remove(t)
     if 'win7_vm_gfx' in win32:
         for test_type in ('opt_unittest_suites', 'debug_unittest_suites'):
             for t in win32['win7_vm_gfx'][test_type][:]:
                 suite_name, suite_config = t
                 if suite_name.startswith('crashtest'):
                     win32['win7_vm_gfx'][test_type].remove(t)
                 if suite_name.startswith('jsreftest'):
                     win32['win7_vm_gfx'][test_type].remove(t)
@@ -3490,27 +3492,33 @@ for name, branch in items_at_least(BRANC
                 if suite_name.startswith('cppunit'):
                     win32['win7_ix'][test_type].remove(t)
                 if suite_name.startswith('gtest'):
                     win32['win7_ix'][test_type].remove(t)
                 if suite_name.startswith('xpcshell'):
                     win32['win7_ix'][test_type].remove(t)
                 if suite_name.startswith('web-platform-tests'):
                     win32['win7_ix'][test_type].remove(t)
+                if suite_name.startswith('mochitest-gpu'):
+                    win32['win7_ix'][test_type].remove(t)
+                if suite_name.startswith('crashtest-e10s'):
+                    win32['win7_ix'][test_type].remove(t)
+                if suite_name.startswith('jsreftest-e10s'):
+                    win32['win7_ix'][test_type].remove(t)
 
     # Leave all the other suites running on try
     if name == 'try':
         continue
 
     if 'win7_vm' in win32:
         win32['win7_vm']['opt_unittest_suites'] = WORKING_WIN7_AWS_OPT_SUITES
         win32['win7_vm']['debug_unittest_suites'] = WORKING_WIN7_AWS_DEBUG_SUITES
     if 'win7_vm_gfx' in win32:
-        win32['win7_vm_gfx']['opt_unittest_suites'] = REFTEST_ONE_CHUNK + REFTEST_NOACCEL
-        win32['win7_vm_gfx']['debug_unittest_suites'] = REFTEST_ONE_CHUNK
+        win32['win7_vm_gfx']['opt_unittest_suites'] = REFTEST_ONE_CHUNK + REFTEST_NOACCEL + MOCHITEST_GPU + MOCHITEST_GPU_E10S + REFTEST_E10S
+        win32['win7_vm_gfx']['debug_unittest_suites'] = REFTEST_ONE_CHUNK + MOCHITEST_GPU + MOCHITEST_GPU_E10S + REFTEST_NOACCEL + REFTEST_E10S
 
     # Disable these suites from the IX machines
     if 'win7_ix' in win32:
         for test_type in ('opt_unittest_suites', 'debug_unittest_suites'):
             for t in win32['win7_vm'][test_type]:
                 if t in win32['win7_ix'][test_type]:
                     win32['win7_ix'][test_type].remove(t)
             for t in win32['win7_vm_gfx'][test_type]: