diff --git a/ChangeLog.d/issue5065.txt b/ChangeLog.d/issue5065.txt
index f468c63ff..943ee47d9 100644
--- a/ChangeLog.d/issue5065.txt
+++ b/ChangeLog.d/issue5065.txt
@@ -1,4 +1,3 @@
 Bugfix
-   * Use switch statement instead if-else in
-     psa_aead_check_nonce_length()
-     and psa_aead_set_lengths(). Fixes #5065.
+   * Fix compile-time or run-time errors in PSA
+     AEAD functions when ChachaPoly is disabled. Fixes #5065.
diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
index ed5faf5db..28387f443 100755
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@@ -1597,15 +1597,15 @@ component_test_psa_crypto_config_no_driver() {
 }
 
 component_test_psa_crypto_config_chachapoly_disabled() {
-    # full - MBEDTLS_CHACHAPOLY_C without PSA_WANT_ALG_GCM and PSA_WANT_ALG_CHACHA20_POLY1305
-    msg "build: full - MBEDTLS_CHACHAPOLY_C without PSA_WANT_ALG_GCM and PSA_WANT_ALG_CHACHA20_POLY1305"
+    # full minus MBEDTLS_CHACHAPOLY_C without PSA_WANT_ALG_GCM and PSA_WANT_ALG_CHACHA20_POLY1305
+    msg "build: full minus MBEDTLS_CHACHAPOLY_C without PSA_WANT_ALG_GCM and PSA_WANT_ALG_CHACHA20_POLY1305"
     scripts/config.py full
     scripts/config.py unset MBEDTLS_CHACHAPOLY_C
     scripts/config.py -f include/psa/crypto_config.h unset PSA_WANT_ALG_GCM
     scripts/config.py -f include/psa/crypto_config.h unset PSA_WANT_ALG_CHACHA20_POLY1305
     make CC=gcc CFLAGS="$ASAN_CFLAGS -O2" LDFLAGS="$ASAN_CFLAGS"
 
-    msg "test: full - MBEDTLS_CHACHAPOLY_C without PSA_WANT_ALG_GCM and PSA_WANT_ALG_CHACHA20_POLY1305"
+    msg "test: full minus MBEDTLS_CHACHAPOLY_C without PSA_WANT_ALG_GCM and PSA_WANT_ALG_CHACHA20_POLY1305"
     make test
 }