diff --git a/test/dependency_test.py b/test/dependency_test.py
index eb0ad0fe3..513cac70e 100644
--- a/test/dependency_test.py
+++ b/test/dependency_test.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-from BoostBuild import Tester, List
+from BoostBuild import Tester, List, exe_suffix, dll_suffix
 
 t = Tester()
 
@@ -8,21 +8,19 @@ t.set_tree("dependency-test")
 t.run_build_system()
 # Check that main target 'c' was able to find 'x.h' from
 # 'a's dependency graph
-t.expect_addition("bin/gcc/debug/main-target-c/c")
+t.expect_addition("bin/gcc/debug/main-target-c/c" + exe_suffix)
 # Check that main target 'e' was able to find 'y.h'
-t.expect_addition("bin/gcc/debug/main-target-e/e")
+t.expect_addition("bin/gcc/debug/main-target-e/e" + exe_suffix)
 
 # Check handling of first level includes.
 
 # Both 'a' and 'b' include "a.h" and should be updated
 t.touch("a.h")
-t.run_build_system()
-
-t.expect_touch("bin/gcc/debug/a")
+t.expect_touch("bin/gcc/debug/a" + exe_suffix)
 t.expect_touch("bin/gcc/debug/a.o")
-t.expect_touch("bin/gcc/debug/b")
+t.expect_touch("bin/gcc/debug/b" + exe_suffix)
 t.expect_touch("bin/gcc/debug/b.o")
-t.expect_touch("bin/gcc/debug/main-target-c/c")
+t.expect_touch("bin/gcc/debug/main-target-c/c" + exe_suffix)
 t.expect_nothing_more()
 
 # Only 'a' include <a.h> and should be updated
@@ -31,15 +29,15 @@ t.run_build_system()
 
 t.expect_touch("bin/gcc/debug/a")
 t.expect_touch("bin/gcc/debug/a.o")
-t.expect_touch("bin/gcc/debug/main-target-c/c")
+t.expect_touch("bin/gcc/debug/main-target-c/c" + exe_suffix)
 t.expect_nothing_more()
 
 # "src/a.h" includes "b.h" (in the same dir)
 t.touch("src1/b.h")
 t.run_build_system()
-t.expect_touch("bin/gcc/debug/a")
+t.expect_touch("bin/gcc/debug/a" + exe_suffix)
 t.expect_touch("bin/gcc/debug/a.o")
-t.expect_touch("bin/gcc/debug/main-target-c/c")
+t.expect_touch("bin/gcc/debug/main-target-c/c" + exe_suffix)
 t.expect_nothing_more()
 
 t.touch("b.h")
diff --git a/v2/test/dependency_test.py b/v2/test/dependency_test.py
index eb0ad0fe3..513cac70e 100644
--- a/v2/test/dependency_test.py
+++ b/v2/test/dependency_test.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-from BoostBuild import Tester, List
+from BoostBuild import Tester, List, exe_suffix, dll_suffix
 
 t = Tester()
 
@@ -8,21 +8,19 @@ t.set_tree("dependency-test")
 t.run_build_system()
 # Check that main target 'c' was able to find 'x.h' from
 # 'a's dependency graph
-t.expect_addition("bin/gcc/debug/main-target-c/c")
+t.expect_addition("bin/gcc/debug/main-target-c/c" + exe_suffix)
 # Check that main target 'e' was able to find 'y.h'
-t.expect_addition("bin/gcc/debug/main-target-e/e")
+t.expect_addition("bin/gcc/debug/main-target-e/e" + exe_suffix)
 
 # Check handling of first level includes.
 
 # Both 'a' and 'b' include "a.h" and should be updated
 t.touch("a.h")
-t.run_build_system()
-
-t.expect_touch("bin/gcc/debug/a")
+t.expect_touch("bin/gcc/debug/a" + exe_suffix)
 t.expect_touch("bin/gcc/debug/a.o")
-t.expect_touch("bin/gcc/debug/b")
+t.expect_touch("bin/gcc/debug/b" + exe_suffix)
 t.expect_touch("bin/gcc/debug/b.o")
-t.expect_touch("bin/gcc/debug/main-target-c/c")
+t.expect_touch("bin/gcc/debug/main-target-c/c" + exe_suffix)
 t.expect_nothing_more()
 
 # Only 'a' include <a.h> and should be updated
@@ -31,15 +29,15 @@ t.run_build_system()
 
 t.expect_touch("bin/gcc/debug/a")
 t.expect_touch("bin/gcc/debug/a.o")
-t.expect_touch("bin/gcc/debug/main-target-c/c")
+t.expect_touch("bin/gcc/debug/main-target-c/c" + exe_suffix)
 t.expect_nothing_more()
 
 # "src/a.h" includes "b.h" (in the same dir)
 t.touch("src1/b.h")
 t.run_build_system()
-t.expect_touch("bin/gcc/debug/a")
+t.expect_touch("bin/gcc/debug/a" + exe_suffix)
 t.expect_touch("bin/gcc/debug/a.o")
-t.expect_touch("bin/gcc/debug/main-target-c/c")
+t.expect_touch("bin/gcc/debug/main-target-c/c" + exe_suffix)
 t.expect_nothing_more()
 
 t.touch("b.h")