diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CachedResultSetManagerTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CachedResultSetManagerTest.java
index 3d7faefe8906a41ab2c463910e0c475302657c8d..3ce862a1fad8606124a9f3363c6f92c433e5e109 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CachedResultSetManagerTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/CachedResultSetManagerTest.java
@@ -959,25 +959,16 @@ public final class CachedResultSetManagerTest extends AssertJUnit
                     allowing(keyGenerator).createKey();
                     will(returnValue(KEY));
 
-                    one(originalDataProvider).getOriginalData(maxSize);
                     DataHolder[] rows = new DataHolder[size];
                     for (int i = 0; i < rows.length; i++)
                     {
                         rows[i] = new DataHolder(i + "-a" + i % 2);
                     }
+                    one(originalDataProvider).getOriginalData(Integer.MAX_VALUE);
                     will(returnValue(Arrays.asList(rows)));
-
                     one(originalDataProvider).getHeaders();
                     will(returnValue(Arrays.asList()));
 
-                    // if (size >= maxSize)
-                    // {
-                    // one(originalDataProvider).getOriginalData(Integer.MAX_VALUE);
-                    // will(returnValue(Arrays.asList(rows)));
-                    // one(originalDataProvider).getHeaders();
-                    // will(returnValue(Arrays.asList()));
-                    // }
-
                     allowing(customColumnsProvider).getGridCustomColumn(SESSION_TOKEN,
                             GRID_DISPLAY_ID);
                     will(returnValue(Arrays.asList(columns)));