diff --git a/datasafe-rest-impl/src/test/java/de/adorsys/datasafe/rest/impl/controller/AuthenticateControllerTest.java b/datasafe-rest-impl/src/test/java/de/adorsys/datasafe/rest/impl/controller/AuthenticateControllerTest.java
index a81629b90..b333dd7ae 100644
--- a/datasafe-rest-impl/src/test/java/de/adorsys/datasafe/rest/impl/controller/AuthenticateControllerTest.java
+++ b/datasafe-rest-impl/src/test/java/de/adorsys/datasafe/rest/impl/controller/AuthenticateControllerTest.java
@@ -38,13 +38,12 @@ public class AuthenticateControllerTest extends BaseDatasafeEndpointTest {
 
     @BeforeEach
     public void setup() {
+        openMocks = MockitoAnnotations.openMocks(this);
         when(dataSafeService.inboxService()).thenReturn(inboxService);
     }
 
     @Test
     void testAuthenticateSuccess() {
-        MockitoAnnotations.initMocks(this);
-
         UserDTO userDTO = new UserDTO();
         userDTO.setUserName("username");
         userDTO.setPassword("password");
diff --git a/datasafe-rest-impl/src/test/java/de/adorsys/datasafe/rest/impl/controller/UserControllerTest.java b/datasafe-rest-impl/src/test/java/de/adorsys/datasafe/rest/impl/controller/UserControllerTest.java
index c115fccf3..6bf75ebde 100644
--- a/datasafe-rest-impl/src/test/java/de/adorsys/datasafe/rest/impl/controller/UserControllerTest.java
+++ b/datasafe-rest-impl/src/test/java/de/adorsys/datasafe/rest/impl/controller/UserControllerTest.java
@@ -16,6 +16,7 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
+import org.mockito.MockitoAnnotations;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.MediaType;
 import org.springframework.restdocs.mockmvc.RestDocumentationResultHandler;
@@ -51,6 +52,7 @@ class UserControllerTest extends BaseTokenDatasafeEndpointTest {
 
     @BeforeEach
     public void setup() {
+        openMocks = MockitoAnnotations.openMocks(this);
         when(dataSafeService.userProfile()).thenReturn(userProfile);
         gson = new Gson();
     }
diff --git a/datasafe-types-api/src/test/java/de/adorsys/datasafe/types/api/shared/BaseMockitoTest.java b/datasafe-types-api/src/test/java/de/adorsys/datasafe/types/api/shared/BaseMockitoTest.java
index faad83a75..c4544d1c7 100644
--- a/datasafe-types-api/src/test/java/de/adorsys/datasafe/types/api/shared/BaseMockitoTest.java
+++ b/datasafe-types-api/src/test/java/de/adorsys/datasafe/types/api/shared/BaseMockitoTest.java
@@ -13,7 +13,7 @@
  */
 public abstract class BaseMockitoTest {
 
-    AutoCloseable openMocks;
+    public AutoCloseable openMocks;
 
     @BeforeEach
     public void setup() {