diff --git a/v2/test/test1.py b/v2/test/test1.py
index 3cdc71d2d..05b396648 100644
--- a/v2/test/test1.py
+++ b/v2/test/test1.py
@@ -6,7 +6,7 @@
 
 import BoostBuild
 
-t = BoostBuild.Tester()
+t = BoostBuild.Tester(pass_toolset=0)
 
 t.write("test.jam", """
 actions unbuilt { }
@@ -15,4 +15,4 @@ ECHO "Hi" ;
 """)
 
 t.run_build_system("-ftest.jam", stdout="Hi\n")
-t.pass_test()
+t.cleanup()
diff --git a/v2/test/test2.py b/v2/test/test2.py
index b5c9ba824..938b36545 100644
--- a/v2/test/test2.py
+++ b/v2/test/test2.py
@@ -11,7 +11,7 @@ t = BoostBuild.Tester()
 
 t.set_tree("test2")
 
-file_list = 'bin/foo/$toolset/debug/runtime-link-dynamic/' * \
+file_list = 'bin/$toolset/debug/' * \
     BoostBuild.List("foo foo.o")
 
 t.run_build_system("-sBOOST_BUILD_PATH=" + t.original_workdir + "/..")
@@ -22,4 +22,4 @@ t.write("foo.cpp", "int main() {}\n")
 t.run_build_system("-d2 -sBOOST_BUILD_PATH=" + t.original_workdir + "/..")
 t.expect_touch(file_list)
 
-t.pass_test()
+t.cleanup()
diff --git a/v2/test/test2/Jamrules b/v2/test/test2/Jamrules
deleted file mode 100644
index e69de29bb..000000000
diff --git a/v2/test/test2/jamfile.jam b/v2/test/test2/jamroot.jam
similarity index 92%
rename from v2/test/test2/jamfile.jam
rename to v2/test/test2/jamroot.jam
index 670583964..4fb3f2886 100644
--- a/v2/test/test2/jamfile.jam
+++ b/v2/test/test2/jamroot.jam
@@ -2,7 +2,4 @@
 # Distributed under the Boost Software License, Version 1.0. 
 # (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
 
-
-project-root ;
-
 exe foo : foo.cpp ;