diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/FillSampleRegistrationForm.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/FillSampleRegistrationForm.java
index 34d26032b54dbc9db817998f914b151760122b9f..cda3209fc3fb7049396121d90ff527bba8cd4c49 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/FillSampleRegistrationForm.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/FillSampleRegistrationForm.java
@@ -49,7 +49,7 @@ public final class FillSampleRegistrationForm extends AbstractDefaultTestCommand
 
     private final List<PropertyField> properties;
 
-    private String parent;
+    private String parentsOrNull;
 
     private String container;
 
@@ -62,9 +62,9 @@ public final class FillSampleRegistrationForm extends AbstractDefaultTestCommand
         this.properties = new ArrayList<PropertyField>();
     }
 
-    public final FillSampleRegistrationForm parent(final String parentFieldValue)
+    public final FillSampleRegistrationForm parents(final String parents)
     {
-        this.parent = parentFieldValue;
+        this.parentsOrNull = parents;
         return this;
     }
 
@@ -96,12 +96,12 @@ public final class FillSampleRegistrationForm extends AbstractDefaultTestCommand
                         + GroupSelectionWidget.SUFFIX + FORM_ID);
         GWTUtils.setSelectedItem(groupSelector, ModelDataPropertyNames.CODE, groupNameOrNull);
 
-        if (StringUtils.isBlank(parent) == false)
+        if (StringUtils.isBlank(parentsOrNull) == false)
         {
             final SampleChooserField parentField =
                     (SampleChooserField) GWTTestUtil.getWidgetWithID(FORM_ID
-                            + GenericSampleRegistrationForm.ID_SUFFIX_PARENT);
-            parentField.setValue(parent);
+                            + ParentSamplesArea.ID_SUFFIX_PARENT_SAMPLES);
+            parentField.setValue(parentsOrNull);
         }
         if (StringUtils.isBlank(container) == false)
         {
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleRegistrationTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleRegistrationTest.java
index 15cb62cb3798096e2a13a6953fec3895fc477f24..c45101a85cc5ee290d8ad6dacaadca1b5801cfa8 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleRegistrationTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleRegistrationTest.java
@@ -122,7 +122,7 @@ public class GenericSampleRegistrationTest extends AbstractGWTTestCase
         final String sampleTypeCode = DILUTION_PLATE;
         loginAndPreprareRegistration(sampleTypeCode);
         remoteConsole.prepare(new FillSampleRegistrationForm("CISD", sampleCode)
-                .parent("MP1-MIXED"));
+                .parents("MP1-MIXED"));
         remoteConsole.prepare(new InvokeActionMenu(TopMenu.ActionMenuKind.SAMPLE_MENU_BROWSE));
         remoteConsole.prepare(new ListSamples("CISD", sampleTypeCode));
         remoteConsole.prepare(new CheckSampleTable().expectedRow(new SampleRow(sampleCode