diff --git a/gdb/record.c b/gdb/record.c
index f7c82665b05..88235e36da7 100644
--- a/gdb/record.c
+++ b/gdb/record.c
@@ -248,7 +248,6 @@ record_check_stopped_by_breakpoint (const address_space *aspace,
       return 1;
     }
 
-  *reason = TARGET_STOPPED_BY_NO_REASON;
   return 0;
 }
 
diff --git a/gdb/testsuite/gdb.reverse/watch-reverse.exp b/gdb/testsuite/gdb.reverse/watch-reverse.exp
index 6b81a6fdf88..a7126ac9b1d 100644
--- a/gdb/testsuite/gdb.reverse/watch-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/watch-reverse.exp
@@ -118,8 +118,12 @@ gdb_test "continue" \
     ".*\[Ww\]atchpoint.*ival3.*Old value = 0.*New value = -1.*ival3 = count; ival4 = count;.*" \
     "watchpoint hit in reverse, fifth time"
 
+gdb_test_no_output "disable \$bpnum" "disable non-hw watchpoint"
+
 gdb_test_no_output "set can-use-hw-watchpoints 1" "enable hw watchpoints"
 
+gdb_test_no_output "enable \$bpnum" "enable hw watchpoint"
+
 ###
 ###
 ###