diff --git a/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.html b/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.html
index 8a29c815b66b75b1258b10cfd57173dac007f755..440eb0b7fee2d2fbf322f3c90295e21e83c7f902 100644
--- a/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.html
+++ b/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.html
@@ -27,7 +27,7 @@
   <!-- TODO Aufteilen in 3 einzelne Komponenten -->
   @if (showAsIconButton) {
     <ods-button
-      data-test-id="send-mail-icon-button"
+      dataTestId="send-mail-icon-button"
       [isLoading]="pendingSendPostfachMailCommand.resource | hasLink: commandLinkRel.UPDATE"
       tooltip="Neue Nachricht erstellen"
       variant="ghost"
@@ -36,9 +36,10 @@
     >
       <ods-mailbox-icon icon />
     </ods-button>
-  } @else if (text && !toolTip) {
+  }
+  @if (!showAsIconButton && text && !toolTip) {
     <ods-button
-      data-test-id="create-mail-button-with-text"
+      dataTestId="create-mail-button-with-text"
       [isLoading]="pendingSendPostfachMailCommand.resource | hasLink: commandLinkRel.UPDATE"
       [text]="text"
       variant="outline"
@@ -46,9 +47,10 @@
     >
       <ods-plus-icon icon />
     </ods-button>
-  } @else if (!text && toolTip) {
+  }
+  @if (!showAsIconButton && !text && toolTip) {
     <ods-button
-      data-test-id="create-mail-button-without-text"
+      dataTestId="create-mail-button-without-text"
       [isLoading]="pendingSendPostfachMailCommand.resource | hasLink: commandLinkRel.UPDATE"
       [tooltip]="toolTip"
       variant="ghost"
diff --git a/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.spec.ts b/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.spec.ts
index d02565a847b264cca81be05fdd3bb9eda376656b..10a405d1058f6fb7f5321e823b602614b294c5e3 100644
--- a/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.spec.ts
+++ b/alfa-client/libs/postfach/src/lib/postfach-mail-button-container/postfach-mail-button/postfach-mail-button.component.spec.ts
@@ -28,7 +28,7 @@ import { faker } from '@faker-js/faker';
 import { ButtonComponent, MailboxIconComponent, PlusIconComponent, TooltipDirective } from '@ods/system';
 import { createCommandResource } from 'libs/command-shared/test/command';
 import { createPostfachMailListResource } from 'libs/postfach-shared/test/postfach';
-import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
+import { getDataTestIdAttributeOf } from 'libs/tech-shared/test/data-test';
 import { MockComponent, MockDirective } from 'ng-mocks';
 import { PostfachMailButtonComponent } from './postfach-mail-button.component';
 
@@ -36,9 +36,9 @@ describe('PostfachMailButtonComponent', () => {
   let component: PostfachMailButtonComponent;
   let fixture: ComponentFixture<PostfachMailButtonComponent>;
 
-  const sendMailButtonWithText: string = getDataTestIdOf('create-mail-button-with-text');
-  const sendMailButtonWithoutText: string = getDataTestIdOf('create-mail-button-without-text');
-  const sendMailIconButton: string = getDataTestIdOf('send-mail-icon-button');
+  const sendMailButtonWithText: string = getDataTestIdAttributeOf('create-mail-button-with-text');
+  const sendMailButtonWithoutText: string = getDataTestIdAttributeOf('create-mail-button-without-text');
+  const sendMailIconButton: string = getDataTestIdAttributeOf('send-mail-icon-button');
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.html b/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.html
index f9670cbee8d9949a13cc84197077346f2c4025a6..758515c53318532c5950c7d61b75fa296137cabc 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.html
@@ -28,7 +28,7 @@
   @if (showAsIconButton) {
     <ods-button-with-spinner
       [stateResource]="commandStateResource$ | async"
-      data-test-id="abschliessen-icon-button"
+      dataTestId="abschliessen-icon-button"
       tooltip="Vorgang abschließen"
       variant="ghost"
       size="fit"
@@ -39,7 +39,7 @@
   } @else {
     <ods-button-with-spinner
       [stateResource]="commandStateResource$ | async"
-      data-test-id="abschliessen-button"
+      dataTestId="abschliessen-button"
       text="Abschließen"
       variant="outline"
       (clickEmitter)="abschliessen()"
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.spec.ts
index 964474db2566e4fa0a80d8af012a266e86c2af78..a7334741a042a9d6cbe14d06d190160bd7bda7c5 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/abschliessen-button/abschliessen-button.component.spec.ts
@@ -29,7 +29,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ButtonWithSpinnerComponent } from '@ods/component';
 import { CheckIconComponent } from '@ods/system';
 import { createCommandResource } from 'libs/command-shared/test/command';
-import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
+import { getDataTestIdAttributeOf } from 'libs/tech-shared/test/data-test';
 import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang';
 import { MockComponent } from 'ng-mocks';
 import { Observable, of } from 'rxjs';
@@ -39,8 +39,8 @@ describe('AbschliessenButtonComponent', () => {
   let component: AbschliessenButtonComponent;
   let fixture: ComponentFixture<AbschliessenButtonComponent>;
 
-  const abschliessenButton: string = getDataTestIdOf('abschliessen-button');
-  const abschliessenIconButton: string = getDataTestIdOf('abschliessen-icon-button');
+  const abschliessenButton: string = getDataTestIdAttributeOf('abschliessen-button');
+  const abschliessenIconButton: string = getDataTestIdAttributeOf('abschliessen-icon-button');
 
   const vorgangCommandService = {
     ...mock(VorgangCommandService),
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/annehmen-button/annehmen-button.component.html b/alfa-client/libs/vorgang-detail/src/lib/buttons/annehmen-button/annehmen-button.component.html
index e3113ba3b2f94d1fe599f091b61acd7ad143cda1..7e55b9639e4a09b970c98394ad360cf550f80dcd 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/annehmen-button/annehmen-button.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/annehmen-button/annehmen-button.component.html
@@ -31,7 +31,7 @@
       tooltip="Vorgang annehmen"
       variant="ghost"
       size="fit"
-      data-test-id="annehmen-icon-button"
+      dataTestId="annehmen-icon-button"
     >
       <ods-check-circle-icon icon class="fill-text" />
     </ods-button-with-spinner>
@@ -41,7 +41,7 @@
       (clickEmitter)="annehmen()"
       text="Annehmen"
       variant="outline"
-      data-test-id="annehmen-button"
+      dataTestId="annehmen-button"
     >
       <ods-check-circle-icon icon />
     </ods-button-with-spinner>
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/annehmen-button/annehmen-button.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/buttons/annehmen-button/annehmen-button.component.spec.ts
index 8e531074e2822d3f1c27b670df59b032035a1595..0b4059086facce657ae46ba5a1c241afc7eb5122 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/annehmen-button/annehmen-button.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/annehmen-button/annehmen-button.component.spec.ts
@@ -29,7 +29,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ButtonWithSpinnerComponent } from '@ods/component';
 import { CheckCircleIconComponent, TooltipDirective } from '@ods/system';
 import { createCommandResource } from 'libs/command-shared/test/command';
-import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
+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';
@@ -39,8 +39,8 @@ describe('AnnehmenButtonComponent', () => {
   let component: AnnehmenButtonComponent;
   let fixture: ComponentFixture<AnnehmenButtonComponent>;
 
-  const annehmenButton: string = getDataTestIdOf('annehmen-button');
-  const annehmenIconButton: string = getDataTestIdOf('annehmen-icon-button');
+  const annehmenButton: string = getDataTestIdAttributeOf('annehmen-button');
+  const annehmenIconButton: string = getDataTestIdAttributeOf('annehmen-icon-button');
 
   const vorgangCommandService = {
     ...mock(VorgangCommandService),
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),
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.html b/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.html
index 8d663e5e9b13d5c89b3b774bbcf7f0085f0a2a41..784ddfbbf353822e8bd5fc423d63a1f86f9f607e 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.html
@@ -27,7 +27,7 @@
   @if (showAsIconButton) {
     <ods-button-with-spinner
       [stateResource]="commandStateResource$ | async"
-      data-test-id="verwerfen-icon-button"
+      dataTestId="verwerfen-icon-button"
       tooltip="Vorgang verwerfen"
       variant="ghost"
       size="fit"
@@ -38,7 +38,7 @@
   } @else {
     <ods-button-with-spinner
       [stateResource]="commandStateResource$ | async"
-      data-test-id="verwerfen-button"
+      dataTestId="verwerfen-button"
       text="Verwerfen"
       variant="outline"
       (clickEmitter)="verwerfen()"
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.spec.ts
index ebdb6df88b8db242bf7e54971753c356850c7c28..75b739a2301a0447895e66b8f026c494bd0fb49e 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/verwerfen-button/verwerfen-button.component.spec.ts
@@ -28,7 +28,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ButtonWithSpinnerComponent } from '@ods/component';
 import { DiscardVorgangIconComponent } from '@ods/system';
 import { createCommandResource } from 'libs/command-shared/test/command';
-import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
+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';
@@ -38,8 +38,8 @@ describe('VerwerfenButtonComponent', () => {
   let component: VerwerfenButtonComponent;
   let fixture: ComponentFixture<VerwerfenButtonComponent>;
 
-  const verwerfenButton: string = getDataTestIdOf('verwerfen-button');
-  const verwerfenIconButton: string = getDataTestIdOf('verwerfen-icon-button');
+  const verwerfenButton: string = getDataTestIdAttributeOf('verwerfen-button');
+  const verwerfenIconButton: string = getDataTestIdAttributeOf('verwerfen-icon-button');
 
   const vorgangCommandService = {
     ...mock(VorgangCommandService),
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/wiedereroeffnen-button/wiedereroeffnen-button.component.html b/alfa-client/libs/vorgang-detail/src/lib/buttons/wiedereroeffnen-button/wiedereroeffnen-button.component.html
index 51b70df609a151c9c33d2c72fe78d508e489453c..0e3bba543bfdd8404c10c1589b32b1a245e746ed 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/wiedereroeffnen-button/wiedereroeffnen-button.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/wiedereroeffnen-button/wiedereroeffnen-button.component.html
@@ -27,7 +27,7 @@
   @if (showAsIconButton) {
     <ods-button-with-spinner
       [stateResource]="commandStateResource$ | async"
-      data-test-id="wiedereroeffnen-icon-button"
+      dataTestId="wiedereroeffnen-icon-button"
       tooltip="Vorgang wiedereröffnen"
       variant="ghost"
       size="fit"
@@ -38,7 +38,7 @@
   } @else {
     <ods-button-with-spinner
       [stateResource]="commandStateResource$ | async"
-      data-test-id="wiedereroeffnen-button"
+      dataTestId="wiedereroeffnen-button"
       text="Wiedereröffnen"
       variant="outline"
       (clickEmitter)="wiedereroeffnen()"
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/wiedereroeffnen-button/wiedereroeffnen-button.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/buttons/wiedereroeffnen-button/wiedereroeffnen-button.component.spec.ts
index 3ee20a3ec3163d4e1d1b7a3ba2bccaab5b01ffee..a52280005233c965f956010d03a99c87be471fd3 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/wiedereroeffnen-button/wiedereroeffnen-button.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/wiedereroeffnen-button/wiedereroeffnen-button.component.spec.ts
@@ -28,7 +28,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ButtonWithSpinnerComponent } from '@ods/component';
 import { UndoIconComponent } from '@ods/system';
 import { createCommandResource } from 'libs/command-shared/test/command';
-import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
+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 +37,8 @@ import { WiedereroeffnenButtonComponent } from './wiedereroeffnen-button.compone
 describe('WiedereroeffnenButtonComponent', () => {
   let component: WiedereroeffnenButtonComponent;
   let fixture: ComponentFixture<WiedereroeffnenButtonComponent>;
-  const wiedereroeffnenButton: string = getDataTestIdOf('wiedereroeffnen-button');
-  const wiedereroeffnenIconButton: string = getDataTestIdOf('wiedereroeffnen-icon-button');
+  const wiedereroeffnenButton: string = getDataTestIdAttributeOf('wiedereroeffnen-button');
+  const wiedereroeffnenIconButton: string = getDataTestIdAttributeOf('wiedereroeffnen-icon-button');
 
   const vorgangCommandService = {
     ...mock(VorgangCommandService),
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckholen-button/zurueckholen-button.component.html b/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckholen-button/zurueckholen-button.component.html
index 3fd57ccdb224a101cd6aae36ec98a2e09291c30c..d2ac600887aa0ea31937090134e620cdc2c92b0b 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckholen-button/zurueckholen-button.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckholen-button/zurueckholen-button.component.html
@@ -27,7 +27,7 @@
   @if (showAsIconButton) {
     <ods-button-with-spinner
       [stateResource]="commandStateResource$ | async"
-      data-test-id="zurueckholen-icon-button"
+      dataTestId="zurueckholen-icon-button"
       variant="ghost"
       size="fit"
       tooltip="Vorgang zurückholen"
@@ -38,8 +38,8 @@
   } @else {
     <ods-button-with-spinner
       [stateResource]="commandStateResource$ | async"
-      data-test-id="zurueckholen-button"
-      text="Vorgang zurückholen"
+      dataTestId="zurueckholen-button"
+      text="Zurückholen"
       variant="outline"
       (clickEmitter)="zurueckholen()"
     >
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckholen-button/zurueckholen-button.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckholen-button/zurueckholen-button.component.spec.ts
index 3a1cd901153906a95686be588731b8ca6f174b48..f91b5423f7f409c523592849dacc6c52126e5c92 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckholen-button/zurueckholen-button.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckholen-button/zurueckholen-button.component.spec.ts
@@ -28,7 +28,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ButtonWithSpinnerComponent } from '@ods/component';
 import { UndoIconComponent } from '@ods/system';
 import { createCommandResource } from 'libs/command-shared/test/command';
-import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
+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';
@@ -38,8 +38,8 @@ describe('ZurueckholenButtonComponent', () => {
   let component: ZurueckholenButtonComponent;
   let fixture: ComponentFixture<ZurueckholenButtonComponent>;
 
-  const zurueckholenButton: string = getDataTestIdOf('zurueckholen-button');
-  const zurueckholenIconButton: string = getDataTestIdOf('zurueckholen-icon-button');
+  const zurueckholenButton: string = getDataTestIdAttributeOf('zurueckholen-button');
+  const zurueckholenIconButton: string = getDataTestIdAttributeOf('zurueckholen-icon-button');
 
   const vorgangCommandService = {
     ...mock(VorgangCommandService),
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckstellen-button/zurueckstellen-button.component.html b/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckstellen-button/zurueckstellen-button.component.html
index c595747b9869cb5f3481a7a055267de3dfb56c76..843b20963ed5baf2cf596165d889f9d4b405e232 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckstellen-button/zurueckstellen-button.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckstellen-button/zurueckstellen-button.component.html
@@ -28,7 +28,7 @@
   @if (showAsIconButton) {
     <ods-button-with-spinner
       [stateResource]="commandStateResource$ | async"
-      data-test-id="zurueckstellen-icon-button"
+      dataTestId="zurueckstellen-icon-button"
       tooltip="Vorgang zurückstellen"
       variant="ghost"
       size="fit"
@@ -39,7 +39,7 @@
   } @else {
     <ods-button-with-spinner
       [stateResource]="commandStateResource$ | async"
-      data-test-id="zurueckstellen-button"
+      dataTestId="zurueckstellen-button"
       text="Zurückstellen"
       variant="outline"
       (clickEmitter)="zurueckstellen()"
diff --git a/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckstellen-button/zurueckstellen-button.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckstellen-button/zurueckstellen-button.component.spec.ts
index b17b7c5a7c9c1651c129adf56fbfea79ff7044f9..4f9a74edc4eff2593b3cea73015e57f11e0f18a9 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckstellen-button/zurueckstellen-button.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/buttons/zurueckstellen-button/zurueckstellen-button.component.spec.ts
@@ -28,7 +28,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ButtonWithSpinnerComponent } from '@ods/component';
 import { UndoIconComponent } from '@ods/system';
 import { createCommandResource } from 'libs/command-shared/test/command';
-import { getDataTestIdOf } from 'libs/tech-shared/test/data-test';
+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';
@@ -38,8 +38,8 @@ describe('ZurueckstellenButtonComponent', () => {
   let component: ZurueckstellenButtonComponent;
   let fixture: ComponentFixture<ZurueckstellenButtonComponent>;
 
-  const zurueckstellenButton: string = getDataTestIdOf('zurueckstellen-button');
-  const zurueckstellenIconButton: string = getDataTestIdOf('zurueckstellen-icon-button');
+  const zurueckstellenButton: string = getDataTestIdAttributeOf('zurueckstellen-button');
+  const zurueckstellenIconButton: string = getDataTestIdAttributeOf('zurueckstellen-icon-button');
 
   const vorgangCommandService = {
     ...mock(VorgangCommandService),
diff --git a/alfa-client/libs/wiedervorlage/src/lib/erledigen-button-container/erledigen-button-container.component.html b/alfa-client/libs/wiedervorlage/src/lib/erledigen-button-container/erledigen-button-container.component.html
index 5099a02204f32b3ea50804984be240992535d0fd..71fb146636883062d7fc3759a4cd120df047aa2e 100644
--- a/alfa-client/libs/wiedervorlage/src/lib/erledigen-button-container/erledigen-button-container.component.html
+++ b/alfa-client/libs/wiedervorlage/src/lib/erledigen-button-container/erledigen-button-container.component.html
@@ -25,7 +25,7 @@
 -->
 @if (wiedervorlage | hasLink: linkRel.ERLEDIGEN) {
   <ods-button-with-spinner
-    data-test-id="erledigen-icon-button"
+    dataTestId="erledigen-icon-button"
     [stateResource]="erledigenCommand$ | async"
     tooltip="Als erledigt markieren"
     variant="ghost"
diff --git a/alfa-client/libs/wiedervorlage/src/lib/erledigen-button-container/erledigen-button-container.component.spec.ts b/alfa-client/libs/wiedervorlage/src/lib/erledigen-button-container/erledigen-button-container.component.spec.ts
index 69aaf5f00dfb63c96f37ca4fe53755d24900072d..81eec1106509121cb069b014fe64ac1077d5e96e 100644
--- a/alfa-client/libs/wiedervorlage/src/lib/erledigen-button-container/erledigen-button-container.component.spec.ts
+++ b/alfa-client/libs/wiedervorlage/src/lib/erledigen-button-container/erledigen-button-container.component.spec.ts
@@ -27,6 +27,7 @@ import { WiedervorlageLinkRel, WiedervorlageService } from '@alfa-client/wiederv
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ButtonWithSpinnerComponent } from '@ods/component';
 import { CheckCircleIconComponent } from '@ods/system';
+import { getDataTestIdAttributeOf } from 'libs/tech-shared/test/data-test';
 import { createWiedervorlageResource } from 'libs/wiedervorlage-shared/test/wiedervorlage';
 import { MockComponent } from 'ng-mocks';
 import { ErledigenButtonContainerComponent } from './erledigen-button-container.component';
@@ -35,7 +36,7 @@ describe('ErledigenButtonContainerComponent', () => {
   let component: ErledigenButtonContainerComponent;
   let fixture: ComponentFixture<ErledigenButtonContainerComponent>;
 
-  const erledigenIconButton = '[data-test-id="erledigen-icon-button"]';
+  const erledigenIconButton = getDataTestIdAttributeOf('erledigen-icon-button');
 
   const wiedervorlageService = mock(WiedervorlageService);