diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/AbstractNodeTransversalTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/AbstractNodeTransversalTest.java
new file mode 100644
index 0000000000..221747193a
--- /dev/null
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/AbstractNodeTransversalTest.java
@@ -0,0 +1,72 @@
+/**
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.ast;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Unit test for {@link AbstractNode} tree transversal methods
+ */
+public class AbstractNodeTransversalTest {
+    private int id;
+    private Node rootNode;
+
+    private int nextId() {
+        return id++;
+    }
+
+    private Node newDummyNode(boolean boundary) {
+        return new DummyNode(nextId(), boundary);
+    }
+
+    private Node addChild(final Node parent, final Node child) {
+        parent.jjtAddChild(child, parent.jjtGetNumChildren()); // Append child at the end
+        child.jjtSetParent(parent);
+        return parent;
+    }
+
+    @Before
+    public void setUpSampleNodeTree() {
+        id = 0;
+        rootNode = newDummyNode(false);
+    }
+
+    @Test
+    public void testBoundaryIsHonored() {
+        addChild(rootNode, addChild(newDummyNode(true), newDummyNode(false)));
+        
+        List<DummyNode> descendantsOfType = rootNode.findDescendantsOfType(DummyNode.class);
+        assertEquals(1, descendantsOfType.size());
+        assertTrue(descendantsOfType.get(0).isFindBoundary());
+    }
+    
+    @Test
+    public void testSearchFromBoundary() {
+        addChild(rootNode, addChild(newDummyNode(true), newDummyNode(false)));
+        
+        List<DummyNode> descendantsOfType = rootNode.findDescendantsOfType(DummyNode.class).get(0).findDescendantsOfType(DummyNode.class);
+        assertEquals(1, descendantsOfType.size());
+        assertFalse(descendantsOfType.get(0).isFindBoundary());
+    }
+    
+    @Test
+    public void testSearchIgnoringBoundary() {
+        addChild(rootNode, addChild(newDummyNode(true), newDummyNode(false)));
+        
+        List<DummyNode> descendantsOfType = new ArrayList<>();
+        rootNode.findDescendantsOfType(DummyNode.class, descendantsOfType, true);
+        assertEquals(2, descendantsOfType.size());
+        assertTrue(descendantsOfType.get(0).isFindBoundary());
+        assertFalse(descendantsOfType.get(1).isFindBoundary());
+    }
+}
diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/DummyNode.java b/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/DummyNode.java
index c17f306145..0f4bdf11fc 100644
--- a/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/DummyNode.java
+++ b/pmd-core/src/test/java/net/sourceforge/pmd/lang/ast/DummyNode.java
@@ -5,8 +5,15 @@
 package net.sourceforge.pmd.lang.ast;
 
 public class DummyNode extends AbstractNode {
+    private final boolean findBoundary;
+    
     public DummyNode(int id) {
+        this(id, false);
+    }
+    
+    public DummyNode(int id, boolean findBoundary) {
         super(id);
+        this.findBoundary = findBoundary;
     }
 
     @Override
@@ -18,4 +25,9 @@ public class DummyNode extends AbstractNode {
     public String getXPathNodeName() {
         return "dummyNode";
     }
+    
+    @Override
+    public boolean isFindBoundary() {
+        return findBoundary;
+    }
 }