diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/DataSetListerTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/DataSetListerTest.java
index aa7e866f37b2c2b7f20eefd8c9fe655980e40f01..78e09c62f31fc47d879e4f7a75fdde9a312a1e92 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/DataSetListerTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/fetchoptions/datasetlister/DataSetListerTest.java
@@ -189,7 +189,7 @@ public class DataSetListerTest extends AbstractDAOTest
         dms1.setCode("DMS_1");
         dms1.setLabel("Test EDMS");
         dms1.setOpenBIS(false);
-        dms1.setUrlTemplate("http://example.edms.pl/code=$code$");
+        dms1.setUrlTemplate("http://example.edms.pl/code=${code}");
         dms1.setDatabaseInstance(db);
 
         ExternalDataManagementSystem dms2 = new ExternalDataManagementSystem();
@@ -197,7 +197,7 @@ public class DataSetListerTest extends AbstractDAOTest
         dms2.setCode("DMS_2");
         dms2.setLabel("Test External openBIS instance");
         dms2.setOpenBIS(true);
-        dms2.setUrlTemplate("http://www.openbis.ch/perm_id=$code$");
+        dms2.setUrlTemplate("http://www.openbis.ch/perm_id=${code}");
         dms2.setDatabaseInstance(db);
 
         assertEqualsToExternalDMS(dms1, results.get(0).getExternalDataManagementSystem());
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ExternalDataManagementSystemDAOTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ExternalDataManagementSystemDAOTest.java
index 16c34507a80a1d444e3f2590a258a77fe072c04b..8ccfe14c77ffdf7540ecfb8ce9fa3de766a98aa8 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ExternalDataManagementSystemDAOTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ExternalDataManagementSystemDAOTest.java
@@ -74,7 +74,7 @@ public class ExternalDataManagementSystemDAOTest extends AbstractDAOTest
                 assertEquals(1L, edms.getDatabaseInstance().getId().longValue());
                 assertEquals("DMS_1", edms.getCode());
                 assertEquals("Test EDMS", edms.getLabel());
-                assertEquals("http://example.edms.pl/code=$code$", edms.getUrlTemplate());
+                assertEquals("http://example.edms.pl/code=${code}", edms.getUrlTemplate());
                 assertFalse(edms.isOpenBIS());
             } else
             {
@@ -82,7 +82,7 @@ public class ExternalDataManagementSystemDAOTest extends AbstractDAOTest
                 assertEquals(1L, edms.getDatabaseInstance().getId().longValue());
                 assertEquals("DMS_2", edms.getCode());
                 assertEquals("Test External openBIS instance", edms.getLabel());
-                assertEquals("http://www.openbis.ch/perm_id=$code$", edms.getUrlTemplate());
+                assertEquals("http://www.openbis.ch/perm_id=${code}", edms.getUrlTemplate());
                 assertTrue(edms.isOpenBIS());
             }
         }
diff --git a/openbis/sourceTest/sql/postgresql/115/031=external_data_management_systems.tsv b/openbis/sourceTest/sql/postgresql/115/031=external_data_management_systems.tsv
index ef7e1385a547e552e567d55b6e920c271dfe6274..e8bb71c4e71264bc52154bac89b1862900effdce 100644
--- a/openbis/sourceTest/sql/postgresql/115/031=external_data_management_systems.tsv
+++ b/openbis/sourceTest/sql/postgresql/115/031=external_data_management_systems.tsv
@@ -1,2 +1,2 @@
-1	1	DMS_1	Test EDMS	http://example.edms.pl/code=$code$	f
-2	1	DMS_2	Test External openBIS instance	http://www.openbis.ch/perm_id=$code$	t
+1	1	DMS_1	Test EDMS	http://example.edms.pl/code=${code}	f
+2	1	DMS_2	Test External openBIS instance	http://www.openbis.ch/perm_id=${code}	t