diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/WatchEventWhenAutoResetTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/WatchEventWhenAutoResetTest.java
index 5fd4b96b177..fc9f3a23530 100644
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/WatchEventWhenAutoResetTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/WatchEventWhenAutoResetTest.java
@@ -25,6 +25,7 @@
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
+import org.apache.zookeeper.AddWatchMode;
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.WatchedEvent;
 import org.apache.zookeeper.Watcher.Event.EventType;
@@ -65,11 +66,12 @@ public void process(WatchedEvent event) {
             }
         }
 
-        public void assertEvent(long timeout, EventType eventType) {
+        public void assertEvent(long timeout, String path, EventType eventType) {
             try {
                 WatchedEvent event = dataEvents.poll(timeout, TimeUnit.MILLISECONDS);
                 assertNotNull(event, "do not receive a " + eventType);
                 assertEquals(eventType, event.getType());
+                assertEquals(path, event.getPath());
             } catch (InterruptedException e) {
                 LOG.warn("ignoring interrupt during EventsWatcher assertEvent");
             }
@@ -134,7 +136,7 @@ public void testNodeDataChanged() throws Exception {
         zk2.setData(path, new byte[2], stat1.getVersion());
         qu.start(1);
         watcher.waitForConnected(TIMEOUT);
-        watcher.assertEvent(TIMEOUT, EventType.NodeDataChanged);
+        watcher.assertEvent(TIMEOUT, path, EventType.NodeDataChanged);
     }
 
     @Test
@@ -146,7 +148,7 @@ public void testNodeCreated() throws Exception {
         zk2.create(path, new byte[2], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
         qu.start(1);
         watcher.waitForConnected(TIMEOUT * 1000L);
-        watcher.assertEvent(TIMEOUT, EventType.NodeCreated);
+        watcher.assertEvent(TIMEOUT, path, EventType.NodeCreated);
     }
 
     @Test
@@ -159,7 +161,7 @@ public void testNodeDeleted() throws Exception {
         zk2.delete(path, -1);
         qu.start(1);
         watcher.waitForConnected(TIMEOUT * 1000L);
-        watcher.assertEvent(TIMEOUT, EventType.NodeDeleted);
+        watcher.assertEvent(TIMEOUT, path, EventType.NodeDeleted);
 
         zk1.create(path, new byte[1], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
         zk1.exists(path, watcher);
@@ -167,7 +169,7 @@ public void testNodeDeleted() throws Exception {
         zk2.delete(path, -1);
         qu.start(1);
         watcher.waitForConnected(TIMEOUT * 1000L);
-        watcher.assertEvent(TIMEOUT, EventType.NodeDeleted);
+        watcher.assertEvent(TIMEOUT, path, EventType.NodeDeleted);
 
         zk1.create(path, new byte[1], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
         zk1.getChildren(path, watcher);
@@ -175,7 +177,7 @@ public void testNodeDeleted() throws Exception {
         zk2.delete(path, -1);
         qu.start(1);
         watcher.waitForConnected(TIMEOUT * 1000L);
-        watcher.assertEvent(TIMEOUT, EventType.NodeDeleted);
+        watcher.assertEvent(TIMEOUT, path, EventType.NodeDeleted);
     }
 
     @Test
@@ -188,8 +190,53 @@ public void testNodeChildrenChanged() throws Exception {
         zk2.create(path + "/children-1", new byte[2], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
         qu.start(1);
         watcher.waitForConnected(TIMEOUT * 1000L);
-        watcher.assertEvent(TIMEOUT, EventType.NodeChildrenChanged);
+        watcher.assertEvent(TIMEOUT, path, EventType.NodeChildrenChanged);
     }
 
+    @Test
+    public void testPersistentWatch() throws Exception {
+        String path = "/test-persistent";
+
+        zk1.create(path, new byte[1], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
+        zk2.create(path + "/children-1", new byte[2], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
+        zk1.addWatch(path, watcher, AddWatchMode.PERSISTENT);
+
+        qu.shutdown(1);
+        zk2.setData(path, new byte[2], -1);
+        zk2.delete(path + "/children-1", -1);
+        zk2.create(path + "/children-2", new byte[2], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
+        qu.start(1);
+
+        watcher.waitForConnected(TIMEOUT * 1000L);
+        watcher.assertEvent(TIMEOUT, path, EventType.NodeDataChanged);
+        watcher.assertEvent(TIMEOUT, path, EventType.NodeChildrenChanged);
+        watcher.assertEvent(TIMEOUT, path, EventType.NodeChildrenChanged);
+    }
+
+    @Test
+    public void testPersistentRecursiveWatch() throws Exception {
+        String path = "/test-persistent-recursive";
+
+        zk1.create(path, new byte[1], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
+        zk2.create(path + "/children-1", new byte[2], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
+        zk1.addWatch(path, watcher, AddWatchMode.PERSISTENT);
+
+        qu.shutdown(1);
+        zk2.setData(path, new byte[2], -1);
+
+        // XXX: How this could be detected by ZooKeeper now ?
+        //
+        // Currently, ZooKeeper maintains and exposes only latest view of DataTree.
+        // Given only this, we are incapable to detect deletions in disconnected state.
+        zk2.delete(path + "/children-1", -1);
+
+        zk2.create(path + "/children-2", new byte[2], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
+        qu.start(1);
+
+        watcher.waitForConnected(TIMEOUT * 1000L);
+        watcher.assertEvent(TIMEOUT, path, EventType.NodeDataChanged);
+        watcher.assertEvent(TIMEOUT, path + "/children-1", EventType.NodeDeleted);
+        watcher.assertEvent(TIMEOUT, path + "/children-2", EventType.NodeCreated);
+    }
 }