--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -2821,20 +2821,21 @@ for name, branch in items_at_least(BRANC
 
 # Bug 1361414 - disable buildbot macosx debug builds on trunk
 for name, branch in items_at_least(BRANCHES, 'gecko_version', 55):
     for platform in branch['platforms'].keys():
         if platform not in ['macosx64-debug']:
             continue
         del branch['platforms'][platform]
 
-# Bug 1362387 - remove linux64-devedition builds from Buildbot
+# Bug 1362387, Bug 1387878 - remove devedition builds from Buildbot
 for branch in BRANCHES.keys():
     for platform in BRANCHES[branch]['platforms'].keys():
-        if platform not in ['linux64-devedition']:
+        if platform not in ['linux64-devedition', 'macosx64-devedition',
+                            'win32-devedition', 'win64-devedition']:
             continue
         del BRANCHES[branch]['platforms'][platform]
 
 # Bug 1379789- disable buildbot windows builds on date
 for name, branch in [('date', BRANCHES['date'])]:
     for platform in branch['platforms'].keys():
         if not platform.startswith('win'):
             continue

--- a/mozilla/scheduler_master.cfg
+++ b/mozilla/scheduler_master.cfg
@@ -78,19 +78,21 @@ for branch in ACTIVE_BRANCHES:
         bnames = []
         if branch in disable_osx_sched:
             bnames.extend(['OS X 10.7 ' + branch + " build", 'OS X 10.7 ' + branch + " devedition build"])
         if branch in disable_win_sched:
             bnames.extend([
                 'WINNT 5.2 ' + branch + " build",
                 'WINNT 5.2 ' + branch + " leak test build",
                 'WINNT 5.2 ' + branch + " pgo-build",
+                'WINNT 5.2 ' + branch + " devedition build",
                 'WINNT 6.1 x86-64 ' + branch + " build",
                 'WINNT 6.1 x86-64 ' + branch + " pgo-build",
                 'WINNT 6.1 x86-64 ' + branch + " leak test build",
+                'WINNT 6.1 x86-64 ' + branch + " devedition build",
             ])
         for bname in bnames:
             pre = s.builderNames
             s.builderNames = [b for b in s.builderNames if builder_filter(bname, b)]
             post = s.builderNames
             # builder name to be deleted
             if bname in set(pre) - set(post):
                 assert len(set(pre) - set(post)) == 1