diff --git a/winsup/testsuite/ChangeLog b/winsup/testsuite/ChangeLog
index 76a75974d..7f05b7ec6 100644
--- a/winsup/testsuite/ChangeLog
+++ b/winsup/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2001-05-21  Corinna Vinschen  <corinna@vinschen.de>
+
+	* winsup.api/mmaptest01.c: Add log output.
+	* winsup.api/mmaptest02.c: Write log output to stdout.
+	* winsup.api/mmaptest03.c: Ditto.
+
 2001-05-15  Corinna Vinschen  <corinna@vinschen.de>
 
 	* winsup.api/winsup.exp: Force linking all tests against binmode.o.
diff --git a/winsup/testsuite/winsup.api/mmaptest01.c b/winsup/testsuite/winsup.api/mmaptest01.c
index b400db7f4..5a14461e6 100644
--- a/winsup/testsuite/winsup.api/mmaptest01.c
+++ b/winsup/testsuite/winsup.api/mmaptest01.c
@@ -99,7 +99,10 @@ int main ()
 
   /* the buffers have to be different */
   if (buf1 == buf2 || !memcmp (buf1, buf2, 20))
-    return 1;
+    {
+      printf ("buffers are not different!\n");
+      return 1;
+    }
 
   return 0;
 }
diff --git a/winsup/testsuite/winsup.api/mmaptest02.c b/winsup/testsuite/winsup.api/mmaptest02.c
index 3e7b92997..ec5bac7f7 100644
--- a/winsup/testsuite/winsup.api/mmaptest02.c
+++ b/winsup/testsuite/winsup.api/mmaptest02.c
@@ -29,7 +29,7 @@ int fd;
 void
 perror_exit (char *str, int code)
 {
-  perror (str);
+  printf ("%s: %s\n", str, strerror (errno));
   exit (code);
 }
 
@@ -149,7 +149,7 @@ test_3 ()
       }
   if (y == 0)
     {
-      fputs ("test 3: couldn't get two consecutive pages, giving up\n", stderr);
+      fputs ("test 3: couldn't get two consecutive pages, giving up\n", stdout);
       exit (65);
     }
   
diff --git a/winsup/testsuite/winsup.api/mmaptest03.c b/winsup/testsuite/winsup.api/mmaptest03.c
index 6cff97106..544e3e43c 100644
--- a/winsup/testsuite/winsup.api/mmaptest03.c
+++ b/winsup/testsuite/winsup.api/mmaptest03.c
@@ -23,7 +23,7 @@ char const line[] = "y1 y1 y1 y1 y1 y1 y1 y1 y1 y1 y1 y1 y1 y1 y1 y1 y1";
 void
 perror_exit (char *str)
 {    
-  perror (str);
+  printf ("%s: %s\n", str, strerror (errno));
   exit (1);
 }