diff --git a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserMapperTest.java b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserMapperTest.java
index 45798f962b77b209a17813d29289dd9ad41ea82c..bfc36ce848a539f355c37922618a6240f80f9466 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserMapperTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserMapperTest.java
@@ -208,7 +208,7 @@ class KeycloakUserMapperTest {
 
 			var keycloakUser = mapper.update(userRepresentation, OzgKeycloakUserSpecTestFactory.create());
 
-			assertThat(keycloakUser.getFirstName()).isEqualTo(OzgKeycloakUserSpecTestFactory.KEYCLOAK_USER.getFirstName());
+			assertThat(keycloakUser.getFirstName()).isEqualTo(KeycloakUserSpecUserTestFactory.FIRSTNAME);
 		}
 
 		@Test
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserRemoteServiceTest.java b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserRemoteServiceTest.java
index c3011f85c57f2db4713c42e373cdfe1c466ee543..144aa0bde3a0e7734c3ed005c844970e208c89cf 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserRemoteServiceTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserRemoteServiceTest.java
@@ -517,7 +517,7 @@ class KeycloakUserRemoteServiceTest {
 		void shouldClarifyUserName() {
 			userRemoteService.getUserSecret(OzgKeycloakUserSpecTestFactory.create(), NAMESPACE);
 
-			verify(userRemoteService).clarifyName(OzgKeycloakUserSpecTestFactory.KEYCLOAK_USER.getUsername().toLowerCase());
+			verify(userRemoteService).clarifyName(KeycloakUserSpecUserTestFactory.USERNAME.toLowerCase());
 		}
 	}
 
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserServiceTest.java b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserServiceTest.java
index a574e8b07b9dd9a84b3891a2ce35dd8fac8e560a..4bef75990e14e41b6a5076baad07032c525a5950 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserServiceTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserServiceTest.java
@@ -129,7 +129,7 @@ class KeycloakUserServiceTest {
 
 		@Test
 		void shouldCreateUserIfNotExists() {
-			when(remoteService.getUserByName(OzgKeycloakUserSpecTestFactory.KEYCLOAK_USER.getUsername(), TEST_NAMESPACE))
+			when(remoteService.getUserByName(KeycloakUserSpecUserTestFactory.USERNAME, TEST_NAMESPACE))
 					.thenReturn(Optional.empty());
 			when(userMapper.map(any())).thenReturn(Mockito.mock(UserRepresentation.class));
 
@@ -141,7 +141,7 @@ class KeycloakUserServiceTest {
 		@Test
 		void shouldUpdateUserIfExists() {
 			var userRepresentation = Mockito.mock(UserRepresentation.class);
-			when(remoteService.getUserByName(OzgKeycloakUserSpecTestFactory.KEYCLOAK_USER.getUsername(), TEST_NAMESPACE))
+			when(remoteService.getUserByName(KeycloakUserSpecUserTestFactory.USERNAME, TEST_NAMESPACE))
 					.thenReturn(Optional.of(userRepresentation));
 			when(userMapper.update(eq(userRepresentation), any())).thenReturn(userRepresentation);
 
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/user/OzgKeycloakUserSpecTestFactory.java b/src/test/java/de/ozgcloud/operator/keycloak/user/OzgKeycloakUserSpecTestFactory.java
index 43cf869ed22b80f223aed3ac4f3050ee8452c5a4..853f7dbcf39d4e2a93777ccc4cd3157aa37feacb 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/user/OzgKeycloakUserSpecTestFactory.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/user/OzgKeycloakUserSpecTestFactory.java
@@ -23,19 +23,16 @@
  */
 package de.ozgcloud.operator.keycloak.user;
 
-import de.ozgcloud.operator.keycloak.user.OzgKeycloakUserSpec.KeycloakUserSpecUser;
 import de.ozgcloud.operator.keycloak.user.OzgKeycloakUserSpec.OzgKeycloakUserSpecBuilder;
 
 public class OzgKeycloakUserSpecTestFactory {
 
-	public static final KeycloakUserSpecUser KEYCLOAK_USER = KeycloakUserSpecUserTestFactory.create();
-
 	public static OzgKeycloakUserSpec create() {
 		return createBuilder().build();
 	}
 
 	public static OzgKeycloakUserSpecBuilder createBuilder() {
 		return OzgKeycloakUserSpec.builder()
-				.keycloakUser(KEYCLOAK_USER);
+				.keycloakUser(KeycloakUserSpecUserTestFactory.create());
 	}
 }