diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/kommentar-attachment/kommentar-attachment.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/kommentar-attachment/kommentar-attachment.cy.ts
index d09f044a855b7212af73e3c2336c26b60391c1d0..1cec9c72d16c03295a17b042c5884e073afd4280 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/kommentar-attachment/kommentar-attachment.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/kommentar-attachment/kommentar-attachment.cy.ts
@@ -30,7 +30,7 @@ import { VorgangListE2EComponent } from '../../../components/vorgang/vorgang-lis
 import { VorgangE2E } from '../../../model/vorgang';
 import { MainPage, waitForSpinnerToDisappear } from '../../../page-objects/main.po';
 import { VorgangPage } from '../../../page-objects/vorgang.po';
-import { dropCollections, readFileFromDownloads } from '../../../support/cypress-helper';
+import { deleteDownloadFolder, dropCollections, readFileFromDownloads } from '../../../support/cypress-helper';
 import { exist, notExist } from '../../../support/cypress.util';
 import { TEST_FILE_WITH_CONTENT, TEST_FILE_WITHOUT_CONTENT } from '../../../support/data.util';
 import { uploadFile, uploadFiles } from '../../../support/file-upload';
@@ -62,6 +62,7 @@ describe('Kommentar attachments', () => {
 
   after(() => {
     dropCollections();
+    deleteDownloadFolder();
   });
 
   describe('Upload attachements', () => {
@@ -141,7 +142,6 @@ describe('Kommentar attachments', () => {
 
   describe('Download Kommentar attachments', () => {
     it('should download uploaded attachment', () => {
-      waitForSpinnerToDisappear();
       attachmentList.getItem(TEST_FILE_WITH_CONTENT).getDownloadButton().click();
 
       exist(readFileFromDownloads(TEST_FILE_WITH_CONTENT));