diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/component/DssComponentTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/component/DssComponentTest.java
index 52d6e8079ff9a46b87cc44e8d8e00a65cfb84523..a913a9d5042eb2d85a57549f8998e762cdc3b98f 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/component/DssComponentTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/component/DssComponentTest.java
@@ -80,7 +80,7 @@ public class DssComponentTest extends AssertJUnit
         final SessionContextDTO session = getDummySession();
         final ExternalData dataSetExternalData = new ExternalData();
         DataStore dataStore = new DataStore();
-        dataStore.setDownloadUrl("http://localhost/path/to/dataset/");
+        dataStore.setDownloadUrl("http://localhost/path/to/dataset");
         dataSetExternalData.setDataStore(dataStore);
         final IDssServiceRpcV1 dssService = context.mock(IDssServiceRpcV1.class);
 
@@ -93,7 +93,7 @@ public class DssComponentTest extends AssertJUnit
                     will(returnValue(session));
                     one(openBisService).tryGetDataSet(DUMMY_SESSSION_TOKEN, dataSetCode);
                     will(returnValue(dataSetExternalData));
-                    one(dssServiceFactory).getServiceV1("http://localhost/path/to/dataset/", false);
+                    one(dssServiceFactory).getServiceV1("http://localhost/path/to/dataset/rpc/v1", false);
                     will(returnValue(dssService));
                     one(dssService).tryDataSet(DUMMY_SESSSION_TOKEN, dataSetCode);
                     will(returnValue(null));