diff --git a/docs/_docs/data-streaming.adoc b/docs/_docs/data-streaming.adoc
index c39afe3632a41..ea6664ae86b88 100644
--- a/docs/_docs/data-streaming.adoc
+++ b/docs/_docs/data-streaming.adoc
@@ -68,7 +68,7 @@ DataStreamer doesn't guarantee:
 If <<overwriting, 'allowOverwrite'>> property is 'false' (default), consider:
 []
 - You should not have the same keys repeating in the data being streamed;
-- Streamer cancelation or streamer node failure can cause data inconsistency;
+- Streamer cancelation or topology change can cause data inconsistency;
 - If loading into a persistent cache, concurrently created snapshot may contain inconsistent data and might not be restored entirely.
 
 Most important behavior of Ignite Data Streamer is defined by <<receivers, stream receiver>> and
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
index a86b6240ed06a..f8248e40f7060 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
@@ -134,7 +134,7 @@ public class DataStreamerImpl<K, V> implements IgniteDataStreamer<K, V>, Delayed
     /** */
     public static final String WRN_INCONSISTENT_UPDATES = "The Data Streamer loads data with 'allowOverwrite' set " +
         "to false. It doesn't guarantee data consistency until successfully finishes. Streamer cancelation or " +
-        "streamer node failure can cause data inconsistency. Concurrently created snapshot may contain inconsistent " +
+        "topology change can cause data inconsistency. Concurrently created snapshot may contain inconsistent " +
         "data and might not be restored entirely.";
 
     /** Per thread buffer size. */
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlPartitionEvictionTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlPartitionEvictionTest.java
index 9b7a94cbc4698..a399a79fd6d0b 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlPartitionEvictionTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlPartitionEvictionTest.java
@@ -100,7 +100,7 @@ public static Iterable<Object[]> params() {
     /**
      * For awaiting of eviction start.
      */
-    private static final CountDownLatch LATCH = new CountDownLatch(1);
+    private static CountDownLatch LATCH;
 
     /** {@inheritDoc} */
     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
@@ -138,8 +138,14 @@ public void testSqlConsistencyOnEviction() throws Exception {
         while (idx <= backupsCount)
             ig = ignitionStart(idx++);
 
+        awaitPartitionMapExchange();
+
         loadData(ig, 0, NUM_ENTITIES);
 
+        assertEquals(NUM_ENTITIES, ig.cache(POI_CACHE_NAME).size());
+
+        LATCH = new CountDownLatch(1);
+
         ignitionStart(idx);
 
         awaitPartitionMapExchange();