diff --git a/tools/buildbot-configs/testing/unittest/auth.py b/tools/buildbot-configs/testing/unittest/auth.py
index 3d30371c039..66734f4955b 100644
--- a/tools/buildbot-configs/testing/unittest/auth.py
+++ b/tools/buildbot-configs/testing/unittest/auth.py
@@ -4,6 +4,8 @@ debugPassword = "swordfish"
 
 authList = [("win-vc8", "swordfish"),
             ("win-2k3", "swordfish"),
+            ("win-2k3-2", "swordfish"),
+            ("win-2k3-3", "swordfish"),
             ("linux","swordfish"),
             ("mac-osx", "swordfish"),
             ("qm-xserve02", "swordfish"),
diff --git a/tools/buildbot-configs/testing/unittest/master.cfg b/tools/buildbot-configs/testing/unittest/master.cfg
index bb838779880..d0363bb2bfd 100644
--- a/tools/buildbot-configs/testing/unittest/master.cfg
+++ b/tools/buildbot-configs/testing/unittest/master.cfg
@@ -86,6 +86,8 @@ c['schedulers'].append(Scheduler(name="bonsai build scheduler",
                                  builderNames=[
 #                                               "WINNT 5.1 qm-winxp01 dep unit test",
                                                "WINNT 5.2 qm-win2k3-01 dep unit test",
+                                               "WINNT 5.2 qm-win2k3-02 dep unit test",
+                                               "WINNT 5.2 qm-win2k3-03 dep unit test",
                                                "WINNT 5.2 bm-win2k3-pgo01 dep unit test",
                                                "Linux qm-centos5-01 dep unit test",
                                                "MacOSX Darwin 8.8.4 qm-xserve01 dep unit test"
@@ -96,6 +98,8 @@ c['schedulers'].append(Periodic(name="9 hour build scheduler",
                                 builderNames=[
 #                                             "WINNT 5.1 qm-winxp01 dep unit test",
                                              "WINNT 5.2 qm-win2k3-01 dep unit test",
+                                             "WINNT 5.2 qm-win2k3-02 dep unit test",
+                                             "WINNT 5.2 qm-win2k3-03 dep unit test",
                                              "WINNT 5.2 bm-win2k3-pgo01 dep unit test",
                                              "Linux qm-centos5-01 dep unit test",
                                              "MacOSX Darwin 8.8.4 qm-xserve01 dep unit test"
@@ -546,9 +550,9 @@ win2k3Factory.addStep(MozillaWin32Mochitest, warnOnWarnings=True,
         workdir="mozilla/objdir/_tests/testing/mochitest",
         command='perl runtests.pl --appname=../../../dist/bin/firefox.exe --autorun --console-level=INFO --close-when-done',
         env=MozillaEnvironments['mozbuild'])
-# win2k3Factory.addStep(MozillaWin32Mochichrome, warnOnWarnings=True,
-#        workdir="mozilla/objdir/_tests/testing/mochitest",
-#        env=MozillaEnvironments['vc8'])
+ win2k3Factory.addStep(MozillaWin32Mochichrome, warnOnWarnings=True,
+        workdir="mozilla/objdir/_tests/testing/mochitest",
+        env=MozillaEnvironments['vc8'])
 win2k3Factory.addStep(MozillaWin32BrowserChromeTest, warnOnWarnings=True,
         workdir="mozilla/objdir/_tests/testing/mochitest",
         env=MozillaEnvironments['mozbuild'])
@@ -561,6 +565,26 @@ firefox_trunk_win2k3_builder = {
     'category': "Firefox",
 }
 
+firefox_trunk_win2k3_2_builder = {
+    'name': "WINNT 5.2 qm-win2k3-02 dep unit test",
+    'slavenames': ['win-2k3-2'],
+    'builddir': "trunk_2k3_2",
+    'factory': win2k3Factory,
+    'category': "Firefox",
+}
+
+firefox_trunk_win2k3_3_builder = {
+    'name': "WINNT 5.2 qm-win2k3-03 dep unit test",
+    'slavenames': ['win-2k3-3'],
+    'builddir': "trunk_2k3_3",
+    'factory': win2k3Factory,
+    'category': "Firefox",
+}
+
+builders.append(firefox_trunk_win2k3_builder)
+builders.append(firefox_trunk_win2k3_2_builder)
+builders.append(firefox_trunk_win2k3_3_builder)
+
 ## Additional PGO win2k3 box
 
 win2k3PGOFactory = factory.BuildFactory()
@@ -670,7 +694,7 @@ builders.append(firefox_trunk_win2k3_pgo_builder)
 #    'factory': factory.BuildFactory(firefox_trunk_winxp_vc8_steps),
 #    'category': "Firefox",
 #}
-
-builders.append(firefox_trunk_win2k3_builder)
+#
+#builders.append(firefox_trunk_winxp_dbg_builder)
 
 c['builders'] = builders