diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index aea4924..a511c27 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -1500,11 +1500,13 @@
 {
     psa_status_t status = PSA_ERROR_INVALID_ARGUMENT;
 
-    status = psa_validate_key_location( attributes, p_drv );
+    status = psa_validate_key_location( psa_get_key_lifetime( attributes ),
+                                        p_drv );
     if( status != PSA_SUCCESS )
         return( status );
 
-    status = psa_validate_key_persistence( attributes );
+    status = psa_validate_key_persistence( psa_get_key_lifetime( attributes ),
+                                           psa_get_key_id( attributes ) );
     if( status != PSA_SUCCESS )
         return( status );