diff --git a/tests/suites/test_suite_pk.function b/tests/suites/test_suite_pk.function
index 23a7b2523a..225ead4844 100644
--- a/tests/suites/test_suite_pk.function
+++ b/tests/suites/test_suite_pk.function
@@ -1711,7 +1711,7 @@ void pk_get_psa_attributes(int pk_type, int from_pair,
     psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
     psa_key_usage_t usage = usage_arg;
 
-    MD_OR_USE_PSA_INIT();
+    PSA_INIT();
 
     psa_key_type_t expected_psa_type = 0;
     if (!pk_setup_for_type(pk_type, from_pair, &pk, &expected_psa_type)) {
@@ -1772,7 +1772,7 @@ void pk_get_psa_attributes(int pk_type, int from_pair,
 exit:
     mbedtls_pk_free(&pk);
     psa_reset_key_attributes(&attributes);
-    MD_OR_USE_PSA_DONE();
+    PSA_DONE();
 }
 /* END_CASE */
 
@@ -1786,7 +1786,7 @@ void pk_rsa_v21_get_psa_attributes(int md_type, int from_pair,
     psa_key_usage_t usage = usage_arg;
     psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
 
-    MD_OR_USE_PSA_INIT();
+    PSA_INIT();
 
     psa_key_type_t expected_psa_type = 0;
     if (!pk_setup_for_type(MBEDTLS_PK_RSA, from_pair, &pk, &expected_psa_type)) {
@@ -1833,7 +1833,7 @@ void pk_rsa_v21_get_psa_attributes(int md_type, int from_pair,
 exit:
     mbedtls_pk_free(&pk);
     psa_reset_key_attributes(&attributes);
-    MD_OR_USE_PSA_DONE();
+    PSA_DONE();
 }
 /* END_CASE */
 
@@ -1847,7 +1847,7 @@ void pk_get_psa_attributes_fail(int pk_type, int from_pair,
     psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
     psa_key_usage_t usage = usage_arg;
 
-    MD_OR_USE_PSA_INIT();
+    PSA_INIT();
 
     psa_key_type_t expected_psa_type;
     if (!pk_setup_for_type(pk_type, from_pair, &pk, &expected_psa_type)) {
@@ -1860,7 +1860,7 @@ void pk_get_psa_attributes_fail(int pk_type, int from_pair,
 exit:
     mbedtls_pk_free(&pk);
     psa_reset_key_attributes(&attributes);
-    MD_OR_USE_PSA_DONE();
+    PSA_DONE();
 }
 /* END_CASE */