diff --git a/tests/src/drivers/cipher.c b/tests/src/drivers/cipher.c
index 607cd94..295d47a 100644
--- a/tests/src/drivers/cipher.c
+++ b/tests/src/drivers/cipher.c
@@ -222,11 +222,8 @@
     if( test_driver_cipher_hooks.forced_status != PSA_SUCCESS )
         return( test_driver_cipher_hooks.forced_status );
 
-    return ( mbedtls_psa_cipher_encrypt_setup( operation,
-                                               attributes,
-                                               key,
-                                               key_length,
-                                               alg ) );
+    return ( mbedtls_transparent_test_driver_cipher_encrypt_setup(
+                 operation, attributes, key, key_length, alg ) );
 }
 
 psa_status_t test_transparent_cipher_decrypt_setup(
@@ -240,11 +237,8 @@
     if( test_driver_cipher_hooks.forced_status != PSA_SUCCESS )
         return( test_driver_cipher_hooks.forced_status );
 
-    return ( mbedtls_psa_cipher_decrypt_setup( operation,
-                                               attributes,
-                                               key,
-                                               key_length,
-                                               alg ) );
+    return ( mbedtls_transparent_test_driver_cipher_decrypt_setup(
+                 operation, attributes, key, key_length, alg ) );
 }
 
 psa_status_t test_transparent_cipher_abort(
@@ -255,7 +249,7 @@
     if( operation->alg == 0 )
         return( PSA_SUCCESS );
 
-    mbedtls_psa_cipher_abort( operation );
+    mbedtls_transparent_test_driver_cipher_abort( operation );
 
     /* Wiping the entire struct here, instead of member-by-member. This is
      * useful for the test suite, since it gives a chance of catching memory
@@ -277,10 +271,8 @@
     if( test_driver_cipher_hooks.forced_status != PSA_SUCCESS )
         return( test_driver_cipher_hooks.forced_status );
 
-    return( mbedtls_psa_cipher_generate_iv( operation,
-                                            iv,
-                                            iv_size,
-                                            iv_length ) );
+    return( mbedtls_transparent_test_driver_cipher_generate_iv(
+                operation, iv, iv_size, iv_length ) );
 }
 
 psa_status_t test_transparent_cipher_set_iv(
@@ -293,9 +285,8 @@
     if( test_driver_cipher_hooks.forced_status != PSA_SUCCESS )
         return( test_driver_cipher_hooks.forced_status );
 
-    return( mbedtls_psa_cipher_set_iv( operation,
-                                       iv,
-                                       iv_length ) );
+    return( mbedtls_transparent_test_driver_cipher_set_iv(
+                operation, iv, iv_length ) );
 }
 
 psa_status_t test_transparent_cipher_update(
@@ -324,10 +315,9 @@
     if( test_driver_cipher_hooks.forced_status != PSA_SUCCESS )
         return( test_driver_cipher_hooks.forced_status );
 
-    return( mbedtls_psa_cipher_update( operation,
-                                       input, input_length,
-                                       output, output_size,
-                                       output_length ) );
+    return( mbedtls_transparent_test_driver_cipher_update(
+                operation, input, input_length,
+                output, output_size, output_length ) );
 }
 
 psa_status_t test_transparent_cipher_finish(
@@ -354,9 +344,8 @@
     if( test_driver_cipher_hooks.forced_status != PSA_SUCCESS )
         return( test_driver_cipher_hooks.forced_status );
 
-    return( mbedtls_psa_cipher_finish( operation,
-                                       output, output_size,
-                                       output_length ) );
+    return( mbedtls_transparent_test_driver_cipher_finish(
+                operation, output, output_size, output_length ) );
 }
 
 /*