diff --git a/tests/include/test/drivers/asym.h b/tests/include/test/drivers/asymmetric_encryption.h
similarity index 74%
rename from tests/include/test/drivers/asym.h
rename to tests/include/test/drivers/asymmetric_encryption.h
index 82a9d8c..2babfea 100644
--- a/tests/include/test/drivers/asym.h
+++ b/tests/include/test/drivers/asymmetric_encryption.h
@@ -1,5 +1,5 @@
 /*
- * Test driver for hash driver entry points.
+ * Test driver for asymmetric encryption.
  */
 /*  Copyright The Mbed TLS Contributors
  *  SPDX-License-Identifier: Apache-2.0
@@ -17,8 +17,8 @@
  *  limitations under the License.
  */
 
-#ifndef PSA_CRYPTO_TEST_DRIVERS_ASYM_H
-#define PSA_CRYPTO_TEST_DRIVERS_ASYM_H
+#ifndef PSA_CRYPTO_TEST_DRIVERS_ASYMMETRIC_ENCRYPTION_H
+#define PSA_CRYPTO_TEST_DRIVERS_ASYMMETRIC_ENCRYPTION_H
 
 #include "mbedtls/build_info.h"
 
@@ -33,20 +33,23 @@
     /* If not PSA_SUCCESS, return this error code instead of processing the
      * function call. */
     psa_status_t forced_status;
-    /* Count the amount of times one of the rsa driver functions is called. */
+    /* Count the amount of times one of the asymmetric_encryption driver 
+       functions is called. */
     unsigned long hits;
-} mbedtls_test_driver_rsa_hooks_t;
+} mbedtls_test_driver_asymmetric_encryption_hooks_t;
 
-#define MBEDTLS_TEST_DRIVER_RSA_INIT { NULL, 0, PSA_SUCCESS, 0 }
+#define MBEDTLS_TEST_DRIVER_ASYMMETRIC_ENCRYPTION_INIT { NULL, 0, PSA_SUCCESS, 0 }
 
-static inline mbedtls_test_driver_rsa_hooks_t
-     mbedtls_test_driver_rsa_hooks_init( void )
+static inline mbedtls_test_driver_asymmetric_encryption_hooks_t
+     mbedtls_test_driver_asymmetric_encryption_hooks_init( void )
 {
-    const mbedtls_test_driver_rsa_hooks_t v = MBEDTLS_TEST_DRIVER_RSA_INIT;
+    const mbedtls_test_driver_asymmetric_encryption_hooks_t v =
+        MBEDTLS_TEST_DRIVER_ASYMMETRIC_ENCRYPTION_INIT;
     return( v );
 }
 
-extern mbedtls_test_driver_rsa_hooks_t mbedtls_test_driver_rsa_hooks;
+extern mbedtls_test_driver_asymmetric_encryption_hooks_t 
+    mbedtls_test_driver_asymmetric_encryption_hooks;
 
 psa_status_t mbedtls_test_transparent_asymmetric_encrypt(
     const psa_key_attributes_t *attributes, const uint8_t *key_buffer,
@@ -73,4 +76,4 @@
     uint8_t *output, size_t output_size, size_t *output_length );
 
 #endif /* PSA_CRYPTO_DRIVER_TEST */
-#endif /* PSA_CRYPTO_TEST_DRIVERS_ASYM_H */
+#endif /* PSA_CRYPTO_TEST_DRIVERS_ASYMMETRIC_ENCRYPTION_H */
diff --git a/tests/include/test/drivers/test_driver.h b/tests/include/test/drivers/test_driver.h
index af19e42..098b21a 100644
--- a/tests/include/test/drivers/test_driver.h
+++ b/tests/include/test/drivers/test_driver.h
@@ -28,6 +28,6 @@
 #include "test/drivers/mac.h"
 #include "test/drivers/key_management.h"
 #include "test/drivers/signature.h"
-#include "test/drivers/asym.h"
+#include "test/drivers/asymmetric_encryption.h"
 
 #endif /* PSA_CRYPTO_TEST_DRIVER_H */