diff --git a/backend/command-service/src/test/java/lt/satsyuk/distributed/audit/command/service/AdditionalCommandServiceTest.java b/backend/command-service/src/test/java/lt/satsyuk/distributed/audit/command/service/AdditionalCommandServiceTest.java
index 401707ea..9ef5f6c3 100644
--- a/backend/command-service/src/test/java/lt/satsyuk/distributed/audit/command/service/AdditionalCommandServiceTest.java
+++ b/backend/command-service/src/test/java/lt/satsyuk/distributed/audit/command/service/AdditionalCommandServiceTest.java
@@ -17,7 +17,6 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.kafka.core.KafkaTemplate;
 import org.springframework.kafka.support.SendResult;
@@ -32,6 +31,7 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -158,6 +158,6 @@ void handleDataDeletedPublishesDataDeletedEvent() {
 
     @SuppressWarnings("unchecked")
     private SendResult<String, AuditEvent> mockSendResult() {
-        return (SendResult<String, AuditEvent>) Mockito.mock(SendResult.class);
+        return (SendResult<String, AuditEvent>) mock(SendResult.class);
     }
 }
diff --git a/backend/command-service/src/test/java/lt/satsyuk/distributed/audit/command/service/UserLoginCommandServiceTest.java b/backend/command-service/src/test/java/lt/satsyuk/distributed/audit/command/service/UserLoginCommandServiceTest.java
index 1cbbf662..5509bacc 100644
--- a/backend/command-service/src/test/java/lt/satsyuk/distributed/audit/command/service/UserLoginCommandServiceTest.java
+++ b/backend/command-service/src/test/java/lt/satsyuk/distributed/audit/command/service/UserLoginCommandServiceTest.java
@@ -11,7 +11,6 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.kafka.core.KafkaTemplate;
 import org.springframework.kafka.support.SendResult;
@@ -27,6 +26,7 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -155,7 +155,7 @@ void handleUserLoginUsesCommandMetadataWhenRequestMetadataMissing() {
 
     @SuppressWarnings("unchecked")
     private SendResult<String, AuditEvent> mockSendResult() {
-        return (SendResult<String, AuditEvent>) Mockito.mock(SendResult.class);
+        return (SendResult<String, AuditEvent>) mock(SendResult.class);
     }
 }