diff --git a/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.html b/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.html
index be8d28fea7713061e669ebb8f10d45d0284f76cf..472ba56eb186e6dc57f98a3304efa51f923696db 100644
--- a/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.html
+++ b/goofy-client/libs/forwarding/src/lib/vorgang-forwarding-container/vorgang-forward-formular/vorgang-forward-form/vorgang-forward-form.component.html
@@ -14,7 +14,7 @@
 			placeholder="Passwort für die Verschlüsselung">
 	</goofy-client-text-editor>
 
-	<goofy-client-button-with-spinner data-test-id="forward-button"
+	<goofy-client-button-with-spinner dataTestId="forward-button"
 			toolTip="Vorgang weiterleiten"
 			icon="forward"
 			type="submit"
diff --git a/goofy-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-list-in-vorgang-container.component.html b/goofy-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-list-in-vorgang-container.component.html
index 112cf35ea13f25f7aa7f90fadb7bf01d34093557..daff766174687428ab8c8ac60d883a4482cedb76 100644
--- a/goofy-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-list-in-vorgang-container.component.html
+++ b/goofy-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-list-in-vorgang-container.component.html
@@ -20,7 +20,7 @@
 			class="create-button"
 			text="Kommentar"
 			icon="add"
-			data-test-id="create-kommentar">
+			dataTestId="create-kommentar">
 	</goofy-client-button-with-spinner>
 
 </ng-container>
diff --git a/goofy-client/libs/ui/src/lib/ui/button-with-spinner/button-with-spinner.component.html b/goofy-client/libs/ui/src/lib/ui/button-with-spinner/button-with-spinner.component.html
index c1e483923975bbecfa8dd083c7cd577fadb222ab..885fc13e6d439616b2c6f98f1a70b857b065bf9e 100644
--- a/goofy-client/libs/ui/src/lib/ui/button-with-spinner/button-with-spinner.component.html
+++ b/goofy-client/libs/ui/src/lib/ui/button-with-spinner/button-with-spinner.component.html
@@ -4,6 +4,7 @@
 		[disabled]="isDisabled"
 		[matTooltip]="toolTip"
 		(click)="clickEmitter.emit($event)"
+		[attr.data-test-id]="dataTestId"
 		data-test-class="icon-button">
 
 	<mat-icon
diff --git a/goofy-client/libs/ui/src/lib/ui/button-with-spinner/button-with-spinner.component.ts b/goofy-client/libs/ui/src/lib/ui/button-with-spinner/button-with-spinner.component.ts
index 2b1ef8cf1ad68331da7392ce8e6a4a706976aecc..b0900728c7e3e77b6f5c8bcec57bc394a98a6274 100644
--- a/goofy-client/libs/ui/src/lib/ui/button-with-spinner/button-with-spinner.component.ts
+++ b/goofy-client/libs/ui/src/lib/ui/button-with-spinner/button-with-spinner.component.ts
@@ -16,6 +16,7 @@ export class ButtonWithSpinnerComponent {
 	@Input() color: string = 'primary';
 	@Input() type: 'button' | 'submit' = 'button';
 	@Input() toolTip: string = '';
+	@Input() dataTestId: string;
 
 	@Output() public clickEmitter: EventEmitter<MouseEvent> = new EventEmitter<MouseEvent>();