--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -1934,17 +1934,17 @@ PLATFORM_VARS["macosx64-lion-debug"]["sl
 for platform in PLATFORM_VARS.values():
     if 'env' not in platform:
         platform['env'] = deepcopy(GLOBAL_ENV)
     else:
         platform['env'].update((k, v) for k, v in GLOBAL_ENV.items() if k not in platform['env'])
 
 PROJECTS = {
     'fuzzing': {
-        'platforms': ['mock-hw', 'macosx64-lion', 'win64-rev2'],
+        'platforms': ['mock', 'macosx64-lion', 'win64-rev2'],
     },
 }
 
 # For bug 978211, we are using MOZ_AUTOMATION to trigger the automation build
 # steps from mach. However, these build variants already use mach, and so they
 # would inadvertently trigger the automation steps. We can remove the
 # MOZ_AUTOMATION environment variable for them, since it's not used anyway.
 del PLATFORM_VARS["linux64-sh-haz"]["env"]["MOZ_AUTOMATION"]

--- a/mozilla/production_config.py
+++ b/mozilla/production_config.py
@@ -171,17 +171,18 @@ PLATFORM_VARS = {}
 PROJECTS = {
     'fuzzing': {
         'scripts_repo': 'https://hg.mozilla.org/build/tools',
         'fuzzing_bundle': 'http://pvtbuilds.pvt.build.mozilla.org/bundles/fuzzing.hg',
         'fuzzing_repo': 'ssh://ffxbld@hg.mozilla.org/private/fuzzing',
         'fuzzing_remote_host': 'ffxbld@stage.mozilla.org',
         # Path needs extra leading slash due to optparse expansion on Win32
         'fuzzing_base_dir': '//mnt/pvt_builds/fuzzing/',
-        'idle_slaves': 3,
+        # This is # of idle slaves per master
+        'idle_slaves': 2,
         'disable_tinderbox_mail': False,
     },
 }
 
 BRANCH_PROJECTS = {
     'spidermonkey_tier_1': {
         'scripts_repo': 'https://hg.mozilla.org/build/tools',
         'idle_slaves': 0,