diff --git a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/api/v3/SearchDataSetTest.java b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/api/v3/SearchDataSetTest.java
index 31ef6dbee4e9fe872febd69df0b512d70549be5b..d2ecb1940b7513e425eeee5159042f2fc845dbc8 100644
--- a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/api/v3/SearchDataSetTest.java
+++ b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/api/v3/SearchDataSetTest.java
@@ -192,11 +192,21 @@ public class SearchDataSetTest extends AbstractDataSetTest
     }
 
     @Test
-    public void testSearchWithSampleWithAnyPropertyThatContains()
+    public void testSearchWithSample()
     {
         DataSetSearchCriterion criterion = new DataSetSearchCriterion();
-        criterion.withSample().withAnyProperty().thatContains("er");
-        testSearch(TEST_USER, criterion, "20081105092159111-1", "20081105092159333-3", "20110805092359990-17", "20081105092159222-2");
+        criterion.withCode().thatStartsWith("20120628092259000");
+        criterion.withSample();
+        testSearch(TEST_USER, criterion, "20120628092259000-23");
+    }
+
+    @Test
+    public void testSearchWithoutSample()
+    {
+        DataSetSearchCriterion criterion = new DataSetSearchCriterion();
+        criterion.withCode().thatStartsWith("20120628092259000");
+        criterion.withoutSample();
+        testSearch(TEST_USER, criterion, "20120628092259000-24", "20120628092259000-25");
     }
 
     @Test