diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/ObjectSelectIteratedQueryIT.java b/cayenne-server/src/test/java/org/apache/cayenne/query/ObjectSelectIteratedQueryIT.java
index be378ca4f3..4f9e5e1cf1 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/ObjectSelectIteratedQueryIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/ObjectSelectIteratedQueryIT.java
@@ -97,7 +97,7 @@ public void prefetchWithBatchIterator() {
                     assertEquals("Test1", painting.getToArtist().readPropertyDirectly("artistName"));
                 }
             }
-            assertEquals(2,count);
+            assertEquals(2, count);
         }
     }
 
@@ -111,11 +111,11 @@ public void queryPrefetchJointWithIterator() {
             while (iterator.hasNextRow()) {
                 count++;
                 Painting painting = iterator.nextRow();
-                    //noinspection ConstantConditions
-                    assertTrue(painting instanceof Painting);
-                    assertEquals("Test1", painting.getToArtist().readPropertyDirectly("artistName"));
+                //noinspection ConstantConditions
+                assertTrue(painting instanceof Painting);
+                assertEquals("Test1", painting.getToArtist().readPropertyDirectly("artistName"));
             }
-            assertEquals(20,count);
+            assertEquals(20, count);
         }
     }
 
@@ -165,14 +165,14 @@ public void queryPrefetchDisjointByIdWithBIterator() {
                 assertTrue(painting instanceof Painting);
                 assertEquals("Test1", painting.getToArtist().readPropertyDirectly("artistName"));
             }
-            assertEquals(20,count);
+            assertEquals(20, count);
         }
     }
 
     @Test
     public void queryPrefetchJointWithBatchIterator() {
         try (ResultBatchIterator<Painting> iterator = ObjectSelect
-                .query(Painting.class,"Painting")
+                .query(Painting.class, "Painting")
                 .prefetch(Painting.TO_ARTIST.joint())
                 .batchIterator(context, 5)) {
             int count = 0;
@@ -226,7 +226,7 @@ public void mappingWithBatchIterator() {
                 }
             }
             assertEquals(5, iterator.getBatchSize());
-            assertEquals(4,count);
+            assertEquals(4, count);
         }
     }
 
@@ -308,6 +308,7 @@ public void dbQueryWithIterator() {
     public void dbQueryWithBatchIterator() {
         try (ResultBatchIterator<?> iterator = ObjectSelect
                 .dbQuery("PAINTING")
+                .orderBy("db:" + Painting.PAINTING_ID_PK_COLUMN)
                 .batchIterator(context, 5)) {
             int count = 0;
             int paintingCounter = 0;
@@ -342,7 +343,7 @@ static class DTO {
         private final Long estimatedPrice;
 
         public DTO(Object[] data) {
-            this.title = "dto_" + (String) data[0];
+            this.title = "dto_" + data[0];
             this.estimatedPrice = ((Number) data[1]).longValue();
         }