diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/OpenbisServiceFacadeTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/OpenbisServiceFacadeTest.java
index 93be6359bcbddda8da755cd3d08217ce43087c59..620269766740945d809650ee2f1c49c45b7ba95e 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/OpenbisServiceFacadeTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/OpenbisServiceFacadeTest.java
@@ -225,7 +225,8 @@ public class OpenbisServiceFacadeTest extends SystemTestCase
         sc.addMatchClause(MatchClause.createAttributeMatch(MatchClauseAttribute.TYPE, "LINK_TYPE"));
 
         List<DataSet> dataSets = serviceFacade.searchForDataSets(sc);
-        assertEquals(3, dataSets.size());
+        assertTrue("Should have found at least three data sets. Found " + dataSets.size(),
+                3 <= dataSets.size());
         assertEquals("CODE1", dataSets.get(0).getExternalDataSetCode());
         assertEquals("CODE2", dataSets.get(1).getExternalDataSetCode());
         assertEquals("CODE3", dataSets.get(2).getExternalDataSetCode());