cmake -DBUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=%testdir% -P cmake_install.cmake
 {endterm}
 
-Build the tests and copy them into the testing dir
-{term}
-devenv condor.sln /Build Debug /Project BLD_TESTS
-xcopy /Q /Y src\condor_tests\list_* "%testdir%\condor_tests\"
-xcopy /Q /Y src\condor_tests\Debug\*.exe "%testdir%\condor_tests\"
-xcopy /Q /Y src\condor_tests\Debug\*.pdb "%testdir%\condor_tests\"
-{endterm}
-
 Create a HTCondor configuration that all of the tests will derive from
 and set CONDOR_CONFIG to point to it.
 {term}
@@ -66,6 +58,18 @@
 popd
 {endterm}
 
+{section: Build and Install the tests }
+
+Build the tests and copy them into the testing dir
+{term}
+devenv condor.sln /Build Debug /Project BLD_TESTS
+xcopy /Q /Y src\condor_tests\list_* "%testdir%\condor_tests\"
+xcopy /Q /Y src\condor_tests\Debug\*.exe "%testdir%\condor_tests\"
+xcopy /Q /Y src\condor_tests\Debug\*.pdb "%testdir%\condor_tests\"
+{endterm}
+
+{section: Setup environment and start HTCondor }
+
 Set PATH and CONDOR_CONFIG environment variables
 {term}
 set CONDOR_CONFIG=%testdir%\condor_config
@@ -78,13 +82,14 @@
 tail -f %testdir%\log\MasterLog
 {endterm}
 
-You should now be able to run single tests in the testing location you chose
-for test XXX.run:
+{section: Run a test }
+
+You should now be able to run single tests in the testing location you chose.
+For instance to run test XXX.run:
 
 {code}
 cd %testdir%\condor_tests
 batch_test.pl -d . -t XXX.run
 {endcode}
 
-
 {section: Results}