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 408a654a19e5a54e1af0a5e442f8438746160f18..350c81e41e87f1aafd5542d644102d43b2f013c9 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
@@ -64,6 +64,20 @@ public class SearchTest extends AbstractGWTTestCase
         launchTest(20000);
     }
 
+    @DoNotRunWith(Platform.HtmlUnit)
+    public final void testDataSetSearch()
+    {
+        remoteConsole.prepare(new Login("test", "a"));
+        remoteConsole.prepare(new SearchCommand("Data Set", "TIFF"));
+
+        final CheckTableCommand checkDatasetsTableCommand =
+                createCheckMatchingEntitiesTableCommand(2, "20081105092158673-1",
+                        "20081105092159111-1");
+        remoteConsole.prepare(checkDatasetsTableCommand);
+
+        launchTest(20000);
+    }
+
     private final static String SAMPLE_T1 = "CISD:/CISD/CP-TEST-1";
 
     private final static String SAMPLE_T2 = "CISD:/CISD/CP-TEST-2";
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/HibernateSearchDAOTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/HibernateSearchDAOTest.java
index a59ecaf262325e986cd99de30d5e83b72e10ab93..31bbb5abc5b084a842d1774c6b00196e41bd5793 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/HibernateSearchDAOTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/HibernateSearchDAOTest.java
@@ -148,8 +148,7 @@ public final class HibernateSearchDAOTest extends AbstractDAOTest
         final String lastName = "John";
         final List<MatchingEntity> hits =
                 hibernateSearchDAO.searchEntitiesByTerm(SearchableEntity.SAMPLE, term,
-                        createDataProvider(), true);
-        // TODO 2010-01-07, PTR: test basic search mode
+                        createDataProvider(), false);
         assertTrue(hits.size() > 0);
         for (MatchingEntity matchingEntity : hits)
         {
@@ -159,15 +158,23 @@ public final class HibernateSearchDAOTest extends AbstractDAOTest
         }
     }
 
-    @Test
-    public final void testSearchEntitiesByTermForExperiment()
+    @DataProvider(name = "experimentQueriestAndModeToTest")
+    protected Object[][] getExperimentQueriesAndModeToTest()
+    {
+        return new Object[][]
+            {
+                { "exp-*", "exp-", true },
+                { "exp-", "exp-", false } };
+    }
+
+    @Test(dataProvider = "experimentQueriestAndModeToTest")
+    public final void testSearchEntitiesByTermForExperiment(String query, String querySubstring,
+            boolean useWildcardMode)
     {
         final IHibernateSearchDAO hibernateSearchDAO = daoFactory.getHibernateSearchDAO();
-        final String query = "exp-*";
-        final String querySubstring = "exp-"; // no wildcard
         final List<MatchingEntity> hits =
                 hibernateSearchDAO.searchEntitiesByTerm(SearchableEntity.EXPERIMENT, query,
-                        createDataProvider(), true);
+                        createDataProvider(), useWildcardMode);
         assertEquals(5, hits.size());
         for (MatchingEntity matchingEntity : hits)
         {