diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 189425dfd98..9300ec35b4f 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-12  Mark Kettenis  <kettenis@gnu.org>
+
+	* gdb.gdb/selftest.exp (do_steps_and_nexts): Match spaces as well
+	as tabs.  Remove redundant test pattern.
+
 2007-03-09  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
 
 	* gdb.base/long_long.exp: Accept optional symbol name in <...>
diff --git a/gdb/testsuite/gdb.gdb/selftest.exp b/gdb/testsuite/gdb.gdb/selftest.exp
index 32d56ad5610..10805dbd60c 100644
--- a/gdb/testsuite/gdb.gdb/selftest.exp
+++ b/gdb/testsuite/gdb.gdb/selftest.exp
@@ -159,7 +159,7 @@ proc do_steps_and_nexts {} {
 		set description "next over textdomain PACKAGE"
 		set command "next"
 	    }
-	    -re "\[0-9\]*\t\{\r\n$gdb_prompt $" {
+	    -re "\[0-9\]+\[\t \]+\{\r\n$gdb_prompt $" {
 		set description "step over initial brace"
 		set command "step"
 	    }
@@ -197,10 +197,6 @@ proc do_steps_and_nexts {} {
 		set description "step over gdb_stderr initialization"
 		set command "step"
 	    }
-	    -re "\[ \t\]+\{\r\n$gdb_prompt $" {
-		setup_xfail "mips-*-irix5*"
-		fail "$description ended up at odd location"
-	    }
 	    -re ".*main.c.*No such file or directory.*$gdb_prompt $" {
 		setup_xfail "rs6000-*-aix3*"
 		fail "must be able to list source lines"