diff --git a/src/test/java/net/ravendb/client/test/issues/RavenDB_14006Test.java b/src/test/java/net/ravendb/client/test/issues/RavenDB_14006Test.java
index 02e429d4..6c07b091 100644
--- a/src/test/java/net/ravendb/client/test/issues/RavenDB_14006Test.java
+++ b/src/test/java/net/ravendb/client/test/issues/RavenDB_14006Test.java
@@ -441,11 +441,14 @@ public void canUseCompareExchangeValueIncludesInQueries_Dynamic() throws Excepti
                     value.getValue().setCity("Bydgoszcz");
 
                     innerSession.saveChanges();
+                    waitForIndexing(store);
+                    Thread.sleep(300);
                 }
 
                 companies = session.query(Company.class)
                         .statistics(queryStats)
                         .include(b -> b.includeCompareExchangeValue("externalId"))
+                        .waitForNonStaleResults()
                         .toList();
 
                 assertThat(companies)
@@ -539,6 +542,7 @@ public void canUseCompareExchangeValueIncludesInQueries_Dynamic_JavaScript() thr
                     value.getValue().setCity("Bydgoszcz");
 
                     innerSession.saveChanges();
+                    waitForIndexing(store);
                     Thread.sleep(300);
                 }
 
@@ -640,11 +644,13 @@ public void canUseCompareExchangeValueIncludesInQueries_Static() throws Exceptio
                     innerSession.saveChanges();
 
                     waitForIndexing(store);
+                    Thread.sleep(300);
                 }
 
                 companies = session.query(Company.class, Companies_ByName.class)
                         .statistics(statsRef)
                         .include(b -> b.includeCompareExchangeValue("externalId"))
+                        .waitForNonStaleResults()
                         .toList();
 
                 assertThat(companies)