diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/api/v1/ScreeningClientApiTest.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/api/v1/ScreeningClientApiTest.java
index 6ff5e5464d7c39542ade8d5dfcf11a421237f574..6eceb4cb9395fc1d3abc23f9407f94a0b628e7e7 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/api/v1/ScreeningClientApiTest.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/api/v1/ScreeningClientApiTest.java
@@ -70,12 +70,13 @@ public class ScreeningClientApiTest
         System.out.println("Feature vector datasets: " + featureVectorDatasets);
 
         // test for feature vector dataset
-        String featureVectorDatasetCode = "20100424125121572-43"; // feature vector
+        String featureVectorDatasetCode = featureVectorDatasets.get(0).getDatasetCode(); // feature
+                                                                                         // vector
         IDatasetIdentifier datasetIdentifier =
                 getDatasetIdentifier(facade, featureVectorDatasetCode);
         loadImages(facade, datasetIdentifier);
 
-        String imageDatasetCode = "DEMO-PLATE002"; // image
+        String imageDatasetCode = imageDatasets.get(0).getDatasetCode(); // image
         datasetIdentifier = getDatasetIdentifier(facade, imageDatasetCode);
         loadImages(facade, datasetIdentifier);