diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
index 2d807205f5..f84afd5518 100755
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@@ -3669,6 +3669,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() {
+    # Start from the crypto config (no X509 and TLS)
+    helper_libtestdriver1_adjust_config "crypto_full"
+
     scripts/config.py unset MBEDTLS_CTR_DRBG_C
     scripts/config.py unset MBEDTLS_NIST_KW_C
 }
@@ -3689,9 +3692,6 @@ component_test_psa_crypto_config_accel_cipher_aead () {
     # Configure
     # ---------
 
-    # Start from the crypto config (no X509 and TLS)
-    helper_libtestdriver1_adjust_config "crypto_full"
-
     common_psa_crypto_config_accel_cipher_aead
 
     # Disable the things that are being accelerated
@@ -3736,8 +3736,6 @@ component_test_psa_crypto_config_accel_cipher_aead () {
 }
 
 component_test_psa_crypto_config_reference_cipher_aead () {
-    helper_libtestdriver1_adjust_config "crypto_full"
-
     common_psa_crypto_config_accel_cipher_aead
 
     msg "test: crypto config with non-accelerated cipher and AEAD"