diff --git a/include/psa/crypto_driver_contexts.h b/include/psa/crypto_driver_contexts.h
index f3f08b8eb..bee6895e8 100644
--- a/include/psa/crypto_driver_contexts.h
+++ b/include/psa/crypto_driver_contexts.h
@@ -30,8 +30,8 @@
  * declared during the autogeneration process. */
 
 /* Include the context structure definitions for the Mbed TLS software drivers */
-#include "psa/crypto_builtin_hash.h"
 #include "psa/crypto_builtin_cipher.h"
+#include "psa/crypto_builtin_hash.h"
 
 /* Define the context to be used for an operation that is executed through the
  * PSA Driver wrapper layer as the union of all possible driver's contexts.
@@ -52,11 +52,8 @@ typedef union {
     unsigned dummy; /* Make sure this structure is always non-empty */
     mbedtls_psa_cipher_operation_t mbedtls_ctx;
 #if defined(PSA_CRYPTO_DRIVER_TEST)
-    mbedtls_transparent_test_driver_cipher_operation_t
-        transparent_test_driver_ctx;
-
-    mbedtls_opaque_test_driver_cipher_operation_t
-        opaque_test_driver_ctx;
+    mbedtls_transparent_test_driver_cipher_operation_t transparent_test_driver_ctx;
+    mbedtls_opaque_test_driver_cipher_operation_t opaque_test_driver_ctx;
 #endif
 } psa_driver_cipher_context_t;