diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
index 4ef950a2fd..22611b9019 100755
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@@ -781,7 +781,7 @@ component_build_default_make_gcc_and_cxx () {
     make TEST_CPP=1
 }
 
-component_test_use_psa_crypto_cmake () {
+component_test_submodule_cmake () {
     # USE_CRYPTO_SUBMODULE: check that the build works with CMake
     msg "build: cmake, full config + USE_CRYPTO_SUBMODULE, gcc+debug"
     scripts/config.pl full # enables md4 and submodule doesn't enable md4
@@ -800,7 +800,7 @@ component_test_use_psa_crypto_cmake () {
     if_build_succeeded tests/ssl-opt.sh
 }
 
-component_test_use_psa_crypto_make () {
+component_test_submodule_make () {
     # USE_CRYPTO_SUBMODULE: check that the build works with make
     msg "build: make, full config + USE_CRYPTO_SUBMODULE, gcc+debug"
     scripts/config.pl full # enables md4 and submodule doesn't enable md4
@@ -818,7 +818,7 @@ component_test_use_psa_crypto_make () {
     if_build_succeeded tests/ssl-opt.sh
 }
 
-component_test_not_use_psa_crypto_make () {
+component_test_not_submodule_make () {
     # Don't USE_CRYPTO_SUBMODULE: check that the submodule is not used with make
     msg "build: make, full config - USE_CRYPTO_SUBMODULE, gcc+debug"
     scripts/config.pl full
@@ -829,7 +829,7 @@ component_test_not_use_psa_crypto_make () {
     if_build_succeeded objdump -g library/libmbedcrypto.a | grep -E 'library$' | not grep 'crypto' > /dev/null
 }
 
-component_test_not_use_psa_crypto_cmake () {
+component_test_not_submodule_cmake () {
     # Don't USE_CRYPTO_SUBMODULE: check that the submodule is not used with CMake
     msg "build: cmake, full config - USE_CRYPTO_SUBMODULE, gcc+debug"
     scripts/config.pl full