diff --git a/ld/ChangeLog b/ld/ChangeLog
index d90c8d842f..e3fc4e8440 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2018-07-05  Maciej W. Rozycki  <macro@mips.com>
+
+	* testsuite/ld-mips-elf/mips-elf.exp: Replace remaining calls to
+	`[istarget mips*-*-linux*]' with $linux_gnu.
+
 2018-07-05  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR ld/23372
diff --git a/ld/testsuite/ld-mips-elf/mips-elf.exp b/ld/testsuite/ld-mips-elf/mips-elf.exp
index 1a546627de..ddd90f25ee 100644
--- a/ld/testsuite/ld-mips-elf/mips-elf.exp
+++ b/ld/testsuite/ld-mips-elf/mips-elf.exp
@@ -781,7 +781,7 @@ run_dump_test "hash1a"
 run_dump_test "hash1b"
 run_dump_test "hash1c"
 
-if {[istarget mips*-*-linux*]} {
+if { $linux_gnu } {
     # The number of symbols that are always included in the symbol table
     # for these tests.
     #     the null symbol entry
@@ -885,7 +885,7 @@ set mips_tls_tests {
      "tls-hidden4.so"}
 }
 
-if {[istarget mips*-*-linux*]} {
+if { $linux_gnu } {
     run_ld_link_tests $mips_tls_tests
 }