diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataDAOTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataDAOTest.java
index 7d2a3e6e2b84e252fd8613c51151ea5778b6406a..4df823caf7323910139102354b65f2452a76a41a 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataDAOTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataDAOTest.java
@@ -339,7 +339,7 @@ public final class DataDAOTest extends AbstractDAOTest
     }
 
     @Test(groups = "broken")
-    // FIXME LMS-2421
+    // FIXME LMS-2440
     public final void testDeleteWithPropertiesButParentPreserved()
     {
         final IDataDAO dataDAO = daoFactory.getDataDAO();
@@ -392,8 +392,8 @@ public final class DataDAOTest extends AbstractDAOTest
         assertNull(preservedComponent.getContainer());
     }
 
-    @Test(groups = "broken")
-    // FIXME LMS-2421
+    @Test(groups = "broken-deletion")
+    // FIXME LMS-2440
     public final void testDeleteParentPreservesChildren()
     {
         final IDataDAO dataDAO = daoFactory.getDataDAO();
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityPropertyTypeDAOTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityPropertyTypeDAOTest.java
index a55985c68331adfd3b3ddcb4d0a09092b800193e..7c34ba5036eef83f60d3262031d5c074ef209869 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityPropertyTypeDAOTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityPropertyTypeDAOTest.java
@@ -171,7 +171,7 @@ public class EntityPropertyTypeDAOTest extends AbstractDAOTest
     }
 
     @Test(groups = "broken")
-    // FIXME LMS-2421
+    // FIXME LMS-2440
     public void testDelete()
     {
         EntityTypePropertyTypePE assignment =
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 a3ae91c4ff82a5e8f6b685d1fa45d653ad916396..8275fcb40c543f79f0eeab549567449323a95f73 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
@@ -245,7 +245,7 @@ public class ExperimentDAOTest extends AbstractDAOTest
     }
 
     @Test(groups = "broken")
-    // FIXME LMS-2421
+    // FIXME LMS-2440
     public final void testDeleteWithProperties()
     {
         final IExperimentDAO experimentDAO = daoFactory.getExperimentDAO();
@@ -278,7 +278,7 @@ public class ExperimentDAOTest extends AbstractDAOTest
     private static final String ATT_CONTENTS_TABLE = "attachment_contents";
 
     @Test(groups = "broken")
-    // FIXME LMS-2421
+    // FIXME LMS-2440
     public final void testDeleteWithAttachments()
     {
         final IExperimentDAO experimentDAO = daoFactory.getExperimentDAO();
@@ -312,7 +312,7 @@ public class ExperimentDAOTest extends AbstractDAOTest
 
     // @Test(expectedExceptions = DataIntegrityViolationException.class)
     @Test(groups = "broken")
-    // FIXME LMS-2421
+    // FIXME LMS-2440
     public final void testDeleteFailWithDataSets()
     {
         final IExperimentDAO experimentDAO = daoFactory.getExperimentDAO();
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SampleDAOTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SampleDAOTest.java
index caf0bb5e4979765a4765043f5999f93337f9e44c..83b0cb501b463a820b1ac6d2798ee08fda1c52ca 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SampleDAOTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SampleDAOTest.java
@@ -341,7 +341,7 @@ public final class SampleDAOTest extends AbstractDAOTest
     }
 
     @Test(groups = "broken")
-    // FIXME LMS-2421
+    // FIXME LMS-2440
     public final void testDeleteWithProperties()
     {
         final ISampleDAO sampleDAO = daoFactory.getSampleDAO();
@@ -422,7 +422,7 @@ public final class SampleDAOTest extends AbstractDAOTest
     }
 
     @Test(groups = "broken")
-    // FIXME LMS-2421
+    // FIXME LMS-2440
     public final void testDeleteWithGeneratedSamples()
     {
         final SamplePE deletedSample = findSample("3VCP2", "CISD");