diff --git a/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryPaginationTest.java b/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryPaginationTest.java
index 1e20a7b5b678f..a4102d4fd98c1 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryPaginationTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/cache/query/IndexQueryPaginationTest.java
@@ -46,9 +46,6 @@ public class IndexQueryPaginationTest extends GridCommonAbstractTest {
     /** */
     private static final int NODES = 2;
 
-    /** */
-    private Ignite grid;
-
     /** */
     private IgniteCache<Integer, Person> cache;
 
@@ -64,11 +61,13 @@ public static Object[] params() {
 
     /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
-        grid = startGrids(NODES);
+        Ignite srv = startGrids(NODES);
+
+        cache = srv.cache("cache");
 
-        cache = grid.cache("cache");
+        awaitPartitionMapExchange();
 
-        insertData(grid, cache, entries);
+        insertData(srv, cache, entries);
     }
 
     /** {@inheritDoc} */
@@ -119,7 +118,7 @@ public void nextPageTest() {
         QueryCursor<Cache.Entry<Integer, Person>> cursor = cache.query(
             new IndexQuery<Integer, Person>(Person.class).setPageSize(PAGE_SIZE));
 
-        assert entries == cursor.getAll().size();
+        assertEquals(entries, cursor.getAll().size());
 
         List<Object> msgs = new ArrayList<>();
 
@@ -131,18 +130,19 @@ public void nextPageTest() {
 
         int reqsSize = reqs.size();
 
-        assert reqsSize == reqsExpected && reqsSize == resp.size();
+        assertEquals(reqsExpected, reqsSize);
+        assertEquals(reqsSize, resp.size());
 
         for (int i = 0; i < reqsSize; i++) {
             int reqPage = reqs.get(i).pageSize();
             int respData = resp.get(i).data().size();
 
-            assert reqPage == PAGE_SIZE;
+            assertEquals(PAGE_SIZE, reqPage);
 
             if (i == reqsSize - 1 && remNodeLastPageEntries != 0)
-                assert respData == remNodeLastPageEntries;
+                assertEquals(remNodeLastPageEntries, respData);
             else
-                assert respData == reqPage;
+                assertEquals(respData, reqPage);
         }
     }
 
diff --git a/modules/indexing/src/test/java/org/apache/ignite/cache/query/MultifieldIndexQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/cache/query/MultifieldIndexQueryTest.java
index 5f08e589ec22f..5e3c46f643bc8 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/cache/query/MultifieldIndexQueryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/cache/query/MultifieldIndexQueryTest.java
@@ -103,6 +103,8 @@ public static Collection<Object[]> testParams() {
         ignite = startGrids(nodesCnt);
 
         cache = ignite.cache(CACHE);
+
+        awaitPartitionMapExchange();
     }
 
     /** {@inheritDoc} */