diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 5724ab007e..ab204d928b 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-24  Maciej W. Rozycki  <macro@linux-mips.org>
+
+	* gas/mips/mips.exp: Simplify enabling of MIPS16 testing.
+
 2010-10-24  Maciej W. Rozycki  <macro@linux-mips.org>
 
 	* gas/mips/at-1.d: Handle ECOFF relocations.
diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index d4f447b716..3fb500389f 100644
--- a/gas/testsuite/gas/mips/mips.exp
+++ b/gas/testsuite/gas/mips/mips.exp
@@ -419,12 +419,12 @@ if { [istarget mips*-*-vxworks*] } {
     run_dump_test "vxworks1-el"
     run_dump_test "vxworks1-xgot-el"
 } elseif { [istarget mips*-*-*] } {
-    set no_mips16 0
     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 addr32 [expr [istarget mipstx39*-*-*] || [istarget mips-*-linux*] || [istarget mipsel-*-linux*] || [istarget mips*-*-ecoff]]
     set has_newabi [expr [istarget *-*-irix6*] || [istarget mips64*-*-linux*]]
+    set no_mips16 [expr !$elf]
 
     if { [istarget "mips*-*-*linux*"] || [istarget "mips*-sde-elf*"] } then {
 	set tmips "t"
@@ -436,9 +436,6 @@ if { [istarget mips*-*-vxworks*] } {
     } {
 	set el ""
     }
-    if { $ecoff } {
-	set no_mips16 1
-    }
     if { $no_mips16 } {
 	mips_arch_destroy mips16
     }