diff --git a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.html b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.html
index a9901316251e01961e699225cb79555ac1a4e7be..b09ebf9501c0cb00d81b5183e595bf913147f85d 100644
--- a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.html
+++ b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.html
@@ -35,7 +35,8 @@
           [tooltip]="'Organisationseinheit löschen'"
           variant="ghost"
           size="fit"
-          dataTestId="delete-button"
+          dataTestClass="delete-button"
+          data-test-id="delete-organisations-einheit-dialog-button"
           [dialogData]="{ organisationsEinheitName: organisationsEinheit.name, organisationsEinheitId: organisationsEinheit.id }"
         >
           <ods-delete-icon icon />
diff --git a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.spec.ts b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.spec.ts
index 75e0c4dd8eb94dbee8b2b5cd80b5b704583325ab..c016c3c9c89a5e1767b684775068803afaf5280d 100644
--- a/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.spec.ts
+++ b/alfa-client/libs/admin/organisations-einheit/src/lib/organisations-einheit-container/organisations-einheit-list/organisations-einheit-list.component.spec.ts
@@ -29,7 +29,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
 import { OpenDialogButtonComponent } from '@ods/component';
 import { ExclamationIconComponent, ListComponent, ListItemComponent } from '@ods/system';
-import { getConvertedDataTestIdOf, getDataTestIdAttributeOf, getDataTestIdOf } from 'libs/tech-shared/test/data-test';
+import { getConvertedDataTestIdOf, getDataTestIdOf } from 'libs/tech-shared/test/data-test';
 import { MockComponent } from 'ng-mocks';
 import { createAdminOrganisationsEinheit } from '../../../../../organisations-einheit-shared/src/test/organisations-einheit';
 import { OrganisationsEinheitListComponent } from './organisations-einheit-list.component';
@@ -40,7 +40,7 @@ describe('OrganisationsEinheitListComponent', () => {
 
   const listSelector: string = getDataTestIdOf('organisations-einheit-list');
   const listItemSuffux: string = '-organisation-item';
-  const deleteButtonTestId: string = getDataTestIdAttributeOf('delete-button');
+  const deleteButtonTestId: string = getDataTestIdOf('delete-organisations-einheit-dialog-button');
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
diff --git a/alfa-client/libs/tech-shared/test/data-test.ts b/alfa-client/libs/tech-shared/test/data-test.ts
index 795b2dee30c083f71da5842c2cc64738c3dd9da4..c4fbe01458d666825688364aee1f75b9fac3ea4e 100644
--- a/alfa-client/libs/tech-shared/test/data-test.ts
+++ b/alfa-client/libs/tech-shared/test/data-test.ts
@@ -35,10 +35,9 @@ export function getDataTestIdOf(value: string): string {
   return `[data-test-id="${value}"]`;
 }
 
+/**
+ * @deprecated use getDataTestIfOf instead and a direct data-test-id at the component
+ */
 export function getDataTestIdAttributeOf(value: string): string {
   return `[dataTestId="${value}"]`;
 }
-
-export function getDynamicDataTestIdAttributOf(value: string): string {
-  return `[ng-reflect-data-test-id="${value}"]`;
-}