diff --git a/ChangeLog b/ChangeLog
index e674318a..1f157b70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2007-12-08  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+	* tests/torture.at (srcdir): Fix quoting.
+
 	Do not pass top_srcdir to configure scripts in testsuite.
 	* tests/autotest.at (srcdir propagation): Copy install-sh to
 	source tree.
diff --git a/tests/torture.at b/tests/torture.at
index 11c619d7..6a7b962c 100644
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -972,10 +972,13 @@ AT_DATA([configure.ac],
 
 AC_CONFIG_FILES([foo at-dir/bar])
 
+# Use quotes in the INIT-COMMANDS to accommodate a value of $srcdir
+# containing e.g., spaces or shell meta-characters.
+# Use *single* quotes because the context is an unquoted here-doc.
 AC_CONFIG_COMMANDS([report],
-[test -f $srcdir/configure.ac ||
+[test -f "$srcdir/configure.ac" ||
    AC_MSG_ERROR([cannot find $srcdir/configure.ac])],
-		   [srcdir=$srcdir])
+		   [srcdir='$srcdir'])
 
 AC_OUTPUT
 rm -f -r foo at-dir/bar