diff --git a/ChangeLog b/ChangeLog
index af56d55..7a28303 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2019-03-23  Ben Elliston  <bje@gnu.org>
+
+	* testsuite/config-sub.sh (run_one_config_sub): New.
+	(run_one_config_sub_idempotent): Likewise.
+	(run_config_sub): Parallelise test cases.
+	(run_config_sub_idempotent): Likewise.
+
 2019-03-08  YunQiang Su  <ysu@wavecomp.com>
 
 	* config.guess (mips:Linux:*:*): Detect ISA R6.
diff --git a/testsuite/config-sub.sh b/testsuite/config-sub.sh
index a6ac5a1..32e3b09 100644
--- a/testsuite/config-sub.sh
+++ b/testsuite/config-sub.sh
@@ -11,39 +11,79 @@
 set -eu
 shopt -s lastpipe
 verbose=false
+maxprocs=16
+
+# Run a single config.sub invocation.
+run_one_config_sub()
+{
+	alias=$1
+	canonical=$2
+	output=$(sh -eu ../config.sub "$alias")
+	if test "$output" != "$canonical" ; then
+	    echo "FAIL: $alias -> $output, but expected $canonical"
+	    return 1
+	else
+	    $verbose && echo "PASS: $alias -> $canonical"
+	fi
+	return 0
+}
 
 run_config_sub()
 {
-	local -i rc=0
+    	local -i rc=0 jobs=0
 	numtests=0
 	name="checks"
 	while read -r alias canonical ; do
-		output=$(sh -eu ../config.sub "$alias")
-		if test "$output" != "$canonical" ; then
-			echo "FAIL: $alias -> $output, but expected $canonical"
-			rc=1
-		else
-			$verbose && echo "PASS: $alias -> $canonical"
+		run_one_config_sub "$alias" "$canonical" &
+		numtests+=1 jobs+=1
+	    	if [ $jobs -eq $maxprocs ] ; then
+		     	for pid in $(jobs -p) ; do
+		    	    	wait "$pid"
+				rc=$((rc || $?))
+			done
+			jobs=0
 		fi
-		numtests+=1
 	done < config-sub.data
+	for pid in $(jobs -p) ; do
+	    	wait "$pid"
+		rc=$((rc || $?))
+	done
 	return $rc
 }
 
+# Run a single config.sub invocation for idempotency checks.
+run_one_config_sub_idempotent()
+{
+    canonical=$1
+    output=$(sh -eu ../config.sub "$canonical")
+    if test "$output" != "$canonical" ; then
+	echo "FAIL: $canonical -> $output, but $canonical should map to itself"
+	return 1
+    else
+	$verbose && echo "PASS: $canonical -> $canonical"
+    fi
+    return 0
+}
+
 run_config_sub_idempotent()
 {
-	local -i rc=0
+	local -i rc=0 jobs=0
 	numtests=0
 	name="idempotency checks"
 	sed -r 's/\t+/\t/g' < config-sub.data | cut -f 2 | uniq | while read -r canonical ; do
-		output=$(sh -eu ../config.sub "$canonical")
-		if test "$output" != "$canonical" ; then
-			echo "FAIL: $canonical -> $output, but $canonical should map to itself"
-			rc=1
-		else
-			$verbose && echo "PASS: $canonical -> $canonical"
+		run_one_config_sub_idempotent "$canonical" &
+		numtests+=1 jobs+=1
+	    	if [ $jobs -eq $maxprocs ] ; then
+		     	for pid in $(jobs -p) ; do
+		    	    	wait "$pid"
+				rc=$((rc || $?))
+			done
+			jobs=0
 		fi
-		numtests+=1
+	done
+	for pid in $(jobs -p) ; do
+	    	wait "$pid"
+		rc=$((rc || $?))
 	done
 	return $rc
 }