diff --git a/ChangeLog.d/8825.txt b/ChangeLog.d/8825.txt
index f892f806d7..914bd08fdd 100644
--- a/ChangeLog.d/8825.txt
+++ b/ChangeLog.d/8825.txt
@@ -2,5 +2,5 @@ Features
    * mbedtls_psa_get_random() is always available as soon as
      MBEDTLS_PSA_CRYPTO_CLIENT is enabled at build time and psa_crypto_init() is
      called at runtime. This together with MBEDTLS_PSA_RANDOM_STATE can be
-     used as random number generator function(f_rng) and context (p_rng) in
+     used as random number generator function (f_rng) and context (p_rng) in
      legacy functions.
diff --git a/tests/src/psa_crypto_stubs.c b/tests/src/psa_crypto_stubs.c
index be011213f9..f3ca850747 100644
--- a/tests/src/psa_crypto_stubs.c
+++ b/tests/src/psa_crypto_stubs.c
@@ -22,4 +22,4 @@ psa_status_t psa_generate_random(uint8_t *output,
     return PSA_ERROR_COMMUNICATION_FAILURE;
 }
 
-#endif /* MBEDTLS_PSA_CRYPTO_CLIENT !MBEDTLS_PSA_CRYPTO_C */
+#endif /* MBEDTLS_PSA_CRYPTO_CLIENT && !MBEDTLS_PSA_CRYPTO_C */