diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
index 38c0698..5e150f2 100755
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@@ -3713,6 +3713,9 @@
     scripts/config.py unset MBEDTLS_CCM_C
     scripts/config.py unset MBEDTLS_CHACHAPOLY_C
 
+    # Disable CCM_STAR_NO_TAG because this re-enables CCM_C.
+    scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_CCM_STAR_NO_TAG
+
     # Build
     # -----