--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -3027,22 +3027,26 @@ for name, branch in items_at_least(BRANC
             continue
         if 'ubuntu32_vm' not in branch['platforms'][platform]:
             continue
         branch['platforms'][platform]['ubuntu32_vm']['debug_unittest_suites'] = []
 
 # Bug 1330680 - patches to disable bb nightlies on linux32/linux64/android on m-c + trunk
 for name, branch in items_at_least(BRANCHES, 'gecko_version', 53):
     for platform in branch['platforms'].keys():
-        if platform not in ['linux', 'linux64']:
+        if platform not in ['linux', 'linux64', 'macosx64']:
             continue
         if 'ubuntu32_vm' in branch['platforms'][platform]:
             branch['platforms'][platform]['ubuntu32_vm']['opt_unittest_suites'] = []
         if 'ubuntu64_vm' in branch['platforms'][platform]:
             branch['platforms'][platform]['ubuntu64_vm']['opt_unittest_suites'] = []
+	for p in ['snowleopard'  'yosemite_r7']:
+	    if p in branch['platforms'][platform]:
+		branch['platforms'][platform][p]['opt_unittest_suites'] = []
+
 
 # Bug 1336553 - Bump OS X and Windows J chunks from 1 to 2
 for name, branch in items_at_least(BRANCHES, 'gecko_version', 54):
     for platform in BRANCHES[name]['platforms'].keys():
         if platform not in ['macosx64', 'win64', 'win32']:
             continue
         for slave_platform in BRANCHES[name]['platforms'][platform].keys():
             if slave_platform  not in ['yosemite_r7', 'win8_64', 'win10_64'] and slave_platform.startswith('win7_') is False:

--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -2903,20 +2903,20 @@ for name, branch in items_at_least(BRANC
 
 # Bug 1253312 - Disable Linux32 debug builds and tests on trunk
 for name, branch in items_at_least(BRANCHES, 'gecko_version', 53):
     for platform in branch['platforms'].keys():
         if platform not in ['linux-debug']:
             continue
         del branch['platforms'][platform]
 
-# Bug 1330680 - patches to disable bb nightlies on linux32/linux64/android on m-c + trunk
+# Bug 1330680, 1351326  - patches to disable bb nightlies on linux32/linux64/android/macosx on m-c + trunk
 for name, branch in items_at_least(BRANCHES, 'gecko_version', 53):
     for platform in branch['platforms']:
-        if platform not in ['linux', 'linux64', 'android-api-15', 'android-x86']:
+        if platform not in ['linux', 'linux64', 'android-api-15', 'android-x86', 'macosx64']:
             continue
         # Bug 1332930 Shutting off buildbot nighties shut off periodicupdates
         branch['platforms'][platform]['enable_dep'] = False
         branch['platforms'][platform]['enable_nightly'] = False
         if platform in branch['pgo_platforms']:
             branch['pgo_platforms'] = [p for p in branch['pgo_platforms'] if p != platform]
 
 # Bug 1361414 - disable buildbot macosx debug builds on trunk