diff --git a/tests/scripts/components-compiler.sh b/tests/scripts/components-compiler.sh
index 91da83ab46..5a16fd930f 100644
--- a/tests/scripts/components-compiler.sh
+++ b/tests/scripts/components-compiler.sh
@@ -43,14 +43,6 @@ component_test_aesni_m32_clang () {
     grep -q mbedtls_aesni_has_support ./programs/test/selftest
 }
 
-support_build_aes_aesce_armcc () {
-    support_build_armcc
-}
-
-support_test_block_cipher_no_decrypt_aesce_armcc () {
-    support_build_armcc
-}
-
 test_build_opt () {
     info=$1 cc=$2; shift 2
     $cc --version
diff --git a/tests/scripts/components-configuration-crypto.sh b/tests/scripts/components-configuration-crypto.sh
index 6316e1c299..944927fd1f 100644
--- a/tests/scripts/components-configuration-crypto.sh
+++ b/tests/scripts/components-configuration-crypto.sh
@@ -2164,6 +2164,10 @@ component_test_aesni_m32 () { # ~ 60s
     not grep -q mbedtls_aesni_has_support ./programs/test/selftest
 }
 
+support_build_aes_aesce_armcc () {
+    support_build_armcc
+}
+
 # For timebeing, no aarch64 gcc available in CI and no arm64 CI node.
 component_build_aes_aesce_armcc () {
     msg "Build: AESCE test on arm64 platform without plain C."
@@ -2514,6 +2518,10 @@ component_test_block_cipher_no_decrypt_aesni_use_psa () {
     common_block_cipher_no_decrypt
 }
 
+support_test_block_cipher_no_decrypt_aesce_armcc () {
+    support_build_armcc
+}
+
 component_test_block_cipher_no_decrypt_aesce_armcc () {
     scripts/config.py baremetal