diff --git a/ChangeLog b/ChangeLog
index d72ad1fb..a52182a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-22  Eric Blake  <ebb9@byu.net>
+
+	Fix testsuite failure on Solaris.
+	* tests/torture.at (AT_CHECK_CONFIG_CREATION_NOWRITE): Normalize
+	failure status to 1.
+
 2008-11-21  Eric Blake  <ebb9@byu.net>
 
 	Clean up AS_MESSAGE_LOG_FD usage.
diff --git a/tests/torture.at b/tests/torture.at
index 1a9ea4f2..4779e215 100644
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -244,7 +244,8 @@ AT_CHECK_CONFIGURE([what_to_test=var-$1 --no-create])
 touch t
 chmod a-w .
 mv t t1 >/dev/null 2>&1 \
-  || AT_CHECK([./config.status var-$1 </dev/null], [1], [ignore], [ignore])
+  || AT_CHECK([./config.status var-$1 </dev/null || exit 1],
+   [1], [ignore], [ignore])
 chmod u+w .
 rm -rf t t1
 ])# AT_CHECK_CONFIG_CREATION_NOWRITE