diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0ec9b20126ae..1f6640c2a31e 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-25  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* go.test/go-test.exp (go-set-goarch): Accept mips*-*-*.
+
 2011-04-24  Jakub Jelinek  <jakub@redhat.com>
 
 	PR preprocessor/48740
diff --git a/gcc/testsuite/go.test/go-test.exp b/gcc/testsuite/go.test/go-test.exp
index cb294fa40edc..f0285a25cffa 100644
--- a/gcc/testsuite/go.test/go-test.exp
+++ b/gcc/testsuite/go.test/go-test.exp
@@ -140,7 +140,7 @@ proc go-set-goarch { } {
 		set goarch "amd64"
 	    }
 	}
-	"mips-*-*" {
+	"mips*-*-*" {
 	    if [check_no_compiler_messages mipso32 assembly {
 		#if _MIPS_SIM != _ABIO32
 		#error FOO