diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index f2f3b0fb92..cb5ca892c9 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2010-10-24  Maciej W. Rozycki  <macro@linux-mips.org>
+
+	* gas/mips/ld.s: Remove ".set mips1".
+	* gas/mips/ld.d: Remove "-march=r4000" and "-mmips:4000" from
+	gas/objdump options.
+	* gas/mips/ld-ilocks.d: Add "-32" to gas options.
+	* gas/mips/mips.exp: Run the two cases with run_dump_test_arches.
+
 2010-10-24  Maciej W. Rozycki  <macro@linux-mips.org>
 
 	* gas/mips/ld.s: Remove MIPS III bits.
diff --git a/gas/testsuite/gas/mips/ld-ilocks.d b/gas/testsuite/gas/mips/ld-ilocks.d
index d7c7ec43d7..8dfd1e5ddf 100644
--- a/gas/testsuite/gas/mips/ld-ilocks.d
+++ b/gas/testsuite/gas/mips/ld-ilocks.d
@@ -1,7 +1,7 @@
 #objdump: -dr --prefix-addresses
+#as: -32
 #name: MIPS ld-ilocks
 #source: ld.s
-#as:
 
 # Test the ld macro.
 
diff --git a/gas/testsuite/gas/mips/ld.d b/gas/testsuite/gas/mips/ld.d
index 4caebb6720..929a1d4e2b 100644
--- a/gas/testsuite/gas/mips/ld.d
+++ b/gas/testsuite/gas/mips/ld.d
@@ -1,5 +1,5 @@
-#objdump: -dr --prefix-addresses -mmips:4000
-#as: -32 -march=r4000
+#objdump: -dr --prefix-addresses
+#as: -32
 #name: MIPS ld
 
 # Test the ld macro.
diff --git a/gas/testsuite/gas/mips/ld.s b/gas/testsuite/gas/mips/ld.s
index a30f61f965..a6ceffbc50 100644
--- a/gas/testsuite/gas/mips/ld.s
+++ b/gas/testsuite/gas/mips/ld.s
@@ -1,7 +1,5 @@
 # Source file used to test the ld macro.
 
-	.set	mips1
-
 	.bss
 	.align	12
 	.sbss
diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index 51e0bafa5e..f581c9d6f6 100644
--- a/gas/testsuite/gas/mips/mips.exp
+++ b/gas/testsuite/gas/mips/mips.exp
@@ -405,7 +405,6 @@ if { [istarget mips*-*-vxworks*] } {
     set elf [expr [istarget *-*-elf*] || [istarget *-*-irix5*] || [istarget *-*-irix6* ] || [istarget *-*-linux*] || [istarget *-*-netbsd*] ]
     set ecoff [expr [istarget *-*-ecoff*] || [istarget *-*-ultrix*] || [istarget *-*-irix\[1-4\]*] ]
     set aout [expr [istarget *-*-bsd*] || [istarget *-*-openbsd*] ]
-    set gpr_ilocks [expr [istarget mipstx39*-*-*]]
     set addr32 [expr [istarget mipstx39*-*-*] || [istarget mips-*-linux*] || [istarget mipsel-*-linux*] || [istarget mips*-*-ecoff]]
     set has_newabi [expr [istarget *-*-irix6*] || [istarget mips64*-*-linux*]]
 
@@ -497,11 +496,10 @@ if { [istarget mips*-*-vxworks*] } {
 	run_dump_test "lb-xgot-ilocks"
     }
     if !$aout {
-        if !$gpr_ilocks {
-            run_dump_test "ld"
-        } else { 
-	    run_dump_test "ld-ilocks"
-        }
+	run_dump_test_arches "ld" \
+				[mips_arch_list_matching mips1 !gpr_ilocks]
+	run_dump_test_arches "ld-ilocks" \
+				[mips_arch_list_matching gpr_ilocks !mips2]
     }
     if $elf { run_dump_test "ld-svr4pic" }
     if $elf { run_dump_test "ld-xgot" }