diff --git a/ChangeLog b/ChangeLog
index 9011143d..61bda1a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-07-29  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	testsuite: avoid bogus hostname match from inner test logs.
+	* tests/autotest.at (Hard fail): Check more restrictively for
+	passed tests, so that hostnames recorded in the log file do not
+	wrongly match.
+	Report by Ludovic Courtès.
+
 2009-07-26  Eric Blake  <ebb9@byu.net>
 
 	Release Version 2.64.
diff --git a/tests/autotest.at b/tests/autotest.at
index 57382ca8..78364394 100644
--- a/tests/autotest.at
+++ b/tests/autotest.at
@@ -271,7 +271,7 @@ AT_CHECK_AT_TEST([Hard fail],
    AT_CHECK([exit 99])],
   [], [1], [], [ignore], [],
   [AT_CHECK([grep '2 failed unexpectedly' micro-suite.log], [], [ignore])
-   AT_CHECK([grep ok micro-suite.log], [1])])
+   AT_CHECK([grep '^[[12]].*ok' micro-suite.log], [1])])
 
 AT_CHECK_AT_TEST([AT@&t@_FAIL_IF],
   [AT_FAIL_IF([:])