diff --git a/goofy-client/apps/goofy-e2e/src/integration/main-tests/kommentar-attachment/kommentar-attachment.e2e-spec.ts b/goofy-client/apps/goofy-e2e/src/integration/main-tests/kommentar-attachment/kommentar-attachment.e2e-spec.ts
index 2ca0cd84bc43a48860bea820041ea61185d6cb2f..753f564124ef10dd9bc8406ac622391ec17f7859 100644
--- a/goofy-client/apps/goofy-e2e/src/integration/main-tests/kommentar-attachment/kommentar-attachment.e2e-spec.ts
+++ b/goofy-client/apps/goofy-e2e/src/integration/main-tests/kommentar-attachment/kommentar-attachment.e2e-spec.ts
@@ -102,11 +102,14 @@ describe('Kommentar attachments', () => {
 
 	describe('Delete attachements', () => {
 		it('should delete attachments', () => {
-			kommentarContainer.getRoot().click();
+			kommentarContainer.getKommentarList().click();
 			waitForSpinnerToDisappear();
 
 			attachmentList.getItem(TEST_FILE_WITH_CONTENT).getDeleteButton().click();
+			waitForSpinnerToDisappear();
+
 			attachmentList.getItem(TEST_FILE_WITHOUT_CONTENT).getDeleteButton().click();
+			waitForSpinnerToDisappear();
 
 			notExist(attachmentList.getItem(TEST_FILE_WITH_CONTENT).getRoot());
 			notExist(attachmentList.getItem(TEST_FILE_WITHOUT_CONTENT).getRoot());
@@ -116,9 +119,6 @@ describe('Kommentar attachments', () => {
 			kommentarContainer.getFormularSpeichernButton().click();
 			waitForSpinnerToDisappear();
 
-			kommentarContainer.getRoot().click();
-			waitForSpinnerToDisappear();
-
 			notExist(attachmentList.getItem(TEST_FILE_WITH_CONTENT).getRoot());
 			notExist(attachmentList.getItem(TEST_FILE_WITHOUT_CONTENT).getRoot());
 		});
@@ -126,7 +126,7 @@ describe('Kommentar attachments', () => {
 
 	describe('Download Kommentar attachments', () => {
 		it('should upload attachment', () => {
-			kommentarContainer.getRoot().click();
+			kommentarContainer.getKommentarList().click();
 			waitForSpinnerToDisappear();
 
 			uploadFile(attachmentContainer.getUploadInput(), TEST_FILE_WITH_CONTENT);