diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index ac6005e4a4..c0a2fc015b 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-20  Thiemo Seufer  <ths@networkno.de>
+
+	* gas/mips/mips.exp: Explicitly specify o32 ABI.
+	* gas/mips/mips64-dsp.d: Dump o32 register names.
+	* gas/mips/smartmips.d: Explicitly specify o32 ABI.
+
 2006-06-18  Nick Clifton  <nickc@redhat.com>
 
 	* gas/arm/group-reloc-alu-encoding-bad.d: Skip for non-ELF
diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index 538ef4d09f..5156754bc9 100644
--- a/gas/testsuite/gas/mips/mips.exp
+++ b/gas/testsuite/gas/mips/mips.exp
@@ -791,7 +791,7 @@ if { [istarget mips*-*-vxworks*] } {
         run_dump_test "mips16e-jrc"
         run_dump_test "mips16e-save"
         run_dump_test "mips16e-64"
-        run_list_test "mips16e-64" "-march=mips32"
+        run_list_test "mips16e-64" "-march=mips32 -32"
     }
     run_dump_test "vxworks1"
     run_dump_test "vxworks1-xgot"
diff --git a/gas/testsuite/gas/mips/mips64-dsp.d b/gas/testsuite/gas/mips/mips64-dsp.d
index 4125763702..11009a012c 100644
--- a/gas/testsuite/gas/mips/mips64-dsp.d
+++ b/gas/testsuite/gas/mips/mips64-dsp.d
@@ -1,4 +1,4 @@
-#objdump: -dr --prefix-addresses --show-raw-insn
+#objdump: -dr --prefix-addresses --show-raw-insn -M reg-names=32
 #name: MIPS DSP ASE for MIPS64
 #as: -mdsp
 
diff --git a/gas/testsuite/gas/mips/smartmips.d b/gas/testsuite/gas/mips/smartmips.d
index dfeb0842be..8bff68285d 100644
--- a/gas/testsuite/gas/mips/smartmips.d
+++ b/gas/testsuite/gas/mips/smartmips.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn -M reg-names=numeric
 #name: SmartMIPS
-#as: -msmartmips
+#as: -msmartmips -32
 
 
 .*: +file format .*mips.*