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 5e201957015a7bef79db411abb7c5801dc571237..9e92357ca4f92a7971075fff78ef18864ec96baa 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
@@ -71,6 +71,8 @@ public class OpenbisServiceFacadeTest extends SystemTestCase
 
     private IOpenbisServiceFacade serviceFacade;
 
+    private String dataSetCode;
+    
     @BeforeMethod
     public void beforeMethod()
     {
@@ -83,6 +85,7 @@ public class OpenbisServiceFacadeTest extends SystemTestCase
         File exampleDataSet = new File(workingDirectory, "my-data");
         NewDataSetDTO newDataset = createNewDataSetDTO(exampleDataSet);
         DataSet dataSet = serviceFacade.putDataSet(newDataset, exampleDataSet);
+        dataSetCode = dataSet.getCode();
         checkDataSet(dataSet);
     }
 
@@ -298,6 +301,13 @@ public class OpenbisServiceFacadeTest extends SystemTestCase
     {
         IEncapsulatedOpenBISService openBISService = ServiceProvider.getOpenBISService();
         List<SimpleDataSetInformationDTO> dataSets = openBISService.listDataSets();
+        for (SimpleDataSetInformationDTO dataSet : dataSets)
+        {
+            if (dataSet.getDataSetCode().equals(dataSetCode))
+            {
+                return dataSet;
+            }
+        }
         Collections.sort(dataSets, new Comparator<SimpleDataSetInformationDTO>()
             {
                 @Override