--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -3551,16 +3551,45 @@ for name, branch in items_at_least(BRANC
         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]:
                 if t in win32['win7_ix'][test_type]:
                     win32['win7_ix'][test_type].remove(t)
 
+# Bug 1291015 - Migrate mochitest (plain) to AWS
+for name, branch in items_at_least(BRANCHES, 'gecko_version', 51):
+    # Skip branches where win32 isn't running
+    if not nested_haskey(branch, 'platforms', 'win32'):
+        continue
+    win32 = branch['platforms']['win32']
+
+    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 in ('mochitest', 'mochitest-e10s'):
+                    win32['win7_vm_gfx'][test_type].remove(t)
+
+    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 in ('mochitest', 'mochitest-e10s'):
+                    win32['win7_ix'][test_type].remove(t)
+
+    if name == 'try':
+        continue
+
+    if 'win7_vm' in win32:
+        win32['win7_vm']['opt_unittest_suites'] = WORKING_WIN7_AWS_OPT_SUITES + MOCHITEST_WO_BC + MOCHITEST_E10S
+        win32['win7_vm']['debug_unittest_suites'] = WORKING_WIN7_AWS_DEBUG_SUITES + MOCHITEST_WO_BC + MOCHITEST_E10S
+
+
 ###
 # Bug 1269543 - Stop running tests on OS X 10.6 on Firefox 49+
 for name, branch in items_at_least(BRANCHES, 'gecko_version', 49):
     if name in ['try']:
         continue
     for platform in branch['platforms'].keys():
         if platform not in ['macosx64']:
             continue