diff --git a/tests/suites/test_suite_psa_crypto.data b/tests/suites/test_suite_psa_crypto.data
index 36f48f2..71f5b8e 100644
--- a/tests/suites/test_suite_psa_crypto.data
+++ b/tests/suites/test_suite_psa_crypto.data
@@ -5185,7 +5185,7 @@
 
 PSA key derivation setup: algorithm from bad hash
 depends_on:PSA_WANT_ALG_SHA_256
-derive_setup:PSA_ALG_HKDF(PSA_ALG_CATEGORY_HASH):PSA_ERROR_INVALID_ARGUMENT
+derive_setup:PSA_ALG_HKDF(PSA_ALG_CATEGORY_HASH):PSA_ERROR_NOT_SUPPORTED
 
 PSA key derivation setup: bad algorithm
 depends_on:PSA_WANT_ALG_SHA_256
@@ -6329,25 +6329,28 @@
 derive_set_capacity:PSA_ALG_TLS12_ECJPAKE_TO_PMS:PSA_HASH_LENGTH(PSA_ALG_SHA_256) + 1:PSA_ERROR_INVALID_ARGUMENT
 
 # This test case will work correctly on 64-bit machines
-#PSA key derivation: PBKDF2-HMAC-SHA256, request too much capacity
-#depends_on:PSA_WANT_ALG_PBKDF2_HMAC:PSA_WANT_ALG_SHA_256
-#erive_set_capacity:PSA_ALG_PBKDF2_HMAC(PSA_ALG_SHA_256):UINT32_MAX * PSA_HASH_LENGTH(PSA_ALG_SHA_256) + 1:PSA_ERROR_INVALID_ARGUMENT
+PSA key derivation: PBKDF2-HMAC-SHA256, request too much capacity
+depends_on:PSA_WANT_ALG_PBKDF2_HMAC:PSA_WANT_ALG_SHA_256
+derive_set_capacity:PSA_ALG_PBKDF2_HMAC(PSA_ALG_SHA_256):4294967295UL * PSA_HASH_LENGTH(PSA_ALG_SHA_256) + 1:PSA_ERROR_INVALID_ARGUMENT
 
+# This test case will work correctly on 64-bit machines
 PSA key derivation: PBKDF2-AES-CMAC-PRF-128, request too much capacity
 depends_on:PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_AES
-derive_set_capacity:PSA_ALG_PBKDF2_AES_CMAC_PRF_128:UINT32_MAX * PSA_BLOCK_CIPHER_BLOCK_MAX_SIZE + 1:PSA_ERROR_INVALID_ARGUMENT
+derive_set_capacity:PSA_ALG_PBKDF2_AES_CMAC_PRF_128:4294967295UL * PSA_BLOCK_CIPHER_BLOCK_MAX_SIZE + 1:PSA_ERROR_INVALID_ARGUMENT
 
 PSA key derivation: TLS 1.2 PRF, request maximum capacity
 depends_on:PSA_WANT_ALG_TLS12_PRF:PSA_WANT_ALG_SHA_256
 derive_set_capacity:PSA_ALG_TLS12_PRF(PSA_ALG_SHA_256):SIZE_MAX:PSA_SUCCESS
 
+# This test case will work correctly on 64-bit machines
 PSA key derivation: PBKDF2-HMAC-SHA256, request maximum capacity
 depends_on:PSA_WANT_ALG_PBKDF2_HMAC:PSA_WANT_ALG_SHA_256
-derive_set_capacity:PSA_ALG_PBKDF2_HMAC(PSA_ALG_SHA_256):UINT32_MAX * PSA_HASH_LENGTH(PSA_ALG_SHA_256):PSA_SUCCESS
+derive_set_capacity:PSA_ALG_PBKDF2_HMAC(PSA_ALG_SHA_256):4294967295UL * PSA_HASH_LENGTH(PSA_ALG_SHA_256):PSA_SUCCESS
 
+# This test case will work correctly on 64-bit machines
 PSA key derivation: PBKDF2-AES-CMAC-PRF-128, request maximum capacity
 depends_on:PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_AES
-derive_set_capacity:PSA_ALG_PBKDF2_AES_CMAC_PRF_128:UINT32_MAX * PSA_BLOCK_CIPHER_BLOCK_MAX_SIZE:PSA_SUCCESS
+derive_set_capacity:PSA_ALG_PBKDF2_AES_CMAC_PRF_128:4294967295UL * PSA_BLOCK_CIPHER_BLOCK_MAX_SIZE:PSA_SUCCESS
 
 PSA key derivation: over capacity 42: output 42+1
 depends_on:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_SHA_256
@@ -7078,7 +7081,7 @@
 
 PSA key agreement setup: ECDH, unknown KDF
 depends_on:PSA_WANT_ALG_ECDH:PSA_WANT_ALG_HKDF:PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY:PSA_WANT_ECC_SECP_R1_256
-key_agreement_setup:PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_HKDF(0)):PSA_KEY_TYPE_ECC_KEY_PAIR(PSA_ECC_FAMILY_SECP_R1):PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_HKDF(0)):"c88f01f510d9ac3f70a292daa2316de544e9aab8afe84049c62a9c57862d1433":"04d12dfb5289c8d4f81208b70270398c342296970a0bccb74c736fc7554494bf6356fbf3ca366cc23e8157854c13c58d6aac23f046ada30f8353e74f33039872ab":PSA_ERROR_INVALID_ARGUMENT
+key_agreement_setup:PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_HKDF(0)):PSA_KEY_TYPE_ECC_KEY_PAIR(PSA_ECC_FAMILY_SECP_R1):PSA_ALG_KEY_AGREEMENT(PSA_ALG_ECDH, PSA_ALG_HKDF(0)):"c88f01f510d9ac3f70a292daa2316de544e9aab8afe84049c62a9c57862d1433":"04d12dfb5289c8d4f81208b70270398c342296970a0bccb74c736fc7554494bf6356fbf3ca366cc23e8157854c13c58d6aac23f046ada30f8353e74f33039872ab":PSA_ERROR_NOT_SUPPORTED
 
 PSA key agreement setup: bad key agreement algorithm
 depends_on:PSA_WANT_ALG_HKDF:PSA_WANT_ALG_SHA_256:PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_DERIVE:PSA_WANT_ECC_SECP_R1_256