diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.html b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.html
index 1adbb4002fc64f1f2af66bf028994e3917534cad..c1fab3517816d38bcfdfe2d5cb7123bf5e16d890 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.html
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.html
@@ -1,7 +1,7 @@
 <div class="block flex w-[620px] flex-col gap-4 bg-background-100 p-8">
   <div class="flex items-center justify-between">
     <h1 class="text-xl font-semibold text-primary">Vorgang weiterleiten</h1>
-    <ods-cancel-dialog-button showAsIconButton="true" data-test-id="cancel-dialog-icon-button" />
+    <ods-cancel-dialog-button showAsIconButton="true" />
   </div>
 
   @if (isNil(selectedSearchResult)) {
@@ -14,7 +14,7 @@
   }
 
   <div class="flex gap-4">
-    <alfa-forwarding-button [disabled]="isNil(selectedSearchResult)" data-test-id="forwarding-button" />
-    <ods-cancel-dialog-button data-test-id="cancel-dialog-button" />
+    <alfa-forwarding-button [disabled]="isNil(selectedSearchResult)" data-test-id="forwarding-button-host" />
+    <ods-cancel-dialog-button/>
   </div>
 </div>
diff --git a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.spec.ts b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.spec.ts
index 9112fec259b5d0c4e1c7130d58b099590c8fb973..cd8d7e5960ebfb3b7ea462fd64051bf153b3abe9 100644
--- a/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.spec.ts
+++ b/alfa-client/libs/forwarding/src/lib/forwarding-dialog-container/forwarding-dialog/forwarding-dialog.component.spec.ts
@@ -16,7 +16,7 @@ describe('ForwardingDialogComponent', () => {
 
   const zufiSearch: string = getDataTestIdOf('zufi-search');
   const forwardingItem: string = getDataTestIdOf('forwarding-item');
-  const forwardingButton: string = getDataTestIdOf('forwarding-button');
+  const forwardingButton: string = getDataTestIdOf('forwarding-button-host');
 
   const organisationsEinheitResource: OrganisationsEinheitResource = createOrganisationsEinheitResource();
   beforeEach(async () => {