diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ExperimentDAOTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ExperimentDAOTest.java
index d7e78f938924e86d420f11ae764f4d07aa9f1786..a3ae91c4ff82a5e8f6b685d1fa45d653ad916396 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ExperimentDAOTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/ExperimentDAOTest.java
@@ -524,20 +524,21 @@ public class ExperimentDAOTest extends AbstractDAOTest
         assertTrue(exceptionThrown);
     }
 
-    @Test(groups = "broken")
-    // FIXME LMS-2421
+    @Test
     public final void testListExperimentsBySimpleProperty()
     {
         final IExperimentDAO dao = daoFactory.getExperimentDAO();
         ProjectPE project =
-                findProject(daoFactory.getHomeDatabaseInstance().getCode(), "CISD", "DEFAULT");
+                findProject(daoFactory.getHomeDatabaseInstance().getCode(), "CISD", "NEMO");
 
         List<ExperimentPE> entities =
                 dao.listExperimentsByProjectAndProperty("DESCRIPTION", "A simple experiment",
                         project);
 
-        assertEquals(1, entities.size());
-        assertEquals("EXP-X", entities.get(0).getCode());
+        assertEquals(3, entities.size());
+        assertContains(entities, CISD_CISD_NEMO_EXP1);
+        assertContains(entities, CISD_CISD_NEMO_EXP10);
+        assertContains(entities, CISD_CISD_NEMO_EXP11);
     }
 
     @Test