diff --git a/master/master.cfg b/master/master.cfg
index 976fba8..cffc555 100644
--- a/master/master.cfg
+++ b/master/master.cfg
@@ -158,7 +158,7 @@ c['schedulers'].append(schedulers.SingleBranchScheduler(
     name="rostests",
     change_filter=util.ChangeFilter(branch='refs/heads/master', category='rostests'),
     treeStableTimer=None,
-    builderNames=["Test WHS"]))
+    builderNames=["Test WHS", "Test Vista"]))
 
 c['schedulers'].append(schedulers.Triggerable(
     name="Build GCCLin_x86 regtestcd done",
@@ -166,7 +166,7 @@ c['schedulers'].append(schedulers.Triggerable(
 
 c['schedulers'].append(schedulers.Triggerable(
     name="Build MSVC_x64 rostests done",
-    builderNames=["Test Win2003_x64"]))
+    builderNames=["Test Win2003_x64", "Test Vista_x64"]))
 
 c['schedulers'].append(schedulers.Triggerable(
     name="Build MSVC_x64 regtestcd done",
@@ -341,6 +341,17 @@ Test_WHS.addStep(bs_build_rostests)
 Test_WHS.addStep(bs_get_suffix)
 Test_WHS.addStep(bs_run_rostests)
 
+Test_Vista = util.BuildFactory();
+Test_Vista.addStep(bs_clean)
+Test_Vista.addStep(bs_git)
+Test_Vista.addStep(bs_prepare_source)
+Test_Vista.addStep(bs_build_rostests)
+Test_Vista.addStep(bs_get_suffix)
+Test_Vista.addStep(bs_run_rostests)
+
+Test_Vista_x64 = util.BuildFactory();
+Test_Vista_x64.addStep(bs_run_rostests)
+
 
 c['builders'] = [
     util.BuilderConfig(
@@ -379,6 +390,8 @@ c['builders'] = [
     util.BuilderConfig(name="Test Win2003_x64", workernames=["Phoenix-Win2003-x64"], builddir="Test_Win2003_x64", factory=Test_Win2003_x64),
     util.BuilderConfig(name="Test WHS", workernames=["Phoenix-WHS-Bot"], builddir="Test_WHS", factory=Test_WHS),
     util.BuilderConfig(name="Test VBox", workernames=["Testee"], builddir="Test_VBox", factory=Test_VBox),
+    util.BuilderConfig(name="Test Vista", workernames=["Phoenix-Vista"], builddir="Test_Vista", factory=Test_Vista),
+    util.BuilderConfig(name="Test Vista_x64", workernames=["Phoenix-Vista-x64"], builddir="Test_Vista_x64", factory=Test_Vista_x64),
 ]
 
 ####### BUILDBOT SERVICES