diff --git a/ChangeLog b/ChangeLog
index 4dbd191..c62da1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2019-01-03  Ben Elliston  <bje@gnu.org>
+
+	* testsuite/config-guess.sh (run_config_guess): Set CC_FOR_BUILD
+	to no_compiler_found so that we don't erroneously use the compiler
+	of the host running the testsuite.
+	* testsuite/config-guess.data: Adjust ARM FreeBSD expected output.
+
 2019-01-01  Ben Elliston  <bje@gnu.org>
 
 	* config.guess: Update copyright years.
diff --git a/testsuite/config-guess.data b/testsuite/config-guess.data
index 6d399a9..43f9398 100644
--- a/testsuite/config-guess.data
+++ b/testsuite/config-guess.data
@@ -14,8 +14,8 @@ arceb | ignored | Linux | ignored | ignored | arceb-unknown-linux-gnu
 arc | ignored | Linux | ignored | ignored | arc-unknown-linux-gnu
 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-gnueabi
-arm | 12.0 | FreeBSD | ignored | armv7 | armv7-unknown-freebsd12.0-gnueabi
+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
diff --git a/testsuite/config-guess.sh b/testsuite/config-guess.sh
index 0c0ac18..d3d53f6 100644
--- a/testsuite/config-guess.sh
+++ b/testsuite/config-guess.sh
@@ -30,7 +30,7 @@ run_config_guess()
 [ \$1 = -p ] && echo "@PROCESSOR@" && exit 0
 EOF
 		chmod +x uname
-		output=$(sh -eu ../config.guess 2>/dev/null)
+		output=$(CC_FOR_BUILD=no_compiler_found sh -eu ../config.guess 2>/dev/null)
 		if test $? != 0 ; then
 			echo "FAIL: unable to guess $machine:$release:$system:$version"
 			rc=1