diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
index 459567da3..d169b58da 100755
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@@ -3600,12 +3600,9 @@ component_test_psa_crypto_config_accel_aead () {
 # - component_test_psa_crypto_config_accel_cipher_aead
 # - component_test_psa_crypto_config_reference_cipher_aead
 common_psa_crypto_config_accel_cipher_aead() {
-    scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_CMAC
     scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_STREAM_CIPHER
     scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_ECB_NO_PADDING
-    scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128
     scripts/config.py unset MBEDTLS_CTR_DRBG_C
-    scripts/config.py unset MBEDTLS_CMAC_C
     scripts/config.py unset MBEDTLS_NIST_KW_C
 }
 
@@ -3618,7 +3615,7 @@ component_test_psa_crypto_config_accel_cipher_aead () {
     msg "test: crypto config with accelerated cipher and AEAD"
 
     loc_accel_list="ALG_CBC_NO_PADDING ALG_CBC_PKCS7 ALG_CTR ALG_CFB ALG_OFB ALG_XTS \
-                    ALG_GCM ALG_CCM ALG_CHACHA20_POLY1305 \
+                    ALG_GCM ALG_CCM ALG_CHACHA20_POLY1305 ALG_CMAC \
                     KEY_TYPE_DES KEY_TYPE_AES KEY_TYPE_ARIA KEY_TYPE_CHACHA20 KEY_TYPE_CAMELLIA"
 
     # Configure
@@ -3639,6 +3636,7 @@ component_test_psa_crypto_config_accel_cipher_aead () {
     scripts/config.py unset MBEDTLS_GCM_C
     scripts/config.py unset MBEDTLS_CCM_C
     scripts/config.py unset MBEDTLS_CHACHAPOLY_C
+    scripts/config.py unset MBEDTLS_CMAC_C
     scripts/config.py unset MBEDTLS_DES_C
     scripts/config.py unset MBEDTLS_AES_C
     scripts/config.py unset MBEDTLS_ARIA_C
diff --git a/tests/scripts/analyze_outcomes.py b/tests/scripts/analyze_outcomes.py
index b669d4b79..e1d465d1d 100755
--- a/tests/scripts/analyze_outcomes.py
+++ b/tests/scripts/analyze_outcomes.py
@@ -251,6 +251,7 @@ KNOWN_TASKS = {
                 'gcm.aes256_en',
                 'gcm.camellia',
                 'gcm.misc',
+                'cmac',
             ],
             'ignored_tests': {
                 # Following tests depends on AES_C/DES_C