diff --git a/configs/baremetal_test.h b/configs/baremetal_test.h
index 4b51212c4..82c0ed17c 100644
--- a/configs/baremetal_test.h
+++ b/configs/baremetal_test.h
@@ -43,6 +43,12 @@
 /* We don't have Secp256r1 test CRTs at the moment. */
 #define MBEDTLS_ECP_DP_SECP384R1_ENABLED
 
+/* Correct ECP configuration values */
+#undef MBEDTLS_ECP_MAX_BITS
+#undef MBEDTLS_MPI_MAX_SIZE
+#define MBEDTLS_ECP_MAX_BITS 384
+#define MBEDTLS_MPI_MAX_SIZE 48
+
 /* ssl_client2 and ssl_server2 use CTR-DRBG so far. */
 #define MBEDTLS_CTR_DRBG_C