diff --git a/ld/ChangeLog b/ld/ChangeLog
index c59fe65cd2b519ccf189c2079f69e2a04c7e30bb..79c495d1c7d4434fbf2be091d958c1833239222e 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,10 @@
+2016-06-28  Maciej W. Rozycki  <macro@imgtec.com>
+
+	* testsuite/ld-mips-elf/attr-gnu-4-10.d: Match any UNIX OS/ABI.
+	* testsuite/ld-mips-elf/attr-gnu-4-50.d: Likewise.
+	* testsuite/ld-mips-elf/attr-gnu-4-60.d: Likewise.
+	* testsuite/ld-mips-elf/attr-gnu-4-70.d: Likewise.
+
 2016-06-28  Alan Modra  <amodra@gmail.com>
 
 	PR ld/20302
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-10.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-10.d
index 7dd45cf86fbc900c2828f625864f6783c4664900..e3a1c9c0d0018a210641ea0d0083ae341b927418 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-10.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-10.d
@@ -8,7 +8,7 @@ ELF Header:
   Class:                             ELF32
   Data:                              2's complement,.*
   Version:                           1 \(current\)
-  OS/ABI:                            UNIX - System V
+  OS/ABI:                            UNIX - .*
   ABI Version:                       0
   Type:                              REL \(Relocatable file\)
   Machine:                           MIPS R3000
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-50.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-50.d
index 651277dc8d9483d136eae478ccf5773224d7e0d4..5dc46d32aff1f17d052ae155b95ba79f181f1e23 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-50.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-50.d
@@ -8,7 +8,7 @@ ELF Header:
   Class:                             ELF32
   Data:                              2's complement,.*
   Version:                           1 \(current\)
-  OS/ABI:                            UNIX - System V
+  OS/ABI:                            UNIX - .*
   ABI Version:                       0
   Type:                              REL \(Relocatable file\)
   Machine:                           MIPS R3000
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-60.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-60.d
index 80977a86df683bd27a25b2c0e8055328a2818634..ea80c189a239e246408501c807aca731e12f6ed5 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-60.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-60.d
@@ -8,7 +8,7 @@ ELF Header:
   Class:                             ELF32
   Data:                              2's complement,.*
   Version:                           1 \(current\)
-  OS/ABI:                            UNIX - System V
+  OS/ABI:                            UNIX - .*
   ABI Version:                       3
   Type:                              REL \(Relocatable file\)
   Machine:                           MIPS R3000
diff --git a/ld/testsuite/ld-mips-elf/attr-gnu-4-70.d b/ld/testsuite/ld-mips-elf/attr-gnu-4-70.d
index 3cd32504378a217baef1d13e7229496afad7fe3d..edbd61fa7cbb6c302ce3acdaa4211c8721bd8d54 100644
--- a/ld/testsuite/ld-mips-elf/attr-gnu-4-70.d
+++ b/ld/testsuite/ld-mips-elf/attr-gnu-4-70.d
@@ -8,7 +8,7 @@ ELF Header:
   Class:                             ELF32
   Data:                              2's complement,.*
   Version:                           1 \(current\)
-  OS/ABI:                            UNIX - System V
+  OS/ABI:                            UNIX - .*
   ABI Version:                       3
   Type:                              REL \(Relocatable file\)
   Machine:                           MIPS R3000