diff --git a/tests/include/test/psa_crypto_helpers.h b/tests/include/test/psa_crypto_helpers.h
index dc2f4eb..9d5da02 100644
--- a/tests/include/test/psa_crypto_helpers.h
+++ b/tests/include/test/psa_crypto_helpers.h
@@ -11,10 +11,8 @@
 
 #include "test/helpers.h"
 
-#if ((MBEDTLS_VERSION_MAJOR < 4) \
-    && defined(MBEDTLS_PSA_CRYPTO_C)) \
-    || (MBEDTLS_VERSION_MAJOR >= 4 \
-        && defined(MBEDTLS_PSA_CRYPTO_CLIENT))
+#if (MBEDTLS_VERSION_MAJOR < 4 && defined(MBEDTLS_PSA_CRYPTO_C)) || \
+    (MBEDTLS_VERSION_MAJOR >= 4 && defined(MBEDTLS_PSA_CRYPTO_CLIENT))
 #include "test/psa_helpers.h"
 #include <psa/crypto.h>
 #endif
@@ -43,8 +41,7 @@
         mbedtls_psa_crypto_free();                                      \
     }                                                                   \
     while (0)
-#elif MBEDTLS_VERSION_MAJOR >= 4 && \
-    defined(MBEDTLS_PSA_CRYPTO_CLIENT)   /* MBEDTLS_PSA_CRYPTO_CLIENT && !MBEDTLS_PSA_CRYPTO_C */
+#elif MBEDTLS_VERSION_MAJOR >= 4 && defined(MBEDTLS_PSA_CRYPTO_CLIENT)
 #define PSA_INIT() PSA_ASSERT(psa_crypto_init())
 #define PSA_DONE() mbedtls_psa_crypto_free();
 #else  /* MBEDTLS_PSA_CRYPTO_CLIENT && !MBEDTLS_PSA_CRYPTO_C */
@@ -52,10 +49,8 @@
 #define PSA_DONE() ((void) 0)
 #endif /* MBEDTLS_PSA_CRYPTO_C */
 
-#if ((MBEDTLS_VERSION_MAJOR < 4) \
-    && defined(MBEDTLS_PSA_CRYPTO_C)) \
-    || (MBEDTLS_VERSION_MAJOR >= 4 \
-        && defined(MBEDTLS_PSA_CRYPTO_CLIENT))
+#if (MBEDTLS_VERSION_MAJOR < 4 && defined(MBEDTLS_PSA_CRYPTO_C)) || \
+    (MBEDTLS_VERSION_MAJOR >= 4 && defined(MBEDTLS_PSA_CRYPTO_CLIENT))
 
 #if defined(MBEDTLS_PSA_CRYPTO_STORAGE_C)
 
diff --git a/tests/src/psa_exercise_key.c b/tests/src/psa_exercise_key.c
index 5c821e2..032c489 100644
--- a/tests/src/psa_exercise_key.c
+++ b/tests/src/psa_exercise_key.c
@@ -11,10 +11,8 @@
 #include <test/macros.h>
 #include <test/psa_exercise_key.h>
 
-#if ((MBEDTLS_VERSION_MAJOR < 4) \
-    && defined(MBEDTLS_PSA_CRYPTO_C)) \
-    || (MBEDTLS_VERSION_MAJOR >= 4 \
-        && defined(MBEDTLS_PSA_CRYPTO_CLIENT))
+#if (MBEDTLS_VERSION_MAJOR < 4 && defined(MBEDTLS_PSA_CRYPTO_C)) || \
+    (MBEDTLS_VERSION_MAJOR >= 4 && defined(MBEDTLS_PSA_CRYPTO_CLIENT))
 
 #include <mbedtls/asn1.h>
 #include <psa/crypto.h>