diff --git a/src/main/java/it/gov/pagopa/tpp/dto/TppDTO.java b/src/main/java/it/gov/pagopa/tpp/dto/TppDTO.java
index 2a94fc4..dee7af9 100644
--- a/src/main/java/it/gov/pagopa/tpp/dto/TppDTO.java
+++ b/src/main/java/it/gov/pagopa/tpp/dto/TppDTO.java
@@ -18,7 +18,7 @@ public class TppDTO {
     private String tppId;
 
     @NotBlank(message = "Entity ID must not be blank")
-    @Pattern(regexp = "^(\\d{11}|[A-Za-z0-9]{1,16})$",
+    @Pattern(regexp = "^(\\d{11}|[A-Za-z0-9]{16})$",
             message = "Entity ID must be 11 digits or up to 16 alphanumeric characters")
     private String entityId;
     private String idPsp;
diff --git a/src/test/java/it/gov/pagopa/tpp/faker/TppDTOFaker.java b/src/test/java/it/gov/pagopa/tpp/faker/TppDTOFaker.java
index ba6de8a..74ea1e3 100644
--- a/src/test/java/it/gov/pagopa/tpp/faker/TppDTOFaker.java
+++ b/src/test/java/it/gov/pagopa/tpp/faker/TppDTOFaker.java
@@ -11,11 +11,11 @@ private TppDTOFaker(){}
     public static TppDTO mockInstance(Boolean bias) {
         return TppDTO.builder()
                 .tppId("tppId")
-                .messageUrl("messageUrl")
-                .authenticationUrl("AuthenticationUrl")
+                .messageUrl("https://wwwmessageUrl.it")
+                .authenticationUrl("https://www.AuthenticationUrl.it")
                 .authenticationType(AuthenticationType.OAUTH2)
                 .state(bias)
-                .entityId("entityId")
+                .entityId("entityId01234567")
                 .businessName("businessName")
                 .contact(new Contact("name","number", "email"))
                 .build();