diff --git a/winsup/testsuite/ChangeLog b/winsup/testsuite/ChangeLog
index feeb4e641..76a75974d 100644
--- a/winsup/testsuite/ChangeLog
+++ b/winsup/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-15  Corinna Vinschen  <corinna@vinschen.de>
+
+	* winsup.api/winsup.exp: Force linking all tests against binmode.o.
+
 2001-04-27  Corinna Vinschen  <corinna@vinschen.de>
 
 	* winsup.api/mmaptest04.c: Take care for binmode explicitely.
diff --git a/winsup/testsuite/winsup.api/winsup.exp b/winsup/testsuite/winsup.api/winsup.exp
index 743f4cfaa..17393d3fe 100644
--- a/winsup/testsuite/winsup.api/winsup.exp
+++ b/winsup/testsuite/winsup.api/winsup.exp
@@ -39,7 +39,7 @@ foreach src [glob -nocomplain $srcdir/$subdir/*.c $srcdir/$subdir/*/*.c] {
         set add_libs $ltp_libs
     }
 
-    ws_spawn "$CC -g3 $CFLAGS $src $add_includes $add_libs $runtime_root/new-libcygwin.a -o $base.exe"
+    ws_spawn "$CC -g3 $CFLAGS $src $add_includes $add_libs $runtime_root/binmode.o $runtime_root/new-libcygwin.a -o $base.exe"
     if { $rv != "" } {
 	verbose -log "$rv"
 	fail "$testcase (compile)"