diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index da8d2fe215..359452d0a5 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2011-06-06  Pedro Alves  <pedro@codesourcery.com>
+
+	* gdb.threads/pending-step.exp: Add more context to SIGTRAP match.
+
 2011-06-03  Joel Brobecker  <brobecker@adacore.com>  (obvious fix)
 
 	From Stephen Kitt  <steve@sk2.org>
diff --git a/gdb/testsuite/gdb.threads/pending-step.exp b/gdb/testsuite/gdb.threads/pending-step.exp
index ecce946af0..342e10509f 100644
--- a/gdb/testsuite/gdb.threads/pending-step.exp
+++ b/gdb/testsuite/gdb.threads/pending-step.exp
@@ -77,7 +77,7 @@ set ok 0
 for {set i 0} {$i < $iterations} {incr i} {
     set ok 0
     gdb_test_multiple "next" "$test" {
-	-re "SIGTRAP.*$gdb_prompt $" {
+	-re "Program received signal SIGTRAP.*$gdb_prompt $" {
 	    fail "$test (spurious SIGTRAP)"
 	}
 	-re "$gdb_prompt $" {