diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index d705527ca24..e81a297291f 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-03  Richard Sandiford  <rsandifo@redhat.com>
+
+	* gas/mips/mips.exp: Move tls tests to main $elf block.
+
 2005-03-03  Nick Clifton  <nickc@redhat.com>
 
 	* gas/arm/arch6zk.s: Add three nop instructions in order to pad
diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index b1772a3083f..2ea33600ed3 100644
--- a/gas/testsuite/gas/mips/mips.exp
+++ b/gas/testsuite/gas/mips/mips.exp
@@ -336,11 +336,6 @@ proc run_list_test_arches { name opts arch_list } {
     foreach arch $arch_list {
 	run_list_test_arch "$name" "$opts" "$arch"
     }
-
-    if $elf {
-	run_list_test "tls-ill" "-32"
-	run_dump_test "tls-o32"
-    }
 }
 
 
@@ -690,6 +685,9 @@ if { [istarget mips*-*-*] } then {
 	}
 	run_dump_test "elf-consthilo"
 	run_dump_test "expr1"
+
+	run_list_test "tls-ill" "-32"
+	run_dump_test "tls-o32"
     }
 
     if $has_newabi {