diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/WellContentLoaderTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/WellContentLoaderTest.java
index 7bbcabf2f7f94c5bb95d77988e32c4c93d8e233d..0d7146acf46a4446546e9c7a5070c0eb237094f3 100644
--- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/WellContentLoaderTest.java
+++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/WellContentLoaderTest.java
@@ -43,7 +43,7 @@ import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.WellSearchCrit
  * @author Kaloyan Enimanev
  */
 @Test(groups =
-    { "db", "screening" })
+    { "db", "screening", "slow" })
 public class WellContentLoaderTest extends AbstractScreeningDAOTest
 {
 
@@ -53,9 +53,7 @@ public class WellContentLoaderTest extends AbstractScreeningDAOTest
     @Autowired
     IGenericServer server;
 
-    @Test(groups =
-        { "slow", "broken" })
-    // FIXME LMS-2421
+    @Test
     public void testLoadWellContentsWithProperties()
     {
         String[] materialCodes = new String[]
@@ -81,8 +79,7 @@ public class WellContentLoaderTest extends AbstractScreeningDAOTest
      * Test that the same well is not displayed twice if the search query matches two different
      * materials inside the well.
      */
-    @Test(groups = "broken")
-    // FIXME LMS-2421
+    @Test
     public void testDuplicateWellsFilteredOut()
     {
         String[] materialCodes = new String[]