diff --git a/Makefile b/Makefile
index 872bc15..536c003 100644
--- a/Makefile
+++ b/Makefile
@@ -139,7 +139,7 @@ endif
 
 # EIP-712
 ifneq ($(TARGET_NAME),TARGET_NANOS)
-DEFINES	+= HAVE_EIP712_FULL_SUPPORT
+DEFINES	+= HAVE_EIP712_FULL_SUPPORT HAVE_EIP712_TESTING_KEY
 endif
 
 # Enabling debug PRINTF
diff --git a/src_features/signMessageEIP712/entrypoint.c b/src_features/signMessageEIP712/entrypoint.c
index 754484c..3c43156 100644
--- a/src_features/signMessageEIP712/entrypoint.c
+++ b/src_features/signMessageEIP712/entrypoint.c
@@ -18,6 +18,15 @@
 #include "common_712.h"
 #include "path.h"
 
+#ifdef HAVE_EIP712_TESTING_KEY
+static const uint8_t EIP712_FEEDER_PUBLIC_KEY[] = {
+    0x04, 0x4c, 0xca, 0x8f, 0xad, 0x49, 0x6a, 0xa5, 0x04, 0x0a, 0x00, 0xa7, 0xeb, 0x2f,
+    0x5c, 0xc3, 0xb8, 0x53, 0x76, 0xd8, 0x8b, 0xa1, 0x47, 0xa7, 0xd7, 0x05, 0x4a, 0x99,
+    0xc6, 0x40, 0x56, 0x18, 0x87, 0xfe, 0x17, 0xa0, 0x96, 0xe3, 0x6c, 0x3b, 0x52, 0x3b,
+    0x24, 0x4f, 0x3e, 0x2f, 0xf7, 0xf8, 0x40, 0xae, 0x26, 0xc4, 0xe7, 0x7a, 0xd3, 0xbc,
+    0x73, 0x9a, 0xf5, 0xde, 0x6f, 0x2d, 0x77, 0xa7, 0xb6
+};
+#endif // HAVE_EIP712_TESTING_KEY
 
 // lib functions
 const void *get_array_in_mem(const void *ptr, uint8_t *const array_size)
@@ -509,8 +518,13 @@ static bool verify_contract_name_signature(uint8_t dname_length,
             sizeof(hash));
 
     cx_ecfp_init_public_key(CX_CURVE_256K1,
+#ifdef HAVE_EIP712_TESTING_KEY
+                            EIP712_FEEDER_PUBLIC_KEY,
+                            sizeof(EIP712_FEEDER_PUBLIC_KEY),
+#else
                             LEDGER_SIGNATURE_PUBLIC_KEY,
                             sizeof(LEDGER_SIGNATURE_PUBLIC_KEY),
+#endif
                             &verifying_key);
     if (!cx_ecdsa_verify(&verifying_key,
                          CX_LAST,
@@ -522,7 +536,7 @@ static bool verify_contract_name_signature(uint8_t dname_length,
     {
 #ifndef HAVE_BYPASS_SIGNATURES
         PRINTF("Invalid EIP-712 contract filtering signature\n");
-        //return false; // TODO: Uncomment
+        return false;
 #endif
     }
     return true;
@@ -599,8 +613,13 @@ static bool verify_field_name_signature(uint8_t dname_length,
             INT256_LENGTH);
 
     cx_ecfp_init_public_key(CX_CURVE_256K1,
+#ifdef HAVE_EIP712_TESTING_KEY
+                            EIP712_FEEDER_PUBLIC_KEY,
+                            sizeof(EIP712_FEEDER_PUBLIC_KEY),
+#else
                             LEDGER_SIGNATURE_PUBLIC_KEY,
                             sizeof(LEDGER_SIGNATURE_PUBLIC_KEY),
+#endif
                             &verifying_key);
     if (!cx_ecdsa_verify(&verifying_key,
                          CX_LAST,
@@ -612,7 +631,7 @@ static bool verify_field_name_signature(uint8_t dname_length,
     {
 #ifndef HAVE_BYPASS_SIGNATURES
         PRINTF("Invalid EIP-712 field filtering signature\n");
-        //return false; // TODO: Uncomment
+        return false;
 #endif
     }
     return true;