diff --git a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/api/v3/MapDataSetTest.java b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/api/v3/MapDataSetTest.java
index c810f4fec99fa8230401d857f4ef328c4a81d1af..8e1b4b8eaa6e62915ed60787621d17ae8b8725c1 100644
--- a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/api/v3/MapDataSetTest.java
+++ b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/api/v3/MapDataSetTest.java
@@ -860,7 +860,7 @@ public class MapDataSetTest extends AbstractDataSetTest
 
         DataSetUpdate update = new DataSetUpdate();
         update.setDataSetId(id);
-        update.setSampleId(new SampleIdentifier("/CISD/3VCP5"));
+        update.setSampleId(new SampleIdentifier("/CISD/NEMO/3VCP5"));
 
         DataSetUpdate update2 = new DataSetUpdate();
         update2.setDataSetId(id);
diff --git a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/api/v3/MapSampleTest.java b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/api/v3/MapSampleTest.java
index 568bc63268e31589202f8dc4fe5a36e062cf203a..40588b43617a5ff8d7f701cce7a45dc701de5d48 100644
--- a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/api/v3/MapSampleTest.java
+++ b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/api/v3/MapSampleTest.java
@@ -819,7 +819,7 @@ public class MapSampleTest extends AbstractSampleTest
         assertEquals(samples.size(), 3);
 
         Sample sample1 = samples.get(0);
-        assertEquals(sample1.getIdentifier().toString(), "/CISD/3VCP5");
+        assertEquals(sample1.getIdentifier().toString(), "/CISD/NEMO/3VCP5");
         assertEquals(sample1.getExperiment().getIdentifier().toString(), "/CISD/NEMO/EXP10");
 
         Sample sample2 = samples.get(1);
@@ -877,7 +877,7 @@ public class MapSampleTest extends AbstractSampleTest
         assertEquals(samples.size(), 1);
 
         Sample sample = samples.get(0);
-        assertEquals(sample.getIdentifier().toString(), "/CISD/3VCP5");
+        assertEquals(sample.getIdentifier().toString(), "/CISD/NEMO/3VCP5");
 
         SampleType type = sample.getType();
         assertEquals(type.getCode(), "CELL_PLATE");
diff --git a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/api/v3/SearchSampleTest.java b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/api/v3/SearchSampleTest.java
index 7540181d162c409c27973a5b9c33bff128472770..fa46d15ae66c7c97db0d65919a5110ae9433ec51 100644
--- a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/api/v3/SearchSampleTest.java
+++ b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/api/v3/SearchSampleTest.java
@@ -182,24 +182,24 @@ public class SearchSampleTest extends AbstractSampleTest
     public void testSearchWithExperimentWithIdSetToIdentifier()
     {
         SampleSearchCriteria criteria = new SampleSearchCriteria();
-        criteria.withExperiment().withId().thatEquals(new ExperimentIdentifier("/CISD/NEMO/EXP10"));
-        testSearch(TEST_USER, criteria, "/CISD/3VCP5");
+        criteria.withExperiment().withId().thatEquals(new ExperimentIdentifier("/CISD/NEMO/EXP11"));
+        testSearch(TEST_USER, criteria, "/CISD/3VCP6");
     }
 
     @Test
     public void testSearchWithExperimentWithIdSetToPermId()
     {
         SampleSearchCriteria criteria = new SampleSearchCriteria();
-        criteria.withExperiment().withId().thatEquals(new ExperimentPermId("200811050952663-1029"));
-        testSearch(TEST_USER, criteria, "/CISD/3VCP5");
+        criteria.withExperiment().withId().thatEquals(new ExperimentPermId("200811050952663-1030"));
+        testSearch(TEST_USER, criteria, "/CISD/3VCP6");
     }
 
     @Test
     public void testSearchWithExperimentWithPermId()
     {
         SampleSearchCriteria criteria = new SampleSearchCriteria();
-        criteria.withExperiment().withPermId().thatEquals("200811050952663-1029");
-        testSearch(TEST_USER, criteria, "/CISD/3VCP5");
+        criteria.withExperiment().withPermId().thatEquals("200811050952663-1030");
+        testSearch(TEST_USER, criteria, "/CISD/3VCP6");
     }
 
     @Test
@@ -736,14 +736,14 @@ public class SearchSampleTest extends AbstractSampleTest
         List<Sample> samples1 = search(sessionToken, criteria, fo);
 
         assertSampleIdentifiersInOrder(samples1, "/CISD/3V-125", "/CISD/MP1-MIXED");
-        assertSampleIdentifiersInOrder(samples1.get(0).getChildren(), "/CISD/3VCP5", "/CISD/3VCP6", "/CISD/3VCP7", "/CISD/3VCP8");
+        assertSampleIdentifiersInOrder(samples1.get(0).getChildren(), "/CISD/NEMO/3VCP5", "/CISD/3VCP6", "/CISD/3VCP7", "/CISD/3VCP8");
         assertSampleIdentifiersInOrder(samples1.get(1).getChildren(), "/CISD/DP1-A", "/CISD/DP1-B");
 
         fo.withChildren().sortBy().code().desc();
         List<Sample> samples2 = search(sessionToken, criteria, fo);
 
         assertSampleIdentifiersInOrder(samples2, "/CISD/3V-125", "/CISD/MP1-MIXED");
-        assertSampleIdentifiersInOrder(samples2.get(0).getChildren(), "/CISD/3VCP8", "/CISD/3VCP7", "/CISD/3VCP6", "/CISD/3VCP5");
+        assertSampleIdentifiersInOrder(samples2.get(0).getChildren(), "/CISD/3VCP8", "/CISD/3VCP7", "/CISD/3VCP6", "/CISD/NEMO/3VCP5");
         assertSampleIdentifiersInOrder(samples2.get(1).getChildren(), "/CISD/DP1-B", "/CISD/DP1-A");
 
         v3api.logout(sessionToken);
@@ -796,7 +796,7 @@ public class SearchSampleTest extends AbstractSampleTest
         List<Sample> samples1 = search(sessionToken, criteria, fo);
 
         assertSampleIdentifiersInOrder(samples1, "/CISD/3V-125", "/CISD/MP1-MIXED");
-        assertSampleIdentifiersInOrder(samples1.get(0).getChildren(), "/CISD/3VCP5");
+        assertSampleIdentifiersInOrder(samples1.get(0).getChildren(), "/CISD/NEMO/3VCP5");
         assertSampleIdentifiersInOrder(samples1.get(1).getChildren(), "/CISD/DP1-A");
 
         fo.withChildren().from(1).count(1);
@@ -828,7 +828,7 @@ public class SearchSampleTest extends AbstractSampleTest
         List<Sample> samples1 = search(sessionToken, criteria, fo);
 
         assertSampleIdentifiersInOrder(samples1, "/CISD/3V-125");
-        assertSampleIdentifiersInOrder(samples1.get(0).getChildren(), "/CISD/3VCP5");
+        assertSampleIdentifiersInOrder(samples1.get(0).getChildren(), "/CISD/NEMO/3VCP5");
 
         fo.from(1).count(1);
         fo.withChildren().from(1).count(1);