--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -1941,16 +1941,19 @@ for name, branch in items_at_least(BRANC
     for pf in PLATFORMS:
         if pf not in branch['platforms']:
             continue
         for slave_pf in branch['platforms'][pf].get(
                 'slave_platforms', PLATFORMS[pf]['slave_platforms']):
             if slave_pf not in branch['platforms'][pf]:
                 continue
             branch['platforms'][pf][slave_pf]['opt_unittest_suites'] += MOCHITEST_JP[:]
+            # if statement for bug 1126493 Enable Yosemite testing on select branches only
+            if slave_pf in ['yosemite'] and name not in ['try']:
+                continue
             branch['platforms'][pf][slave_pf]['debug_unittest_suites'] += MOCHITEST_JP[:]
 
 # cppunittest jobs ride the train with 28, so they need to be disabled
 # for branches running an older version.
 # https://bugzilla.mozilla.org/show_bug.cgi?id=937637
 # cppunittest jobs ride the train with 28, so they need to be disabled
 # for branches running an older version.
 # https://bugzilla.mozilla.org/show_bug.cgi?id=937637
@@ -2092,16 +2095,19 @@ for platform in PLATFORMS.keys():
 
 # bug 1051886 enable mochitest-gl tests to ride trains
 for platform in PLATFORMS.keys():
     for name, branch in items_at_least(BRANCHES, 'gecko_version', 36):
         for slave_platform in PLATFORMS[platform]['slave_platforms']:
             if platform in BRANCHES[name]['platforms']:
                 if slave_platform in BRANCHES[name]['platforms'][platform]:
                     BRANCHES[name]['platforms'][platform][slave_platform]['opt_unittest_suites'] += MOCHITEST_WEBGL
+                    # if statement for bug 1126493 Enable Yosemite testing on select branches only
+                    if slave_platform in ['yosemite'] and name not in ['try']:
+                        continue
                     BRANCHES[name]['platforms'][platform][slave_platform]['debug_unittest_suites']+= MOCHITEST_WEBGL
 
 # Enable web-platform-tests on cedar
 for platform in PLATFORMS.keys():
     if platform not in BRANCHES['cedar']['platforms']:
         continue
 
     for slave_platform in PLATFORMS[platform]['slave_platforms']:
@@ -2164,33 +2170,16 @@ for name, branch in items_at_least(BRANC
     else:
         branch['platforms']['win32']['slave_platforms'] = ['xp-ix', 'win7-ix']
     if 'talos_slave_platforms' in branch['platforms']['win32']:
         if 'win8' in branch['platforms']['win32']['talos_slave_platforms']:
             branch['platforms']['win32']['talos_slave_platforms'].remove('win8')
     else:
         branch['platforms']['win32']['talos_slave_platforms'] = ['xp-ix', 'win7-ix']
 
-
-# TALOS: If you set 'talos_slave_platforms' for a branch you will only get that subset of platforms
-for branch in BRANCHES.keys():
-    for os in PLATFORMS.keys():  # 'macosx64', 'win32' and on
-        if os not in BRANCHES[branch]['platforms'].keys():
-            continue
-        if BRANCHES[branch]['platforms'][os].get('talos_slave_platforms') is None:
-            continue
-        platforms_for_os = get_talos_slave_platforms(PLATFORMS, platforms=(os,))
-        enabled_platforms_for_os = BRANCHES[branch]['platforms'][os]['talos_slave_platforms']
-        for s in SUITES.iterkeys():
-            tests_key = '%s_tests' % s
-            if tests_key in BRANCHES[branch]:
-                tests = list(BRANCHES[branch]['%s_tests' % s])
-                tests[3] = [x for x in tests[3] if x not in platforms_for_os or x in enabled_platforms_for_os]
-                BRANCHES[branch]['%s_tests' % s] = tuple(tests)
-
 # bug 1126493 Enable Yosemite testing on select branches only
 # keep debug tests on 10.8 until the source of the slowness is found in bug 1125998
 include_yosemite = ['try']
 for platform in PLATFORMS.keys():
     # See Bug 997946 - skip these on OS X 10.8 due to limited capacity
     for name, branch in items_at_least(BRANCHES, 'gecko_version', 39):
         if platform not in branch['platforms']:
             continue
@@ -2203,16 +2192,32 @@ delete_slave_platform(BRANCHES, PLATFORM
 for branch in include_yosemite:
     BRANCHES[branch]['platforms']['macosx64']['mountainlion']['opt_unittest_suites'] = []
     #disable talos on branches that have 10.10 enabled excluding try 
     #and b2g-inbound didn't have talos tests before
     if branch in ['try', 'b2g-inbound']:
        continue
     BRANCHES[branch]['platforms']['macosx64']['talos_slave_platforms'] = ['snowleopard','yosemite']
 
+# TALOS: If you set 'talos_slave_platforms' for a branch you will only get that subset of platforms
+for branch in BRANCHES.keys():
+    for os in PLATFORMS.keys():  # 'macosx64', 'win32' and on
+        if os not in BRANCHES[branch]['platforms'].keys():
+            continue
+        if BRANCHES[branch]['platforms'][os].get('talos_slave_platforms') is None:
+            continue
+        platforms_for_os = get_talos_slave_platforms(PLATFORMS, platforms=(os,))
+        enabled_platforms_for_os = BRANCHES[branch]['platforms'][os]['talos_slave_platforms']
+        for s in SUITES.iterkeys():
+            tests_key = '%s_tests' % s
+            if tests_key in BRANCHES[branch]:
+                tests = list(BRANCHES[branch]['%s_tests' % s])
+                tests[3] = [x for x in tests[3] if x not in platforms_for_os or x in enabled_platforms_for_os]
+                BRANCHES[branch]['%s_tests' % s] = tuple(tests)
+
 # Versioned b2g branches shouldn't run mochitest-browser-chrome on linux debug builds
 for name in [x for x in BRANCHES.keys() if x.startswith('mozilla-b2g')]:
     branch = BRANCHES[name]
     if 'linux' in branch['platforms'] and 'ubuntu32_vm' in branch['platforms']['linux']:
         for chunked_bc in MOCHITEST_BC_3:
             branch['platforms']['linux']['ubuntu32_vm']['debug_unittest_suites'].remove(chunked_bc)
     if 'linux64' in branch['platforms'] and 'ubuntu64_vm' in branch['platforms']['linux64']:
         for chunked_bc in MOCHITEST_BC_3: