diff --git a/CHANGES b/CHANGES
index 459d657b47c56bfbea014159638926d38296e7b5..1bc88a2981d0c7e60831d48d1cbc2fe414e5d248 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,14 @@
 
                                   Changelog
 
+Daniel S (15 Nov 2007)
+- Fixed yet another remaining problem with doing SFTP directory listings on a
+  re-used persistent connection. Mentioned by Immanuel Gregoire on the mailing
+  list.
+
+- Michal Marek fixed the test suite to better deal with the case when the HTTP
+  ipv6 server can't run.
+
 Yang Tse (14 Nov 2007)
 - Fix a variable potential wrapping in add_buffer() when using absolutely
   huge send buffer sizes.
diff --git a/tests/runtests.pl b/tests/runtests.pl
index 395ce86c4e326fe961c0a6071c10c7d49bda43c1..039aa11bb5eb17e4a52a8b570ce0a894baff4b37 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -726,8 +726,7 @@ sub runhttpserver {
 
     if($httppid <= 0 || !kill(0, $httppid)) {
         # it is NOT alive
-        logmsg "RUN: failed to start the HTTP server\n";
-        stopservers($verbose);
+        logmsg "RUN: failed to start the HTTP$nameext server\n";
         return (0,0);
     }