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 cb88918165cddddd49ac05ea897531e561871dd1..a6199a50a984f0ea6f506a58d8e8db20c621bc15 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
@@ -165,6 +165,9 @@ public final class CachedResultSetManagerTest
                     one(resultSetConfig).getResultSetKey();
                     will(returnValue(null));
 
+                    one(resultSetConfig).getAvailableColumns();
+                    will(returnValue(null));
+                    
                     one(originalDataProvider).getOriginalData();
                     will(returnValue(Collections.emptyList()));
 
@@ -188,6 +191,9 @@ public final class CachedResultSetManagerTest
                     one(resultSetConfig).getResultSetKey();
                     will(returnValue("1"));
 
+                    one(resultSetConfig).getAvailableColumns();
+                    will(returnValue(null));
+                    
                     allowResultSetCreation(this);
                 }
             });
@@ -209,6 +215,9 @@ public final class CachedResultSetManagerTest
                     one(resultSetConfig).getResultSetKey();
                     will(returnValue(null));
 
+                    one(resultSetConfig).getAvailableColumns();
+                    will(returnValue(null));
+                    
                     one(originalDataProvider).getOriginalData();
                     will(returnValue(Collections.singletonList(value)));