diff --git a/ChangeLog b/ChangeLog
index 1940acf..131e295 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-03  Ben Elliston  <bje@gnu.org>
+
+	* testsuite/config-sub.sh (run_config-sub): Quote some variables
+	to avoid spurious shell errors when a test case fails.
+
 2014-03-23  Christian Svensson  <blue@cmd.nu>
 
 	* config.guess (openrisc:Linux:*:*): New.
diff --git a/testsuite/config-sub.sh b/testsuite/config-sub.sh
index ca56136..f4714d7 100644
--- a/testsuite/config-sub.sh
+++ b/testsuite/config-sub.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2004, 2005, 2009 Free Software Foundation, Inc.
+# Copyright 2004, 2005, 2009, 2014 Free Software Foundation, Inc.
 # Contributed by Ben Elliston <bje@gnu.org>.
 #
 # This test reads pairs from config-sub.data: an alias and its
@@ -14,7 +14,7 @@ run_config_sub ()
     rc=0
     while read alias canonical ; do
 	output=`sh ../config.sub $alias`
-	if test $output != $canonical ; then
+	if test "$output" != "$canonical" ; then
 	    echo "FAIL: $alias -> $output, but expected $canonical"
 	    rc=1
 	else
@@ -27,7 +27,6 @@ run_config_sub ()
 if run_config_sub ; then
     $verbose || echo "PASS: config.sub checks"
 else
-    echo "Unexpected failures."
     exit 1
 fi