diff --git a/tools/buildbot-configs/testing/talos/perfmaster/master.cfg b/tools/buildbot-configs/testing/talos/perfmaster/master.cfg
index 91dd361014c..d0d1abd5732 100644
--- a/tools/buildbot-configs/testing/talos/perfmaster/master.cfg
+++ b/tools/buildbot-configs/testing/talos/perfmaster/master.cfg
@@ -148,9 +148,12 @@ c['status'].append(TinderboxMailNotifier(
                        extraRecipients=["tinderbox-daemon@tinderbox.mozilla.org",],
                        relayhost="smtp.mozilla.org",
                        builders=["WINNT 5.1 mini talos branch",
+                                 "WINNT 5.1 mini talos branch fast",
                                  "WINNT 6.0 talos branch",
                                  "Linux talos branch",
-                                 "MacOSX Darwin 8.8.1 talos branch"],
+                                 "Linux talos branch fast",
+                                 "MacOSX Darwin 8.8.1 talos branch",
+                                 "MacOSX Darwin 8.8.1 talos branch fast"],
                        useChangeTime=True,
                        logCompression="bzip2"))
 
@@ -163,10 +166,7 @@ c['status'].append(tinderbox.TinderboxMailNotifier(
                        builders=["WINNT 5.1 talos trunk",
                                  "WINNT 5.1 talos branch",
                                  "MacOSX Darwin 9.0.0 talos trunk",
-                                 "WINNT 5.1 mini talos branch fast",
-                                 "WINNT 5.1 mini talos trunk jss",
-                                 "Linux talos branch fast",
-                                 "MacOSX Darwin 8.8.1 talos branch fast"],
+                                 "WINNT 5.1 mini talos trunk jss"],
                        useChangeTime=True,
                        logCompression="bzip2"))
 
@@ -720,7 +720,7 @@ win32_branch_fast_steps.addStep(FileDownload,
                            slavedest="generate-tpcomponent.py",
                            workdir="talos/page_load_test")
 win32_branch_fast_steps.addStep(FileDownload,
-                           mastersrc="configs/fast.sample.config",
+                           mastersrc="configs/production.fast.sample.config",
                            slavedest="sample.config",
                            workdir="talos/")
 win32_branch_fast_steps.addStep(FileDownload,
@@ -1199,7 +1199,7 @@ linux_branch_fast_steps.addStep(FileDownload,
                            slavedest="generate-tpcomponent.py",
                            workdir="talos/page_load_test")
 linux_branch_fast_steps.addStep(FileDownload,
-                           mastersrc="configs/fast.sample.config",
+                           mastersrc="configs/production.fast.sample.config",
                            slavedest="sample.config",
                            workdir="talos/")
 linux_branch_fast_steps.addStep(FileDownload,
@@ -1561,7 +1561,7 @@ mac_branch_fast_steps.addStep(FileDownload,
                            slavedest="installdmg.sh",
                            workdir=".")
 mac_branch_fast_steps.addStep(FileDownload,
-                           mastersrc="configs/fast.sample.config",
+                           mastersrc="configs/production.fast.sample.config",
                            slavedest="sample.config",
                            workdir="talos/")
 mac_branch_fast_steps.addStep(FileDownload,