diff --git a/ChangeLog b/ChangeLog
index c62a539..3d9268a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2019-06-04  Ben Elliston  <bje@gnu.org>
+
+	* Makefile (sort): New target.
+	* testsuite/config-guess.data: Sort.
+	* testsuite/config-sub.data: Likewise.
+
 2019-05-28  Ben Elliston  <bje@gnu.org>
 
 	* config.guess (*:Darwin:*:*): Run xcode-select to determine if a
diff --git a/Makefile b/Makefile
index 2c33c71..184cb64 100644
--- a/Makefile
+++ b/Makefile
@@ -18,3 +18,6 @@ check-sub:
 
 shellcheck:
 	shellcheck -e SC2006 -f gcc config.guess config.sub testsuite/*.sh
+
+sort:
+	for f in config-guess.data config-sub.data ; do sort testsuite/$$f -o testsuite/$$f; done
diff --git a/testsuite/config-guess.data b/testsuite/config-guess.data
index 7c1c1b4..738912b 100644
--- a/testsuite/config-guess.data
+++ b/testsuite/config-guess.data
@@ -12,11 +12,11 @@ amd64 | 7.0_RC1 | NetBSD | ignored | x86_64 | x86_64-unknown-netbsd7.0
 amd64 | 7.2.1 | Isilon OneFS | ignored | ignored | x86_64-unknown-onefs
 arceb | ignored | Linux | ignored | ignored | arceb-unknown-linux-gnu
 arc | ignored | Linux | ignored | ignored | arc-unknown-linux-gnu
+arm | 12.0 | FreeBSD | ignored | armv6 | armv6-unknown-freebsd12.0-gnueabihf
+arm | 12.0 | FreeBSD | ignored | armv7 | armv7-unknown-freebsd12.0-gnueabihf
 arm | ignored | Linux | ignored | ignored | arm-unknown-linux-gnueabihf
 arm | ignored | riscos | ignored | ignored | arm-unknown-riscos
 arm | ignored | RISCOS | ignored | ignored | arm-unknown-riscos
-arm | 12.0 | FreeBSD | ignored | armv6 | armv6-unknown-freebsd12.0-gnueabihf
-arm | 12.0 | FreeBSD | ignored | armv7 | armv7-unknown-freebsd12.0-gnueabihf
 armv4l | ignored | riscos | ignored | ignored | arm-unknown-riscos
 authenticamd | 6.0 | Interix | ignored | ignored | x86_64-unknown-interix6.0
 avr32 | 2.6.15 | Linux | ignored | ignored | avr32-unknown-linux-gnu
@@ -64,8 +64,8 @@ k1om | 2.6.38 | Linux | ignored | ignored | k1om-unknown-linux-gnu
 m88k | 7.0 | CX/UX | ignored | ignored | m88k-harris-cxux7
 macppc | 1.0 | MirBSD | ignored | ignored | powerpc-unknown-mirbsd1.0
 mips | 1.0 | OSF1 | ignored | ignored | mips-dec-osf1
-mips | ignored | SINIX-1 | ignored | mips | mips-sni-sysv4
 mips64el | 2.6.2 | Linux | ignored | ignored | mips64el-unknown-linux-gnu
+mips | ignored | SINIX-1 | ignored | mips | mips-sni-sysv4
 Motorola | ignored | PowerMAX_OS | ignored | ignored | powerpc-motorola-powermax
 NEO-1 | 1.0 | NONSTOP_KERNEL | ignored | ignored | neo-tandem-nsk1.0
 NEO-12 | 1.0 | NONSTOP_KERNEL | ignored | ignored | neo-tandem-nsk1.0
@@ -112,9 +112,9 @@ x86_64 | 1.0 | MINGW64 | ignored | ignored | x86_64-pc-mingw64
 x86_64 | 1.0 | MINGW | ignored | ignored | x86_64-pc-mingw32
 x86_64 | 1.0 | Redox | ignored | ignored | x86_64-unknown-redox
 x86_64 | 1.0 | Sortix | ignored | ignored | x86_64-unknown-sortix
+x86_64 | 14.0 | Darwin | ignored | i386 | x86_64-apple-darwin14.0
 x86_64 | 1.5.18(0.132/4/2) | CYGWIN_NT-5.2 | ignored | ignored | x86_64-pc-cygwin
 x86_64 | 2.0.0(0.271/5/3) | MSYS_NT-6.1 | ignored | ignored | x86_64-pc-msys
 x86_64 | 2.6.32 | Linux | ignored | ignored | x86_64-pc-linux-gnu
 x86_64 | 2.6.32 | VMkernel | ignored | ignored | x86_64-unknown-esx
-x86_64 | 14.0 | Darwin | ignored | i386 | x86_64-apple-darwin14.0
 xtensa | 2.6.15 | Linux | ignored | ignored | xtensa-unknown-linux-gnu
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 9f4f53b..6b1d431 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -622,10 +622,10 @@ visium-elf					visium-unknown-elf
 visium						visium-unknown-none
 vsta						i386-pc-vsta
 wasm32-emscripten				wasm32-unknown-emscripten
-wasm64-emscripten				wasm64-unknown-emscripten
 wasm32-wasi					wasm32-unknown-wasi
-wasm64-wasi					wasm64-unknown-wasi
 wasm32						wasm32-unknown-none
+wasm64-emscripten				wasm64-unknown-emscripten
+wasm64-wasi					wasm64-unknown-wasi
 we32k						we32k-att-sysv
 x64-linux					x86_64-pc-linux-gnu
 x64						x86_64-pc-none