diff --git a/ChangeLog b/ChangeLog
index 7716192..a23ff96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-12-27  Ben Elliston  <bje@gnu.org>
+
+	* testsuite/config-guess.data: Sort.
+	* testsuite/config-sub.data: Likewise.
+
 2016-12-24  Jeremy Soller  <jackpot51@gmail.com>
 
        * config.sub (-redox*): New.
diff --git a/testsuite/config-guess.data b/testsuite/config-guess.data
index d35bf6f..14627e4 100644
--- a/testsuite/config-guess.data
+++ b/testsuite/config-guess.data
@@ -37,6 +37,7 @@ frv	2.4.24	Linux	ignored	ignored	frv-unknown-linux-gnu
 genuineintel	6.0	Interix	ignored	ignored	x86_64-unknown-interix6.0
 hexagon	1.0	Linux	ignored	ignored	hexagon-unknown-linux-gnu
 i386	1.0	MINGW	ignored	ignored	i386-pc-mingw32
+i386	1.0	Sortix	ignored	ignored i386-unknown-sortix
 i386	12.1	AROS	ignored	ignored	i386-pc-aros
 i386	4.2	LynxOS	ignored	ignored	i386-unknown-lynxos4.2
 i386	ignored	VOS	ignored	ignored	i386-stratus-vos
@@ -82,10 +83,9 @@ x86	6.0	Interix	ignored	ignored	i586-pc-interix6.0
 x86_64	1.0	Haiku	ignored	ignored	x86_64-unknown-haiku
 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	Sortix	ignored	ignored x86_64-unknown-sortix
 x86_64	1.5.18(0.132/4/2)	CYGWIN_NT-5.2	ignored	ignored	x86_64-unknown-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
 xtensa	2.6.15	Linux	ignored	ignored	xtensa-unknown-linux-gnu
-i386	1.0	Sortix	ignored	ignored i386-unknown-sortix
-x86_64	1.0	Sortix	ignored	ignored x86_64-unknown-sortix
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index d9d1946..bf380ce 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -16,8 +16,6 @@ aarch64-unknown-linux		aarch64-unknown-linux-gnu
 abacus				abacus-unknown-none
 adobe68k			m68010-adobe-scout
 alliant				fx80-alliant-none
-altos				m68k-altos-sysv
-altos3068			m68k-altos-sysv
 alpha64				alpha64-unknown-none
 alpha64ev4			alpha64ev4-unknown-none
 alpha64ev56			alpha64ev56-unknown-none
@@ -28,12 +26,14 @@ alphaev4			alphaev4-unknown-none
 alphaev56			alphaev56-unknown-none
 alphaev67			alphaev67-unknown-none
 alphapca56			alphapca56-unknown-none
+altos3068			m68k-altos-sysv
+altos				m68k-altos-sysv
 am33_2.0			am33_2.0-unknown-none
-amd64				x86_64-pc-none
 amd64-cygwin			x86_64-pc-cygwin
 amd64-kfreebsd5.4-gnu		x86_64-pc-kfreebsd5.4-gnu
 amd64-onefs			x86_64-pc-onefs
 amd64-unknown-freebsd5.2	x86_64-unknown-freebsd5.2
+amd64				x86_64-pc-none
 amdahl				580-amdahl-sysv
 amiga				m68k-unknown-none
 arc				arc-unknown-none
@@ -56,10 +56,10 @@ arm-unknown-netbsdelf7.0	arm-unknown-netbsdelf7.0
 arm-unknown-riscos		arm-unknown-riscos
 armv2				armv2-unknown-none
 armv3l				armv3l-unknown-none
+armv6-cloudabi-eabihf		armv6-unknown-cloudabi-eabihf
 armv6eb-unknown-netbsdelf7.0	armv6eb-unknown-netbsdelf7.0
 armv6eb-unknown-netbsdelf7.0-eabi	armv6eb-unknown-netbsdelf7.0-eabi
 armv6eb-unknown-netbsdelf7.0-eabihf	armv6eb-unknown-netbsdelf7.0-eabihf
-armv6-cloudabi-eabihf		armv6-unknown-cloudabi-eabihf
 armv6-linux-gnu			armv6-unknown-linux-gnu
 armv6-unknown-netbsdelf7.0	armv6-unknown-netbsdelf7.0
 armv6-unknown-netbsdelf7.0-eabi	armv6-unknown-netbsdelf7.0-eabi
@@ -365,8 +365,8 @@ ppcle-none-elf			powerpcle-none-elf
 ppcle				powerpcle-unknown-none
 ppc-none-elf			powerpc-none-elf
 ppc				powerpc-unknown-none
-pru				pru-unknown-elf
 pru-elf				pru-unknown-elf
+pru				pru-unknown-elf
 pyramid				pyramid-unknown-none
 rdos32				i386-pc-rdos
 rdos64				x86_64-pc-rdos
@@ -454,8 +454,8 @@ spu				spu-unknown-elf
 st2000				m68k-tandem-none
 strongarm			arm-unknown-none
 strongarm-none-elf		arm-none-elf
-sun3				m68k-sun-sunos4.1.1
 sun386				i386-sun-sunos4.0.2
+sun3				m68k-sun-sunos4.1.1
 sun4				sparc-sun-sunos4.1.1
 sv1				sv1-cray-unicos
 symmetry			i386-sequent-bsd