cmake -DBUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=%testdir% -P cmake_install.cmake
 {endterm}
 
-Create a HTCondor configuration that all of the tests will derive from
-and set CONDOR_CONFIG to point to it.
+Create a HTCondor configuration that all of the tests will derive from.
+Assuming the environment variable SRCDIR points to HTCondor sources:
 {term}
 pushd "%testdir%"
-cscript "%SRCDIR%\msconfig\init_config.wff" ETC=etc PERSONAL=Y RUNJOBS=A
+cscript "%SRCDIR%\msconfig\init_config.wsf" ETC=etc PERSONAL=Y RUNJOBS=A
 mkdir log
 mkdir spool
 mkdir execute
@@ -60,7 +60,8 @@
 
 {section: Build and Install the tests }
 
-Build the tests and copy them into the testing dir
+Build the tests and copy them into the testing dir. Run these commands
+in your HTCondor build directory.
 {term}
 devenv condor.sln /Build Debug /Project BLD_TESTS
 xcopy /Q /Y src\condor_tests\list_* "%testdir%\condor_tests\"
@@ -79,7 +80,7 @@
 Start HTCondor and verify that it is running
 {term}
 start %testdir%\bin\condor_master -f -t
-tail -f %testdir%\log\MasterLog
+condor_who -wait:60 "NumDead > 0 || AllAlive"
 {endterm}
 
 {section: Run a test }