diff --git a/scripts/mbedtls_framework/test_case.py b/scripts/mbedtls_framework/test_case.py
index 2ffe8e3f5..417bc1ca4 100644
--- a/scripts/mbedtls_framework/test_case.py
+++ b/scripts/mbedtls_framework/test_case.py
@@ -15,24 +15,21 @@ from . import psa_information
 from . import typing_util
 
 HASHES_3_6 = {
-    "PSA_WANT_ALG_MD5" : "MBEDTLS_MD_CAN_MD5",
-    "PSA_WANT_ALG_RIPEMD160" : "MBEDTLS_MD_CAN_RIPEMD160",
-    "PSA_WANT_ALG_SHA_1" : "MBEDTLS_MD_CAN_SHA1",
-    "PSA_WANT_ALG_SHA_224" : "MBEDTLS_MD_CAN_SHA224",
-    "PSA_WANT_ALG_SHA_256" : "MBEDTLS_MD_CAN_SHA256",
-    "PSA_WANT_ALG_SHA_384" : "MBEDTLS_MD_CAN_SHA384",
-    "PSA_WANT_ALG_SHA_512" : "MBEDTLS_MD_CAN_SHA512",
-    "PSA_WANT_ALG_SHA3_224" : "MBEDTLS_MD_CAN_SHA3_224",
-    "PSA_WANT_ALG_SHA3_256" : "MBEDTLS_MD_CAN_SHA3_256",
-    "PSA_WANT_ALG_SHA3_384" : "MBEDTLS_MD_CAN_SHA3_384",
-    "PSA_WANT_ALG_SHA3_512" : "MBEDTLS_MD_CAN_SHA3_512"
+    "PSA_ALG_MD5" : "MBEDTLS_MD_CAN_MD5",
+    "PSA_ALG_RIPEMD160" : "MBEDTLS_MD_CAN_RIPEMD160",
+    "PSA_ALG_SHA_1" : "MBEDTLS_MD_CAN_SHA1",
+    "PSA_ALG_SHA_224" : "MBEDTLS_MD_CAN_SHA224",
+    "PSA_ALG_SHA_256" : "MBEDTLS_MD_CAN_SHA256",
+    "PSA_ALG_SHA_384" : "MBEDTLS_MD_CAN_SHA384",
+    "PSA_ALG_SHA_512" : "MBEDTLS_MD_CAN_SHA512",
+    "PSA_ALG_SHA3_224" : "MBEDTLS_MD_CAN_SHA3_224",
+    "PSA_ALG_SHA3_256" : "MBEDTLS_MD_CAN_SHA3_256",
+    "PSA_ALG_SHA3_384" : "MBEDTLS_MD_CAN_SHA3_384",
+    "PSA_ALG_SHA3_512" : "MBEDTLS_MD_CAN_SHA3_512"
 }
 
 PK_MACROS_3_6 = {
-    "PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY" : "MBEDTLS_PK_HAVE_ECC_KEYS",
-    "PSA_HAVE_ALG_SOME_ECDSA" : "MBEDTLS_PK_CAN_ECDSA_SOME",
-    "PSA_HAVE_ALG_ECDSA_SIGN" : "MBEDTLS_PK_CAN_ECDSA_SIGN",
-    "PSA_HAVE_ALG_ECSA_VERIFY" : "MBEDTS_PK_CAN_ECDSA_VERIFY"
+    "PSA_KEY_TYPE_ECC_PUBLIC_KEY" : "MBEDTLS_PK_HAVE_ECC_KEYS"
 }
 
 def hex_string(data: bytes) -> str: