diff --git a/mozilla/tools/buildbot-configs/testing/unittest-stage/master.cfg b/mozilla/tools/buildbot-configs/testing/unittest-stage/master.cfg
index b9cce601eee..6e92a2c5745 100644
--- a/mozilla/tools/buildbot-configs/testing/unittest-stage/master.cfg
+++ b/mozilla/tools/buildbot-configs/testing/unittest-stage/master.cfg
@@ -417,65 +417,65 @@ winxpFactory.addStep(UpdateClobberFiles,
         workdir='.',
         platform='',
         logDir='..\\logs\\',
-        env=MozillaEnvironments['vc8'])
+        env=MozillaEnvironments['mozbuild'])
 winxpFactory.addStep(MozillaClobberWin,
         workdir='.',
         slaveName="slave",
 	platform="winxp_stage",
-        env=MozillaEnvironments['vc8'])
+        env=MozillaEnvironments['mozbuild'])
 winxpFactory.addStep(MozillaCheckoutClientMk,
         workdir=".",
         cvsroot=CVSROOT,
-        env=MozillaEnvironments['vc8'])
+        env=MozillaEnvironments['mozbuild'])
 winxpFactory.addStep(FileDownload, mastersrc="mozconfig-winxp", 
         slavedest=".mozconfig", 
         workdir="mozilla")
 winxpFactory.addStep(step.ShellCommand, name="mozconfig contents",
         command=["cat",".mozconfig"],
         workdir="mozilla",
-        env=MozillaEnvironments['vc8'])
+        env=MozillaEnvironments['mozbuild'])
 winxpFactory.addStep(step.Compile, name="checkout", 
         description=["checking out"], 
         descriptionDone = ["checkout"], 
         command=["make","-f","client.mk","checkout"], 
         workdir='mozilla',
-        env=MozillaEnvironments['vc8'])
+        env=MozillaEnvironments['mozbuild'])
 winxpFactory.addStep(step.Compile, 
         command=["make", "-f", "client.mk", "build"], 
         workdir='mozilla',
         timeout=60*40,
-        env=MozillaEnvironments['vc8'])
+        env=MozillaEnvironments['mozbuild'])
 winxpFactory.addStep(MozillaCheck, warnOnWarnings=True, 
         workdir="mozilla/objdir",
         timeout=60*40,
-        env=MozillaEnvironments['vc8'])
+        env=MozillaEnvironments['mozbuild'])
 winxpFactory.addStep(CreateProfileWin,
         warnOnWarnings=True,
         workdir=".",
-        env=MozillaEnvironments['vc8'],
+        env=MozillaEnvironments['mozbuild'],
         clobber=True)
 winxpFactory.addStep(MozillaWin32Reftest, warnOnWarnings=True,
         workdir="mozilla/layout/reftests",
-        env=MozillaEnvironments['vc8'])
+        env=MozillaEnvironments['mozbuild'])
 winxpFactory.addStep(MozillaWin32Crashtest, warnOnWarnings=True,
         workdir="mozilla/testing/crashtest",
-        env=MozillaEnvironments['vc8'])
+        env=MozillaEnvironments['mozbuild'])
 winxpFactory.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['vc8'])
+        env=MozillaEnvironments['mozbuild'])
 winxpFactory.addStep(MozillaWin32Mochichrome, warnOnWarnings=True,
         workdir="mozilla/objdir/_tests/testing/mochitest",
         command='perl runtests.pl --appname=../../../dist/bin/firefox.exe --chrome --console-level=INFO --close-when-done',
-        env=MozillaEnvironments['vc8'])
+        env=MozillaEnvironments['mozbuild'])
 winxpFactory.addStep(MozillaWin32BrowserChromeTest, warnOnWarnings=True,
         workdir="mozilla/objdir/_tests/testing/mochitest",
         command='perl runtests.pl --appname=../../../dist/bin/firefox.exe --browser-chrome --console-level=INFO --close-when-done',
-        env=MozillaEnvironments['vc8'])
+        env=MozillaEnvironments['mozbuild'])
 
 firefox_trunk_winxp_builder = {
     'name': "WINNT 5.1 qm-stage-winxp01 dep unit test",
-    'slavenames': ['win-vc8-2'],
+    'slavenames': ['win-mozbuild-2'],
     'builddir': "trunk_winxp_stage",
     'factory': winxpFactory,
     'category': "Firefox"
@@ -522,62 +522,62 @@ winxpOrigFactory.addStep(UpdateClobberFiles,
         workdir='.',
         platform='',
         logDir='..\\logs\\',
-        env=MozillaEnvironments['vc8'])
+        env=MozillaEnvironments['mozbuild'])
 winxpOrigFactory.addStep(MozillaClobberWin,
         workdir='.',
         slaveName="slave",
 	platform="winxp",
-        env=MozillaEnvironments['vc8'])
+        env=MozillaEnvironments['mozbuild'])
 winxpOrigFactory.addStep(MozillaCheckoutClientMk,
         workdir=".",
         cvsroot=CVSROOT,
-        env=MozillaEnvironments['vc8'])
+        env=MozillaEnvironments['mozbuild'])
 winxpOrigFactory.addStep(FileDownload, mastersrc="mozconfig-winxp", 
         slavedest=".mozconfig", 
         workdir="mozilla")
 winxpOrigFactory.addStep(step.ShellCommand, name="mozconfig contents",
         command=["cat",".mozconfig"],
         workdir="mozilla",
-        env=MozillaEnvironments['vc8'])
+        env=MozillaEnvironments['mozbuild'])
 winxpOrigFactory.addStep(step.Compile, name="checkout", 
         description=["checking out"], 
         descriptionDone = ["checkout"], 
         command=["make","-f","client.mk","checkout"], 
         workdir='mozilla',
-        env=MozillaEnvironments['vc8'])
+        env=MozillaEnvironments['mozbuild'])
 winxpOrigFactory.addStep(step.Compile, 
         command=["make", "-f", "client.mk", "build"], 
         workdir='mozilla',
         timeout=60*40,
-        env=MozillaEnvironments['vc8'])
+        env=MozillaEnvironments['mozbuild'])
 winxpOrigFactory.addStep(MozillaCheck, warnOnWarnings=True, 
         workdir="mozilla/objdir",
         timeout=60*40,
-        env=MozillaEnvironments['vc8'])
+        env=MozillaEnvironments['mozbuild'])
 winxpOrigFactory.addStep(CreateProfileWin,
         warnOnWarnings=True,
         workdir=".",
-        env=MozillaEnvironments['vc8'],
+        env=MozillaEnvironments['mozbuild'],
         clobber=True)
 winxpOrigFactory.addStep(MozillaWin32Reftest, warnOnWarnings=True,
         workdir="mozilla/layout/reftests",
-        env=MozillaEnvironments['vc8'])
+        env=MozillaEnvironments['mozbuild'])
 winxpOrigFactory.addStep(MozillaWin32Crashtest, warnOnWarnings=True,
         workdir="mozilla/testing/crashtest",
-        env=MozillaEnvironments['vc8'])
+        env=MozillaEnvironments['mozbuild'])
 winxpOrigFactory.addStep(MozillaWin32Mochitest, warnOnWarnings=True,
         workdir="mozilla/objdir/_tests/testing/mochitest",
-        env=MozillaEnvironments['vc8'])
+        env=MozillaEnvironments['mozbuild'])
 winxpOrigFactory.addStep(MozillaWin32Mochichrome, warnOnWarnings=True,
         workdir="mozilla/objdir/_tests/testing/mochitest",
-        env=MozillaEnvironments['vc8'])
+        env=MozillaEnvironments['mozbuild'])
 winxpOrigFactory.addStep(MozillaWin32BrowserChromeTest, warnOnWarnings=True,
         workdir="mozilla/objdir/_tests/testing/mochitest",
-        env=MozillaEnvironments['vc8'])
+        env=MozillaEnvironments['mozbuild'])
 
 firefox_trunk_winxp_orig_builder = {
     'name': "WINNT 5.1 qm-winxp01 dep unit test",
-    'slavenames': ['win-vc8'],
+    'slavenames': ['win-mozbuild'],
     'builddir': "trunk_winxp",
     'factory': winxpOrigFactory,
     'category': "Firefox"