diff --git a/master/master.cfg b/master/master.cfg
index d93531f..0b1e39a 100644
--- a/master/master.cfg
+++ b/master/master.cfg
@@ -261,8 +261,8 @@ Build_MSVC_x64.addStep(bs_prepare_source)
 Build_MSVC_x64.addStep(steps.Compile(name="configure", command=["bash", scripts_root + "configure_msvc"], description=["configure"], descriptionDone=["configured"]))
 Build_MSVC_x64.addStep(bs_bootcd)
 Build_MSVC_x64.addStep(bs_livecd)
-Build_MSVC_x64.addStep(steps.Compile(name="configure", command=["bash", scripts_root + "configure", "-DENABLE_ROSTESTS=1"], description=["configure"], descriptionDone=["configured"]))
-Build_MSVC_x64.addStep(steps.Compile(name="rostests", command=["bash", scripts_root + "build_rostests", util.WithProperties('%(buildnumber)s')], warningPattern="^(.*warning[: ].*|.*error[: ].*)", description=["rostests"], descriptionDone=["rostests"]))
+Build_MSVC_x64.addStep(steps.Compile(name="rostests", command=["bash", scripts_root + "build_rostests"], warningPattern="^(.*warning[: ].*|.*error[: ].*)", description=["rostests"], descriptionDone=["rostests"]))
+Build_MSVC_x64.addStep(steps.SetPropertyFromCommand(command=["bash", scripts_root + "get_suffix"], property="suffix"))
 Build_MSVC_x64.addStep(steps.Trigger(schedulerNames=['Carrier-Win2003-x64 Testbot Trigger'], waitForFinish=False, copy_properties=['got_revision', 'id', 'owners', 'reason', 'suffix']))
 #Build_MSVC_x64.addStep(bs_upload_iso)
 
@@ -296,14 +296,15 @@ Test_VBox.addStep(bs_submit_results)
 #Test_VMW_Hybrid.addStep(bs_submit_results)
 
 Test_Win2003_x64 = util.BuildFactory();
-Test_Win2003_x64.addStep(steps.Compile(name="test", command=["bash", scripts_root + "run_rostests", util.WithProperties('%(buildnumber)s')], warningPattern=".*[:] Test .*", description=["testing"], descriptionDone=["test"]))
+Test_Win2003_x64.addStep(steps.Compile(name="test", command=["bash", scripts_root + "run_rostests", util.WithProperties('%(suffix)s')], warningPattern=".*[:] Test .*", description=["testing"], descriptionDone=["test"]))
 
 Test_WHS = util.BuildFactory();
 Test_WHS.addStep(bs_clean)
 Test_WHS.addStep(bs_git)
-Test_WHS.addStep(steps.Compile(name="configure", command=["bash", scripts_root + "configure", "-DENABLE_ROSTESTS=1"], description=["configure"], descriptionDone=["configured"]))
-Test_WHS.addStep(steps.Compile(name="rostests", command=["bash", scripts_root + "build_rostests", util.WithProperties('%(buildnumber)s')], warningPattern="^(.*warning[: ].*|.*error[: ].*)", description=["rostests"], descriptionDone=["rostests"]))
-Test_WHS.addStep(steps.Compile(name="test", command=["bash", scripts_root + "run_rostests", util.WithProperties('%(buildnumber)s')], warningPattern=".*[:] Test .*", description=["testing"], descriptionDone=["test"]))
+Test_WHS.addStep(bs_prepare_source)
+Test_WHS.addStep(steps.Compile(name="rostests", command=["bash", scripts_root + "build_rostests"], warningPattern="^(.*warning[: ].*|.*error[: ].*)", description=["rostests"], descriptionDone=["rostests"]))
+Test_WHS.addStep(steps.SetPropertyFromCommand(command=["bash", scripts_root + "get_suffix"], property="suffix"))
+Test_WHS.addStep(steps.Compile(name="test", command=["bash", scripts_root + "run_rostests", util.WithProperties('%(suffix)s')], warningPattern=".*[:] Test .*", description=["testing"], descriptionDone=["test"]))
 
 
 c['builders'] = [
diff --git a/worker/build_rostests b/worker/build_rostests
index f1f6ef8..67b6073 100644
--- a/worker/build_rostests
+++ b/worker/build_rostests
@@ -1,15 +1,15 @@
 #!/bin/bash
 # ReactOS BuildBot Build Scripts
-# build_rostests - Build rostests and copy them along with rosautotest.exe to a unique directory identified via the build number
-#
-# Parameter $1 - The build number
+# build_rostests - Build rostests and copy them along with rosautotest.exe to a unique directory identified via the suffix
 source ../../config.inc
 
-export ROSTESTS_INSTALL="${ROSTESTS_PREFIX}-$1"
+REVISION_SUFFIX=`cat revision_suffix`
+export ROSTESTS_INSTALL="${ROSTESTS_PREFIX}-${REVISION_SUFFIX}"
 
 rm -rf $ROSTESTS_INSTALL
 mkdir $ROSTESTS_INSTALL
 
+../../configure -DENABLE_ROSTESTS=1
 cd $ROS_OUTPUT
 ninja rostests_install
 
diff --git a/worker/run_rostests b/worker/run_rostests
index 7a8d136..e314891 100644
--- a/worker/run_rostests
+++ b/worker/run_rostests
@@ -2,7 +2,7 @@
 # ReactOS BuildBot Build Scripts
 # run_rostests - Run the tests built via build_rostests using rosautotest
 #
-# Parameter $1 - The build number
+# Parameter $1 - The suffix of the directory containing the tests to run
 source ../../config.inc
 
 rm -rf "${ROSAUTOTEST_DIR}"