diff --git a/ChangeLog b/ChangeLog
index c62da1e..84cd836 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2019-01-03  Ben Elliston  <bje@gnu.org>
+
+	* testsuite/config-guess.data: Add new tests for Solaris on i386
+	and SPARC machines.
+
 2019-01-03  Ben Elliston  <bje@gnu.org>
 
 	* testsuite/config-guess.sh (run_config_guess): Set CC_FOR_BUILD
diff --git a/testsuite/config-guess.data b/testsuite/config-guess.data
index 43f9398..e2e8a41 100644
--- a/testsuite/config-guess.data
+++ b/testsuite/config-guess.data
@@ -52,7 +52,9 @@ i686 | 1.0 | MidnightBSD | ignored | ignored | i686-unknown-midnightbsd1.0
 i686 | 5.11-686 | GNU/kOpenSolaris | ignored | ignored | i686-unknown-kopensolaris5.11-gnu
 i686 | 5.4-1-686 | GNU/kFreeBSD | ignored | ignored | i686-unknown-kfreebsd5.4-gnu
 i86pc | 5.0 | AuroraUX | ignored | ignored | i386-pc-auroraux5.0
+i86pc | 5.6 | SunOS | ignored | ignored | i386-pc-solaris2.6
 i86xen | 5.0 | AuroraUX | ignored | ignored | i386-pc-auroraux5.0
+i86xen | 5.6 | SunOS | ignored | ignored | i386-pc-solaris2.6
 IA64 | 6.0 | Interix | ignored | ignored | ia64-unknown-interix6.0
 k1om | 2.6.38 | Linux | ignored | ignored | k1om-unknown-linux-gnu
 macppc | 1.0 | MirBSD | ignored | ignored | powerpc-unknown-mirbsd1.0
@@ -81,10 +83,12 @@ ppc64le | 3.1.0 | Linux | ignored | ignored | powerpc64le-unknown-linux-gnu
 riscv32 | ignored | Linux | ignored | ignored | riscv32-unknown-linux-gnu
 riscv64 | ignored | Linux | ignored | ignored | riscv64-unknown-linux-gnu
 s390x | 5.6 | SunOS | ignored | ignored | s390x-ibm-solaris2.6
+sun4 | 5.6 | SunOS | ignored | ignored | sparc-sun-solaris2.6
 SX-7 | 1.0 | SUPER-UX | ignored | ignored | sx7-nec-superux1.0
 SX-8 | 1.0 | SUPER-UX | ignored | ignored | sx8-nec-superux1.0
 SX-8R | 1.0 | SUPER-UX | ignored | ignored | sx8r-nec-superux1.0
 SX-ACE | 1.0 | SUPER-UX | ignored | ignored | sxace-nec-superux1.0
+tadpole | 5.6 | SunOS | ignored | ignored | sparc-sun-solaris2.6
 tile | 2.6.36 | Linux | ignored | ignored | tile-unknown-linux-gnu
 tilegx | 2.6.36 | Linux | ignored | ignored | tilegx-unknown-linux-gnu
 vax | 2.6.15 | Linux | ignored | ignored | vax-dec-linux-gnu