diff --git a/src/test/java/it/gov/pagopa/payhub/auth/service/ValidateTokenServiceTest.java b/src/test/java/it/gov/pagopa/payhub/auth/service/ValidateTokenServiceTest.java
index 485567d3..823a9b92 100644
--- a/src/test/java/it/gov/pagopa/payhub/auth/service/ValidateTokenServiceTest.java
+++ b/src/test/java/it/gov/pagopa/payhub/auth/service/ValidateTokenServiceTest.java
@@ -3,6 +3,7 @@
 import com.auth0.jwt.JWT;
 import com.auth0.jwt.interfaces.DecodedJWT;
 import it.gov.pagopa.payhub.auth.exception.custom.InvalidTokenException;
+import it.gov.pagopa.payhub.auth.service.exchange.AccessTokenBuilderService;
 import it.gov.pagopa.payhub.auth.utils.JWTValidator;
 import org.junit.jupiter.api.Assertions;
 
@@ -55,7 +56,7 @@ void givenValidJWTThenOk() {
 
     Assertions.assertDoesNotThrow(() -> jwtValidator.validateInternalToken(validToken, PUBLIC_KEY));
     Assertions.assertDoesNotThrow(() -> validateTokenService.validate(validToken));
-    Assertions.assertEquals(ValidateTokenService.ALLOWED_TYPE, jwt.getHeaderClaim("typ").asString());
+    Assertions.assertEquals(AccessTokenBuilderService.ACCESS_TOKEN_TYPE, jwt.getHeaderClaim("typ").asString());
   }
 
   @Test
diff --git a/src/test/java/it/gov/pagopa/payhub/auth/utils/JWTValidatorTest.java b/src/test/java/it/gov/pagopa/payhub/auth/utils/JWTValidatorTest.java
index 7ab8c39d..90940fd8 100644
--- a/src/test/java/it/gov/pagopa/payhub/auth/utils/JWTValidatorTest.java
+++ b/src/test/java/it/gov/pagopa/payhub/auth/utils/JWTValidatorTest.java
@@ -70,7 +70,9 @@ void givenInvalidTokenThenThrowInvalidTokenException() {
     void givenValidInternalJWTThenOk() throws Exception {
         KeyPair keyPair = JWTValidatorUtils.generateKeyPair();
         String validToken = utils.generateInternalToken(keyPair,new Date(System.currentTimeMillis() + 3600000));
-        Assertions.assertDoesNotThrow(() -> jwtValidator.validateInternalToken(validToken, JWTValidatorUtils.getPublicKey(keyPair)));
+        String publicKey = JWTValidatorUtils.getPublicKey(keyPair);
+
+        Assertions.assertDoesNotThrow(() -> jwtValidator.validateInternalToken(validToken, publicKey));
     }
 
     @Test
@@ -79,16 +81,18 @@ void givenInvalidInternalJWTThenInvalidTokenException() throws Exception {
         String invalidToken = utils.generateInternalToken(otherKeyPair, new Date(System.currentTimeMillis() + 3600000));
 
         KeyPair keyPair = JWTValidatorUtils.generateKeyPair();
+        String publicKey = JWTValidatorUtils.getPublicKey(keyPair);
 
-        assertThrows(InvalidTokenException.class, () -> jwtValidator.validateInternalToken(invalidToken, JWTValidatorUtils.getPublicKey(keyPair)));
+        assertThrows(InvalidTokenException.class, () -> jwtValidator.validateInternalToken(invalidToken, publicKey));
     }
 
     @Test
     void givenTokenExpiredThenTokenExpiredException() throws Exception {
         KeyPair keyPair = JWTValidatorUtils.generateKeyPair();
         String invalidToken = utils.generateInternalToken(keyPair, new Date(System.currentTimeMillis() - 3600000));
+        String publicKey = JWTValidatorUtils.getPublicKey(keyPair);
 
-        assertThrows(TokenExpiredException.class, () -> jwtValidator.validateInternalToken(invalidToken, JWTValidatorUtils.getPublicKey(keyPair)));
+        assertThrows(TokenExpiredException.class, () -> jwtValidator.validateInternalToken(invalidToken, publicKey));
     }
 
 }