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 d413027d124d948a38852e45945b905ea0f4a89e..a93ffb7d44b0e97edc4260efb7cce40845edb311 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
@@ -16,6 +16,9 @@
 
 package ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.sample;
 
+import com.google.gwt.junit.DoNotRunWith;
+import com.google.gwt.junit.Platform;
+
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.TopMenu;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.menu.TopMenu.ActionMenuKind;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.GroupSelectionWidget;
@@ -144,6 +147,7 @@ public class GenericSampleRegistrationTest extends AbstractGWTTestCase
         launchTest();
     }
 
+    @DoNotRunWith(Platform.HtmlUnit)
     public final void testRegisterGroupSampleWithContainer()
     {
         final String sampleCode = "W12";
@@ -164,7 +168,7 @@ public class GenericSampleRegistrationTest extends AbstractGWTTestCase
         componentsTable.expectedRow(new Row().withCell(sampleCodeFieldIdent,
                 containerCode + ":" + sampleCode).withCell(sampleSubcodeFieldIdent, sampleCode));
         remoteConsole.prepare(checkSample);
-        launchTest(160 * SECOND);
+        launchTest();
     }
 
     public final void testRegisterSharedSample()