diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index f5b9dcbda4c..feb38c7f6ea 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-11  Keith Seitz  <keiths@redhat.com>
+
+	* watchpoint.exp (test_no_hw_watchpoints): Add test using
+	both condition and thread.  Then delete the watchpoint.
+
 2013-03-11  Christian Himpel  <christian.himpel@intel.com>
 
 	* Makefile.in: Add btrace testsuite.
diff --git a/gdb/testsuite/gdb.base/watchpoint.exp b/gdb/testsuite/gdb.base/watchpoint.exp
index 5086ae52326..3befbba163e 100644
--- a/gdb/testsuite/gdb.base/watchpoint.exp
+++ b/gdb/testsuite/gdb.base/watchpoint.exp
@@ -814,6 +814,12 @@ proc test_no_hw_watchpoints {} {
 
     gdb_test_no_output "delete \$bpnum" "delete watch ival3"
 
+    gdb_test "watch ival3 if  count > 1  thread 1 " \
+         "Watchpoint \[0-9\]*: ival3.*" \
+         "set slow condition watch w/thread"
+
+    gdb_test_no_output "delete \$bpnum" "delete watch w/condition and thread"
+
     # We've explicitly disabled hardware watches.  Verify that GDB
     # refrains from using them.
     #