diff --git a/test/test.pl b/test/test.pl
index c91381da..96054d4d 100644
--- a/test/test.pl
+++ b/test/test.pl
@@ -183,8 +183,11 @@ o("GET /%68%65%6c%6c%6f%2e%74%78%74 HTTP/1.0\n\n",
 # Break CGI reading after 1 second. We must get full output.
 # Since CGI script does sleep, we sleep as well and increase request count
 # manually.
-fail('Slow CGI output forward ') unless
-  req("GET /timeout.cgi HTTP/1.0\r\n\r\n", 0, 1) =~ /Some data/s;
+my $slow_cgi_reply;
+print "==> Slow CGI output ... ";
+fail('Slow CGI output forward reply=', $slow_cgi_reply) unless
+  ($slow_cgi_reply = req("GET /timeout.cgi HTTP/1.0\r\n\r\n", 0, 1)) =~ /Some data/s;
+print "OK\n";
 sleep 3;
 $num_requests++;
 
diff --git a/test/timeout.cgi b/test/timeout.cgi
index d97e143b..32482056 100755
--- a/test/timeout.cgi
+++ b/test/timeout.cgi
@@ -1,7 +1,8 @@
 #!/usr/bin/env perl
 
 # Make stdout unbuffered
-$| = 1;
+use FileHandle;
+STDOUT->autoflush(1);
 
 # This script outputs some content, then sleeps for 5 seconds, then exits.
 # Web server should return the content immediately after it is sent,