diff --git a/programs/psa/aead_cipher_psa.c b/programs/psa/aead_cipher_psa.c
index a2b47d1..bac3ea2 100644
--- a/programs/psa/aead_cipher_psa.c
+++ b/programs/psa/aead_cipher_psa.c
@@ -311,7 +311,10 @@
 
     olen = p - out;
     print_out( "aead  ", out, olen );
+
 exit:
+    /* required on errors, harmless on success */
+    psa_aead_abort( &op );
     return( status );
 }
 
@@ -336,6 +339,8 @@
                        msg2_part2, sizeof( msg2_part2 ) ) );
 
 exit:
+    psa_destroy_key( key );
+
     return( status );
 }
 
diff --git a/programs/psa/hmac_md_psa.c b/programs/psa/hmac_md_psa.c
index 003fb5c..49e1ece 100644
--- a/programs/psa/hmac_md_psa.c
+++ b/programs/psa/hmac_md_psa.c
@@ -150,6 +150,7 @@
 
 exit:
     psa_mac_abort( &op );
+    psa_destroy_key( key );
 
     return( status );
 }