diff --git a/tests/unit/cas.tcl b/tests/unit/cas.tcl
index d420d9e29fbe8a9cf73f092fe43c4f0bb456bfae..082fba3535815102f0a0bb6ac0022b48219b91f0 100644
--- a/tests/unit/cas.tcl
+++ b/tests/unit/cas.tcl
@@ -125,11 +125,32 @@ start_server {tags {"cas"}} {
     test {WATCH will not consider touched expired keys} {
         r del x
         r set x foo
-        r expire x 2
+        r expire x 1
         r watch x
-        after 3000
+        after 1100
         r multi
         r ping
         r exec
     } {PONG}
+
+    test {DISCARD should clear the WATCH dirty flag on the client} {
+        r watch x
+        r set x 10
+        r multi
+        r discard
+        r multi
+        r incr x
+        r exec
+    } {11}
+
+    test {DISCARD should UNWATCH all the keys} {
+        r watch x
+        r set x 10
+        r multi
+        r discard
+        r set x 10
+        r multi
+        r incr x
+        r exec
+    } {11}
 }