diff --git a/src/test/java/lt/satsyuk/controller/AccountControllerTest.java b/src/test/java/lt/satsyuk/controller/AccountControllerTest.java
index 4a48c15..5d87461 100644
--- a/src/test/java/lt/satsyuk/controller/AccountControllerTest.java
+++ b/src/test/java/lt/satsyuk/controller/AccountControllerTest.java
@@ -7,6 +7,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
@@ -28,12 +29,12 @@ class AccountControllerTest {
     @Mock
     private SecurityService securityService;
 
+    @InjectMocks
     private AccountController accountController;
 
     @BeforeEach
     void setUp() {
         lenient().when(securityService.clientId()).thenReturn(AUTH_CLIENT_ID);
-        accountController = new AccountController(accountService, securityService);
     }
 
     @Test
diff --git a/src/test/java/lt/satsyuk/exception/GlobalExceptionHandlerTest.java b/src/test/java/lt/satsyuk/exception/GlobalExceptionHandlerTest.java
index dad38a0..ada9bf1 100644
--- a/src/test/java/lt/satsyuk/exception/GlobalExceptionHandlerTest.java
+++ b/src/test/java/lt/satsyuk/exception/GlobalExceptionHandlerTest.java
@@ -2,9 +2,9 @@
 
 import lt.satsyuk.dto.AppResponse;
 import lt.satsyuk.service.MessageService;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.context.MessageSource;
@@ -26,13 +26,9 @@ class GlobalExceptionHandlerTest {
     @Mock
     private MessageService messageService;
 
+    @InjectMocks
     private GlobalExceptionHandler handler;
 
-    @BeforeEach
-    void setUp() {
-        handler = new GlobalExceptionHandler(messageSource, messageService);
-    }
-
     @Test
     void handleIdempotencyKeyConflictReturns409() {
         String key = "550e8400-e29b-41d4-a716-446655440000";