--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -3505,33 +3505,49 @@ for name, branch in items_at_least(BRANC
                 if suite_name.startswith('jsreftest'):
                     win32['win7_vm_gfx'][test_type].remove(t)
                 if suite_name.startswith('marionette'):
                     win32['win7_vm_gfx'][test_type].remove(t)
                 if suite_name.startswith('web-platform-tests'):
                     win32['win7_vm_gfx'][test_type].remove(t)
                 if suite_name.startswith('mochitest-devtools'):
                     win32['win7_vm_gfx'][test_type].remove(t)
+                if suite_name.startswith('mochitest-e10s-devtools'):
+                    win32['win7_vm_gfx'][test_type].remove(t)
                 if suite_name.startswith('mochitest-jetpack'):
                     win32['win7_vm_gfx'][test_type].remove(t)
+                if suite_name.startswith('cppunit'):
+                    win32['win7_vm_gfx'][test_type].remove(t)
+                if suite_name.startswith('gtest'):
+                    win32['win7_vm_gfx'][test_type].remove(t)
+                if suite_name.startswith('xpcshell'):
+                    win32['win7_vm_gfx'][test_type].remove(t)
                 if suite_name == 'mochitest-media':
                     win32['win7_vm_gfx'][test_type].remove(t)
     # Strip out suites that we don't want on the IX instances
     if 'win7_ix' in win32:
         for test_type in ('opt_unittest_suites', 'debug_unittest_suites'):
             for t in win32['win7_ix'][test_type][:]:
                 suite_name, suite_config = t
                 if suite_name.startswith('mochitest-devtools'):
                     win32['win7_ix'][test_type].remove(t)
+                if suite_name.startswith('mochitest-e10s-devtools'):
+                    win32['win7_ix'][test_type].remove(t)
                 if suite_name.startswith('mochitest-jetpack'):
                     win32['win7_ix'][test_type].remove(t)
                 if suite_name.startswith('marionette'):
                     win32['win7_ix'][test_type].remove(t)
                 if suite_name == 'mochitest-media':
                     win32['win7_ix'][test_type].remove(t)
+                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)
 
     # 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