diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java b/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java
index 6a78a29911..c366aea9ac 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java
@@ -159,10 +159,9 @@ private boolean interceptIteratedQuery() {
     }
 
     private void validateIteratedQuery() {
-        System.out.println("Validate");
-    /*    if (metadata.getPageSize() != 0){
+        if (metadata.getPageSize() > 0){
             throw new CayenneRuntimeException("Pagination is not supported with iterator");
-        }*/
+        }
         if (metadata.getPrefetchTree() != null) {
             for (PrefetchTreeNode prefetchTreeNode : metadata.getPrefetchTree().getChildren()) {
                 if (prefetchTreeNode.isDisjointPrefetch()) {
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 0cd1399a78..be378ca4f3 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
@@ -26,16 +26,13 @@
 import org.apache.cayenne.di.Inject;
 import org.apache.cayenne.test.jdbc.DBHelper;
 import org.apache.cayenne.test.jdbc.TableHelper;
-import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.testdo.testmap.Painting;
 import org.apache.cayenne.unit.di.server.CayenneProjects;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
 import org.junit.Before;
 import org.junit.Ignore;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 
 import java.sql.SQLException;
 import java.sql.Types;