diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index e67ce130044..6bbacf029d6 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-22  Pierre Muller  <muller@ics.u-strasbg.fr>
+
+	* gdb.threads/watchthreads.exp: Change to obtain consistent output.
+
 2010-04-22  Pierre Muller  <muller@ics.u-strasbg.fr>
 
 	PR stabs/11479.
diff --git a/gdb/testsuite/gdb.threads/watchthreads.exp b/gdb/testsuite/gdb.threads/watchthreads.exp
index 6e2ce5f2636..733c6f32b80 100644
--- a/gdb/testsuite/gdb.threads/watchthreads.exp
+++ b/gdb/testsuite/gdb.threads/watchthreads.exp
@@ -130,10 +130,10 @@ for {set i 0} {$i < 30} {incr i} {
 	# 10 is chosen so we're guaranteed to come through here.
 	if { $hwwp_2_enabled && $hwwp_3_enabled } {
 	    if { $args_0 >= 10 && $hwwp_2_enabled } {
-		gdb_test "disable 2" ""
+		gdb_test "disable 2" "" "disable first watchpoint at 10"
 		set hwwp_2_enabled 0
 	    } elseif { $args_1 >= 10 && $hwwp_3_enabled } {
-		gdb_test "disable 3" ""
+		gdb_test "disable 3" "" "disable first watchpoint at 10"
 		set hwwp_3_enabled 0
 	    }
 	}