--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -3474,18 +3474,18 @@ for platform in PLATFORMS.keys():
 # Remove the new AWS platforms from older branches where they won't be running
 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
-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
+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
 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:
@@ -3538,17 +3538,17 @@ for name, branch in items_at_least(BRANC
                 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)
-                if suite_name == 'web-platform-tests':
+                if suite_name.startswith('web-platform-tests'):
                     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