diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/SystemTestSuite.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/SystemTestSuite.java
index 9bac044855505707defe145651de9387c55b211c..face37421f438ea29b66dcfd2f59bc47427b2316 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/SystemTestSuite.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/SystemTestSuite.java
@@ -62,10 +62,6 @@ public class SystemTestSuite extends GWTTestSuite
         testSuite.addTestSuite(GenericDataSetViewerTest.class);
         testSuite.addTestSuite(GenericDataSetEditorTest.class);
         testSuite.addTestSuite(AuthorizationManagementConsolTest.class);
- /*      
-  * TODO 2010-01-11 Commented out tests until we can figure out what the problem is with
-  * running the new tests under GWT 2.0. 
-  */        
         testSuite.addTestSuite(SampleBrowserTest.class);
         testSuite.addTestSuite(GenericSampleViewerTest.class);
         testSuite.addTestSuite(SearchTest.class);
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SearchTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SearchTest.java
index 709595d0694ee4d9b368eb23ce4ed64e723cef94..570fa57bd13ebe9c2e92cbbecc5de69e7ac14dbb 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SearchTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SearchTest.java
@@ -50,6 +50,19 @@ public class SearchTest extends AbstractGWTTestCase
         launchTest();
     }
 
+    @DoNotRunWith(Platform.HtmlUnit)
+    public final void testContainedSampleSearch()
+    {
+        remoteConsole.prepare(new Login("test", "a"));
+        remoteConsole.prepare(new SearchCommand("MP:A10"));
+
+        final CheckTableCommand checkDatasetsTableCommand =
+                createCheckMatchingEntitiesTableCommand(1, "CISD:/MP:A10");
+        remoteConsole.prepare(checkDatasetsTableCommand);
+
+        launchTest();
+    }
+
     @DoNotRunWith(Platform.HtmlUnit)
     public final void testExperimentSearch()
     {