diff --git a/ChangeLog b/ChangeLog
index 652d686..c2159c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-10-26  Ben Elliston  <bje@gnu.org>
+
+	* testsuite/config-guess.sh: Fix issues identified by Shellcheck.
+	* testsuite/config-sub.sh: Likewise.
+
 2017-09-26  Ben Elliston  <bje@gnu.org>
 
 	* config.guess: Output a note that a C compiler may be needed when
diff --git a/testsuite/config-guess.sh b/testsuite/config-guess.sh
index 65f88eb..b3e52ca 100644
--- a/testsuite/config-guess.sh
+++ b/testsuite/config-guess.sh
@@ -8,7 +8,7 @@
 # the simulated uname(1) output and the expected GNU system triplet.
 
 verbose=false
-PATH=`pwd`:$PATH
+PATH=$(pwd):$PATH
 
 run_config_guess ()
 {
@@ -29,13 +29,13 @@ run_config_guess ()
 [ \$1 = -p ] && echo "@PROCESSOR@" && exit 0
 EOF
 	chmod +x uname
-	output=`sh ../config.guess 2>/dev/null`
+	output=$(sh ../config.guess 2>/dev/null)
 	if test $? != 0 ; then
 	    echo "FAIL: unable to guess $machine:$release:$system:$version"
 	    rc=1
 	    continue
 	fi
-	if test $output != $triplet ; then
+	if test "$output" != "$triplet" ; then
 	    echo "FAIL: $output (expected $triplet)"
 	    rc=1
 	    continue
diff --git a/testsuite/config-sub.sh b/testsuite/config-sub.sh
index 7843efa..a5a910a 100644
--- a/testsuite/config-sub.sh
+++ b/testsuite/config-sub.sh
@@ -12,8 +12,8 @@ verbose=false
 run_config_sub ()
 {
     rc=0
-    while read alias canonical ; do
-	output=`sh ../config.sub $alias`
+    while read -r alias canonical ; do
+	output=$(sh ../config.sub "$alias")
 	if test "$output" != "$canonical" ; then
 	    echo "FAIL: $alias -> $output, but expected $canonical"
 	    rc=1