diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 6408a041da..371de6fa90 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2006-07-04  Thiemo Seufer  <ths@mips.com>
+
+	* gas/mips/e32-rel2.d, gas/mips/e32-rel4.d: Use -mabi=32 for as.
+	* gas/mips/mips.exp: Move mips16e testcase to ELF only tests.
+	Run elf{el}-rel2 and elf-rel4 for all arches with gpr64. Run
+	e32-rel2 and e32-rel4 also for 64 bit configurations.
+
 2006-06-23  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* gas/i386/i386.exp: Run nops-1, nops-1-i386, nops-1-i686,
diff --git a/gas/testsuite/gas/mips/e32-rel2.d b/gas/testsuite/gas/mips/e32-rel2.d
index 3983c7fd6f..a43fd33059 100644
--- a/gas/testsuite/gas/mips/e32-rel2.d
+++ b/gas/testsuite/gas/mips/e32-rel2.d
@@ -1,5 +1,6 @@
 #objdump: -sr -j .text
 #name: MIPS ELF reloc 2 (32-bit)
+#as: -mabi=32
 #source: elf-rel2.s
 
 # Test the GPREL and LITERAL generation.
diff --git a/gas/testsuite/gas/mips/e32-rel4.d b/gas/testsuite/gas/mips/e32-rel4.d
index 81ae4e7fc1..35deea45ef 100644
--- a/gas/testsuite/gas/mips/e32-rel4.d
+++ b/gas/testsuite/gas/mips/e32-rel4.d
@@ -1,5 +1,6 @@
 #objdump: --prefix-addresses -dr
-#name: MIPS ELF reloc 4
+#name: MIPS ELF reloc 4 (32-bit)
+#as: -mabi=32
 #source: elf-rel4.s
 
 .*: +file format.*
diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index 5156754bc9..94f08a841f 100644
--- a/gas/testsuite/gas/mips/mips.exp
+++ b/gas/testsuite/gas/mips/mips.exp
@@ -533,6 +533,8 @@ if { [istarget mips*-*-vxworks*] } {
     if { $elf && !$no_mips16 } {
 	run_dump_test "mips16"
 	run_dump_test "mips16-64"
+	# Check MIPS16e extensions
+	run_dump_test_arches "mips16e" 	[mips_arch_list_matching mips32]
 	# Check jalx handling
 	run_dump_test "mips16-jalx"
 	run_dump_test "mips-jalx"
@@ -637,18 +639,11 @@ if { [istarget mips*-*-vxworks*] } {
   	run_dump_test "mips-abi32-pic2"
 
 	run_dump_test "elf${el}-rel"
-	if {[istarget mips64*-*-*] || [istarget mipsisa32*-*-*]
-	    || [istarget mipsisa64*-*-*]} { 
-	    run_dump_test "elf${el}-rel2"
-	} else {
-	    run_dump_test "e32${el}-rel2"
-	}
+	run_dump_test_arches "elf${el}-rel2" [mips_arch_list_matching gpr64]
+	run_dump_test "e32${el}-rel2"
 	run_dump_test "elf${el}-rel3"
-	if {[istarget mips64*-*-*]} {
-	    run_dump_test "elf-rel4"
-	} else {
-	    run_dump_test "e32-rel4"
-	}
+	run_dump_test_arches "elf-rel4" [mips_arch_list_matching gpr64]
+	run_dump_test "e32-rel4"
 	run_dump_test "elf-rel5"
 	run_dump_test "elf-rel6"
 	if $has_newabi {
@@ -786,8 +781,6 @@ if { [istarget mips*-*-vxworks*] } {
 	}
     }
     if { !$no_mips16 } { 
-        # Check MIPS16e extensions
-        run_dump_test_arches "mips16e" 	[mips_arch_list_matching mips32]
         run_dump_test "mips16e-jrc"
         run_dump_test "mips16e-save"
         run_dump_test "mips16e-64"