diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/bearbeiten-button/bearbeiten-button.component.html b/alfa-client/libs/vorgang-detail/src/lib/buttons/bearbeiten-button/bearbeiten-button.component.html
index d1de12ab8c6736dc07dd9d96d8490451e297467f..107e3f67c299d7a6199434ebfc4750ae27008242 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/bearbeiten-button/bearbeiten-button.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/bearbeiten-button/bearbeiten-button.component.html
@@ -28,7 +28,7 @@
   @if (showAsIconButton) {
     <ods-button-with-spinner
       [stateResource]="commandStateResource$ | async"
-      data-test-id="bearbeiten-icon-button"
+      dataTestId="bearbeiten-icon-button"
       tooltip="Vorgang bearbeiten"
       variant="ghost"
       size="fit"
@@ -39,7 +39,7 @@
   } @else {
     <ods-button-with-spinner
       [stateResource]="commandStateResource$ | async"
-      data-test-id="bearbeiten-button"
+      dataTestId="bearbeiten-button"
       text="Bearbeiten"
       variant="outline"
       (clickEmitter)="bearbeiten()"
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/bearbeiten-button/bearbeiten-button.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/buttons/bearbeiten-button/bearbeiten-button.component.spec.ts
index 627aa0b0592a3366c8b55e3bfc4df07c0b9dad58..9691ba2813cd8669f2e959a8d1f412a8ec435b52 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/bearbeiten-button/bearbeiten-button.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/bearbeiten-button/bearbeiten-button.component.spec.ts
@@ -28,6 +28,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ButtonWithSpinnerComponent } from '@ods/component';
 import { EditIconComponent } from '@ods/system';
 import { createCommandResource } from 'libs/command-shared/test/command';
+import { getDataTestIdAttributeOf } from 'libs/tech-shared/test/data-test';
 import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
 import { MockComponent } from 'ng-mocks';
 import { of } from 'rxjs';
@@ -37,8 +38,8 @@ describe('BearbeitenButtonComponent', () => {
   let component: BearbeitenButtonComponent;
   let fixture: ComponentFixture<BearbeitenButtonComponent>;
 
-  const bearbeitenButton: string = '[data-test-id="bearbeiten-button"]';
-  const bearbeitenIconButton: string = '[data-test-id="bearbeiten-icon-button"]';
+  const bearbeitenButton: string = getDataTestIdAttributeOf('bearbeiten-button');
+  const bearbeitenIconButton: string = getDataTestIdAttributeOf('bearbeiten-icon-button');
 
   const vorgangCommandService = {
     ...mock(VorgangCommandService),