diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAggregationTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAggregationTest.java
index 1f13614..2d82451 100644
--- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAggregationTest.java
+++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAggregationTest.java
@@ -17,26 +17,30 @@
 package org.apache.jackrabbit.oak.plugins.index.lucene;
 
 import static com.google.common.collect.Lists.newArrayList;
+import static java.lang.Math.abs;
 import static org.apache.jackrabbit.JcrConstants.JCR_CONTENT;
+import static org.apache.jackrabbit.JcrConstants.JCR_DATA;
 import static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE;
 import static org.apache.jackrabbit.JcrConstants.NT_FILE;
 import static org.apache.jackrabbit.JcrConstants.NT_FOLDER;
-import static org.apache.jackrabbit.JcrConstants.JCR_DATA;
+import static org.apache.jackrabbit.JcrConstants.NT_UNSTRUCTURED;
+import static org.apache.jackrabbit.oak.api.Type.NAME;
+import static org.apache.jackrabbit.oak.api.Type.STRING;
+import static org.apache.jackrabbit.oak.plugins.memory.BinaryPropertyState.binaryProperty;
 
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Random;
 
 import org.apache.jackrabbit.JcrConstants;
 import org.apache.jackrabbit.oak.Oak;
+import org.apache.jackrabbit.oak.api.CommitFailedException;
 import org.apache.jackrabbit.oak.api.ContentRepository;
 import org.apache.jackrabbit.oak.api.Tree;
 import org.apache.jackrabbit.oak.api.Type;
 import org.apache.jackrabbit.oak.plugins.index.aggregate.AggregateIndexProvider;
 import org.apache.jackrabbit.oak.plugins.index.aggregate.NodeAggregator;
 import org.apache.jackrabbit.oak.plugins.index.aggregate.SimpleNodeAggregator;
-
-import static org.apache.jackrabbit.oak.plugins.memory.BinaryPropertyState.binaryProperty;
-
 import org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent;
 import org.apache.jackrabbit.oak.query.AbstractQueryTest;
 import org.apache.jackrabbit.oak.spi.commit.Observer;
@@ -396,4 +400,29 @@ public class LuceneIndexAggregationTest extends AbstractQueryTest {
 
     }
 
+    @Test
+    public void oak2114() throws CommitFailedException {
+        setTraversalEnabled(false);
+        final String keyword = String.format("%s%s", System.currentTimeMillis(),
+            abs(new Random().nextInt()));
+        final String statement = "//* " +
+            "[ " +
+            "(jcr:contains(., '" + keyword + "' ) " +
+            "or jcr:contains(metadata, '" + keyword + "' )) " +
+            "]";
+        
+        Tree t = root.getTree("/").addChild("content");
+        t.setProperty(JCR_PRIMARYTYPE, NT_FOLDER, NAME);
+        t = t.addChild("node");
+        t.setProperty(JCR_PRIMARYTYPE, NT_FOLDER, NAME);
+        t = t.addChild(JCR_CONTENT);
+        t.setProperty(JCR_PRIMARYTYPE, NT_UNSTRUCTURED, NAME);
+        t.setProperty("name", keyword, STRING);
+        t.setProperty("jcr:title", keyword, STRING);
+        root.commit();
+
+        assertQuery(statement, "xpath", ImmutableList.of("/content/node/jcr:content"));
+        // returns [/content/node, /content/node/jcr:content]
+        setTraversalEnabled(true);
+    }
 }