diff --git a/src/test/java/it/gov/pagopa/payhub/auth/service/AuthzServiceTest.java b/src/test/java/it/gov/pagopa/payhub/auth/service/AuthzServiceTest.java
index 30e68dad..a479839e 100644
--- a/src/test/java/it/gov/pagopa/payhub/auth/service/AuthzServiceTest.java
+++ b/src/test/java/it/gov/pagopa/payhub/auth/service/AuthzServiceTest.java
@@ -272,7 +272,7 @@ void whenGetUserInfoFromMappedExternalUserIdThenUserNotFound() {
     }
 
     @Test
-    void whenGetClientIdThenGetClientSecret() {
+    void givenClientIdWhenGetClientSecretThenInvokeClientService() {
         //Given
         String organizationIpaCode = "organizationIpaCode";
         String clientId = "clientId";
diff --git a/src/test/java/it/gov/pagopa/payhub/auth/service/a2a/ClientServiceTest.java b/src/test/java/it/gov/pagopa/payhub/auth/service/a2a/ClientServiceTest.java
index ad16cb36..52061933 100644
--- a/src/test/java/it/gov/pagopa/payhub/auth/service/a2a/ClientServiceTest.java
+++ b/src/test/java/it/gov/pagopa/payhub/auth/service/a2a/ClientServiceTest.java
@@ -1,12 +1,11 @@
 package it.gov.pagopa.payhub.auth.service.a2a;
 
+import it.gov.pagopa.payhub.auth.mapper.ClientMapper;
 import it.gov.pagopa.payhub.auth.model.Client;
 import it.gov.pagopa.payhub.auth.service.DataCipherService;
 import it.gov.pagopa.payhub.auth.service.a2a.registration.ClientRegistrationService;
-import it.gov.pagopa.payhub.auth.mapper.ClientMapper;
 import it.gov.pagopa.payhub.auth.service.a2a.retrieve.ClientRetrieverService;
 import it.gov.pagopa.payhub.model.generated.ClientDTO;
-import org.apache.commons.lang3.RandomUtils;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
@@ -16,6 +15,7 @@
 import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
 
+import java.util.Random;
 import java.util.UUID;
 
 @ExtendWith(MockitoExtension.class)
@@ -68,11 +68,12 @@ void whenRegisterClientThenIInvokeClientRegistrationService() {
 	}
 
 	@Test
-	void whenGetClientIdThenGetClientSecret() {
+	void givenClientIdWhenGetEncryptedClientSecretThenGetClientSecret() {
 		// Given
 		String organizationIpaCode = "organizationIpaCode";
 		String clientId = "clientId";
-		byte[] encryptedClientSecret = RandomUtils.nextBytes(16);
+		byte[] encryptedClientSecret = new byte[16];
+		new Random().nextBytes(encryptedClientSecret);
 		String clientSecretMock = UUID.randomUUID().toString();
 
 		Mockito.doReturn(encryptedClientSecret).when(clientRetrieverServiceMock).getClientSecret(organizationIpaCode, clientId);
diff --git a/src/test/java/it/gov/pagopa/payhub/auth/service/a2a/retrieve/ClientRetrieverServiceTest.java b/src/test/java/it/gov/pagopa/payhub/auth/service/a2a/retrieve/ClientRetrieverServiceTest.java
index 79edbcdc..da77d799 100644
--- a/src/test/java/it/gov/pagopa/payhub/auth/service/a2a/retrieve/ClientRetrieverServiceTest.java
+++ b/src/test/java/it/gov/pagopa/payhub/auth/service/a2a/retrieve/ClientRetrieverServiceTest.java
@@ -22,7 +22,7 @@ public class ClientRetrieverServiceTest {
 	private ClientRetrieverService service;
 
 	@Test
-	void whenGetClientIdThenReturnStoredClientSecret(){
+	void givenGetClientIdWhenReturnStoredClientSecretThenInvokeClientRetrieverService(){
 		// Given
 		String organizationIpaCode = "organizationIpaCode";
 		String clientName = "clientName";