diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/FillSearchCriteria.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/FillSearchCriteria.java
index 1b7fb59f88bc9dcf17ea8ddb9c61281d3e6b1bb4..f70d29f50a7117d0a95a1ffe08bfc5d8e50b5a81 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/FillSearchCriteria.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/FillSearchCriteria.java
@@ -48,9 +48,7 @@ public final class FillSearchCriteria extends AbstractDefaultTestCommand
     public static final FillSearchCriteria searchForDataSetWithCode(final String code)
     {
         FillSearchCriteria result = new FillSearchCriteria();
-        // FIXME 2009-09-18, Piotr Buczek: search for code with '-x' suffix doesn't work
-        final String codeWithoutSuffix = code.substring(0, code.indexOf("-")) + "*";
-        result.addAttributeCriterion(DataSetAttributeSearchFieldKind.CODE, codeWithoutSuffix);
+        result.addAttributeCriterion(DataSetAttributeSearchFieldKind.CODE, code);
         return result;
     }