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 373459b690ac040ead4769f48126078263cf379e..a25e1abcc227beb061ad3c6f0edde1b464fffd89 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
@@ -277,12 +277,10 @@ public class ExperimentDAOTest extends AbstractDAOTest
 
     private static final String ATT_CONTENTS_TABLE = "attachment_contents";
 
-    @Test(groups = "broken-deletion")
-    // FIXME LMS-2440
     public final void testDeleteWithAttachments()
     {
         final IExperimentDAO experimentDAO = daoFactory.getExperimentDAO();
-        final ExperimentPE deletedExperiment = findExperiment("/CISD/DEFAULT/EXP-X");
+        final ExperimentPE deletedExperiment = findExperiment("/CISD/DEFAULT/EXP-Y");
 
         // Deleted experiment should have attachments which prevent it from deletion.
         // Other connections which also prevent experiment deletion should be empty in this test.
@@ -295,6 +293,7 @@ public class ExperimentDAOTest extends AbstractDAOTest
         attachment.setRegistrator(deletedExperiment.getRegistrator());
         daoFactory.getAttachmentDAO().createAttachment(attachment, deletedExperiment);
 
+        // We just added an attachment to the experiment
         assertEquals(rowsInAttachmentContents + 1, countRowsInTable(ATT_CONTENTS_TABLE));
 
         assertFalse(deletedExperiment.getAttachments().isEmpty());
@@ -307,7 +306,10 @@ public class ExperimentDAOTest extends AbstractDAOTest
         // test successful deletion of experiment, attachment & content
         assertNull(experimentDAO.tryGetByTechId(TechId.create(deletedExperiment)));
         assertNull(daoFactory.getAttachmentDAO().tryGetByTechId(TechId.create(attachment)));
-        assertEquals(rowsInAttachmentContents, countRowsInTable(ATT_CONTENTS_TABLE));
+
+        // We deleted the attachment we added as well as the one that was already connected to the
+        // experiment
+        assertEquals(rowsInAttachmentContents - 1, countRowsInTable(ATT_CONTENTS_TABLE));
     }
 
     // @Test(expectedExceptions = DataIntegrityViolationException.class)
diff --git a/openbis/sourceTest/sql/postgresql/078/001=attachment_contents.tsv b/openbis/sourceTest/sql/postgresql/078/001=attachment_contents.tsv
index 26c3323600a4280dcccaf2dfde997a9c4d0e36e3..dc7e8c65cd38a3ff17bbdb7e607c0d51847d6eca 100644
--- a/openbis/sourceTest/sql/postgresql/078/001=attachment_contents.tsv
+++ b/openbis/sourceTest/sql/postgresql/078/001=attachment_contents.tsv
@@ -5,3 +5,4 @@
 5	\\x636f646509555345522e6465736372697074696f6e0973747564795f4f626a6563740973747564795f6f626a6563745f547970650970726f6a6563740970726f63657373696e675f696e737472756374696f6e730963656c6c5f706c617465730a4558503509412073696d706c65206578706572696d656e7409564952555331095649525553095959093e2070726f63657373696e672d696e737472756374696f6e732e747874093e2063656c6c506c617465732e7478740a4558503609616e6f74686572206578706572696d656e7409564952555331095649525553096b6f6b6f09090a
 6	\\x33564350310a33564350320a3356435033
 7	\\x616c610a6d610a6b6f74610a610a6b6f740a6a6573740a6964696f7461
+8	\\x33564350310a33564350320a3356435033
diff --git a/openbis/sourceTest/sql/postgresql/078/002=attachments.tsv b/openbis/sourceTest/sql/postgresql/078/002=attachments.tsv
index 5c058cc1430d498748a65cbbc7e46f94f50cf1c9..1e6653c179e778b3f20b39838af64ce362a234aa 100644
--- a/openbis/sourceTest/sql/postgresql/078/002=attachments.tsv
+++ b/openbis/sourceTest/sql/postgresql/078/002=attachments.tsv
@@ -5,3 +5,4 @@
 5	8	exampleExperiments.txt	2008-12-10 13:49:48.879301+01	1	2	5	\N	\N	\N	\N
 6	8	cellPlates.txt	2008-12-10 13:51:10.050748+01	1	2	6	\N	\N	\N	\N
 7	\N	sampleHistory.txt	2009-06-09 17:00:00+02	1	2	7	987	\N	\N	\N
+8	22	cellPlates.txt	2008-12-10 13:51:10.050748+01	1	2	8	\N	\N	\N	\N
diff --git a/openbis/sourceTest/sql/postgresql/078/023=experiments_all.tsv b/openbis/sourceTest/sql/postgresql/078/023=experiments_all.tsv
index 2c33ff5881bc9d1708dab5e85cd92984af61e737..0c8eb26b51beacb57885917693fbc67b13c40512 100644
--- a/openbis/sourceTest/sql/postgresql/078/023=experiments_all.tsv
+++ b/openbis/sourceTest/sql/postgresql/078/023=experiments_all.tsv
@@ -7,3 +7,4 @@
 19	EXP-TEST-2	2	\N	2	2009-02-09 12:10:58.949516+01	4	\N	f	2009-03-18 10:50:19.475958+01	200902091258949-1034
 20	EXP-TEST-2	1	\N	2	2009-02-09 12:17:55.058768+01	3	\N	f	2009-03-18 10:50:19.475958+01	200902091255058-1035
 21	EXP-WELLS	1	14	2	2008-11-05 09:22:37.246+01	1	\N	f	2009-03-18 10:50:19.475958+01	200811050937246-1036
+22	EXP-Y	1	14	2	2008-11-05 09:22:37.246+01	1	\N	f	2009-03-18 10:50:19.475958+01	201108050937246-1031