diff --git a/ld/ChangeLog b/ld/ChangeLog
index 6b8ffdb0abb..fbdabccc846 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2018-04-03  Maciej W. Rozycki  <macro@mips.com>
+
+	* testsuite/ld-mips-elf/comm-data.exp: Correct support for
+	`mips*-*-kfreebsd*-gnu' targets.
+
 2018-03-23  Renlin Li  <renlin.li@arm.com>
 
 	PR ld/22970
diff --git a/ld/testsuite/ld-mips-elf/comm-data.exp b/ld/testsuite/ld-mips-elf/comm-data.exp
index 109e8cebece..b50e1fda452 100644
--- a/ld/testsuite/ld-mips-elf/comm-data.exp
+++ b/ld/testsuite/ld-mips-elf/comm-data.exp
@@ -39,9 +39,11 @@ set has_n32abi [expr [istarget *-img-elf*] \
 		     || [istarget *-sde-elf*] \
 		     || [istarget *-*-freebsd*] \
 		     || [istarget *-*-irix6*] \
+		     || [istarget *-*-kfreebsd*-gnu] \
 		     || [istarget *-*-linux*]]
 set has_n64abi [expr [istarget *-*-freebsd*] \
 		     || [istarget *-*-irix6*] \
+		     || [istarget *-*-kfreebsd*-gnu] \
 		     || [istarget *-*-linux*] \
 		     || [istarget *-*-netbsd*] \
 		     || [istarget *-*-openbsd*]]
@@ -62,7 +64,8 @@ if {[istarget *-img-elf*] \
 	set abi_ldemul(n32) elf32btsmipn32
 	set abi_ldemul(n64) elf64btsmip
     }
-} elseif { [istarget *-*-freebsd*] } {
+} elseif { [istarget *-*-freebsd*] \
+	   || [istarget *-*-kfreebsd*-gnu] } {
     if [istarget *el-*-*] {
 	set abi_ldemul(o32) elf32ltsmip_fbsd
 	set abi_ldemul(n32) elf32ltsmipn32_fbsd