diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index bc3ab33ce0..6f9c051d67 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-08  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
+
+	* gdb.xml/tdesc-arch.exp: Test is unsupported on target with
+	just a single architecture.
+
 2007-03-08  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
 
 	* gdb.base/callfuncs.exp (do_get_all_registers): Remove.
diff --git a/gdb/testsuite/gdb.xml/tdesc-arch.exp b/gdb/testsuite/gdb.xml/tdesc-arch.exp
index ac031309fd..fdec9c46ba 100644
--- a/gdb/testsuite/gdb.xml/tdesc-arch.exp
+++ b/gdb/testsuite/gdb.xml/tdesc-arch.exp
@@ -32,6 +32,11 @@ gdb_test_multiple "set architecture" $msg {
 	set arch2 $expect_out(2,string)
 	pass $msg
     }
+    -re "Requires an argument. Valid arguments are (\[^ \]*), auto\\.\r\n$gdb_prompt $" {
+	# If there is just one supported architecture, we can't do this test.
+	unsupported "tdesc-arch.exp"
+	return -1
+    }
 }
 
 set default_arch ""