diff --git a/alfa-client/apps/alfa-e2e/src/components/attachment/attachment.e2e.component.ts b/alfa-client/apps/alfa-e2e/src/components/attachment/attachment.e2e.component.ts
index fe12579e28ed202ae4b72b4f54003a2ae149cd75..c7988c3ce98a476aa50c0a28b1341331a790d4e4 100644
--- a/alfa-client/apps/alfa-e2e/src/components/attachment/attachment.e2e.component.ts
+++ b/alfa-client/apps/alfa-e2e/src/components/attachment/attachment.e2e.component.ts
@@ -32,7 +32,7 @@ export class AttachmentContainerE2EComponent {
   }
 
   public getUploadInput() {
-    return cy.getTestElement(this.locatorFileUploadInput);
+    return cy.getTestElementContaining(this.locatorFileUploadInput);
   }
 }
 
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 c85070d6378af981222dca9bbaf595db77d6fff5..e3d96d18276ee39862dd14f25d9a0ed02169b812 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
@@ -22,10 +22,7 @@
  * unter der Lizenz sind dem Lizenztext zu entnehmen.
  */
 import { sleep } from '@alfa-client/tech-shared';
-import {
-  AttachmentContainerE2EComponent,
-  AttachmentListE2EComponent,
-} from '../../../components/attachment/attachment.e2e.component';
+import { AttachmentContainerE2EComponent, AttachmentListE2EComponent, } from '../../../components/attachment/attachment.e2e.component';
 import { KommentareInVorgangE2EComponent } from '../../../components/kommentar/kommentar-list.e2e.component';
 import { VorgangListE2EComponent } from '../../../components/vorgang/vorgang-list.e2e.component';
 import { UserE2E } from '../../../model/user';
@@ -34,7 +31,7 @@ import { MainPage, waitForSpinnerToDisappear } from '../../../page-objects/main.
 import { VorgangPage } from '../../../page-objects/vorgang.po';
 import { dropCollections, readFileFromDownloads } from '../../../support/cypress-helper';
 import { exist, notExist } from '../../../support/cypress.util';
-import { TEST_FILE_WITHOUT_CONTENT, TEST_FILE_WITH_CONTENT } from '../../../support/data.util';
+import { TEST_FILE_WITH_CONTENT, TEST_FILE_WITHOUT_CONTENT } from '../../../support/data.util';
 import { uploadFile } from '../../../support/file-upload';
 import { getUserSabine, loginAsSabine } from '../../../support/user-util';
 import { createVorgang, initVorgang } from '../../../support/vorgang-util';
@@ -46,8 +43,7 @@ describe('Kommentar attachments', () => {
   const vorgangPage: VorgangPage = new VorgangPage();
   const kommentarContainer: KommentareInVorgangE2EComponent = vorgangPage.getKommentarContainer();
 
-  const attachmentContainer: AttachmentContainerE2EComponent =
-    kommentarContainer.getAttachmentContainer();
+  const attachmentContainer: AttachmentContainerE2EComponent = kommentarContainer.getAttachmentContainer();
   const attachmentList: AttachmentListE2EComponent = attachmentContainer.getList();
 
   const kommentarText: string = 'Test text to test the test text test';
diff --git a/alfa-client/apps/alfa-e2e/src/support/commands.ts b/alfa-client/apps/alfa-e2e/src/support/commands.ts
index 8873b6afe8672819cf9ea75cf441955fabb0f004..1ae96148aecb533e89bca622db6c21c9134ef7c5 100644
--- a/alfa-client/apps/alfa-e2e/src/support/commands.ts
+++ b/alfa-client/apps/alfa-e2e/src/support/commands.ts
@@ -72,16 +72,29 @@ const SEARCH_INDEX_CLASS: string = 'de.ozgcloud.vorgang.common.search.IndexedVor
 declare namespace Cypress {
   interface Chainable<Subject> {
     getTestElementWithOid(oid: string, ...args);
+
     getTestElement(selector: string, ...args);
+
+    getTestElementContaining(selector: string, ...args);
+
     getTestElementWithClass(selector: string, ...args);
+
     findTestElementWithClass(selector: string, ...args);
+
     findElement(selector: string);
+
     login(user, password);
+
     logout();
+
     getUserInfo();
+
     addVorgangToSearchIndex(vorgang);
+
     removeAllDocumentsFromSearchIndex();
+
     addMockToSmocker(mock);
+
     resetSmocker();
   }
 }
@@ -90,6 +103,10 @@ Cypress.Commands.add('getTestElement', (selector, ...args) => {
   return cy.get(`[${DATA_TEST_ID}~="${selector}"]`, ...args);
 });
 
+Cypress.Commands.add('getTestElementContaining', (selector, ...args) => {
+  return cy.get(`[${DATA_TEST_ID}*="${selector}"]`, ...args);
+});
+
 Cypress.Commands.add('getTestElementWithClass', (selector, ...args) => {
   console.log(
     'Achtung: Potentiell nicht eindeutiges Ergebnis, weil eine data-test-class mit cy.get() von der DOM-Root aus gesucht wird.',
@@ -101,13 +118,9 @@ Cypress.Commands.add('getTestElementWithOid', (oid, ...args) => {
   return cy.getTestElement(oid, ...args);
 });
 
-Cypress.Commands.add(
-  'findTestElementWithClass',
-  { prevSubject: true },
-  (subject: any, selector) => {
-    return subject.find(`[${DATA_TEST_CLASS}="${selector}"]`);
-  },
-);
+Cypress.Commands.add('findTestElementWithClass', { prevSubject: true }, (subject: any, selector) => {
+  return subject.find(`[${DATA_TEST_CLASS}="${selector}"]`);
+});
 
 Cypress.Commands.add('findElement', { prevSubject: true }, (subject: any, selector: string) => {
   return subject.find(selector);
diff --git a/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.html b/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.html
index 96927c6b043705cd333e9783282e98ceeca9bc79..28d0e68be052035a9f7b7ce8cdbb940fb3decda2 100644
--- a/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.html
+++ b/alfa-client/libs/binary-file/src/lib/binary-file2-container/binary-file2/binary-file2.component.html
@@ -40,6 +40,7 @@
       (click)="deleteFile($event)"
       title="Anhang löschen"
       aria-label="Anhang löschen Button"
+      data-test-class="delete-file-button"
     >
       <ods-close-icon class="fill-text"></ods-close-icon>
     </button>
diff --git a/alfa-client/libs/binary-file/src/lib/multi-file-upload-editor/multi-file-upload-editor.component.html b/alfa-client/libs/binary-file/src/lib/multi-file-upload-editor/multi-file-upload-editor.component.html
index c88dc5e129136ca2ee8944c2e2ac00e35b376c4a..da036b934f8f37abe247fe2ef283d286cbea8cb7 100644
--- a/alfa-client/libs/binary-file/src/lib/multi-file-upload-editor/multi-file-upload-editor.component.html
+++ b/alfa-client/libs/binary-file/src/lib/multi-file-upload-editor/multi-file-upload-editor.component.html
@@ -30,6 +30,7 @@
   [multi]="true"
   [isLoading]="isUploadInProgress$ | async"
   class="relative w-72"
+  data-test-id="binary-file-upload"
 >
   <ods-spinner-icon spinner size="medium" />
   <ods-attachment-icon icon size="medium" />