diff --git a/programs/test/selftest.c b/programs/test/selftest.c
index 546716f12d..4794cefd24 100644
--- a/programs/test/selftest.c
+++ b/programs/test/selftest.c
@@ -309,9 +309,6 @@ const selftest_t selftests[] =
 #if defined(MBEDTLS_CCM_C) && defined(MBEDTLS_AES_C)
     { "ccm", mbedtls_ccm_self_test },
 #endif
-#if defined(MBEDTLS_NIST_KW_C) && defined(MBEDTLS_AES_C)
-    { "nist_kw", mbedtls_nist_kw_self_test },
-#endif
 #if defined(MBEDTLS_CMAC_C)
     { "cmac", mbedtls_cmac_self_test },
 #endif
diff --git a/tests/scripts/components-configuration-crypto.sh b/tests/scripts/components-configuration-crypto.sh
index cb66e371cb..bf537a9ccd 100644
--- a/tests/scripts/components-configuration-crypto.sh
+++ b/tests/scripts/components-configuration-crypto.sh
@@ -382,6 +382,9 @@ component_test_full_no_ccm_star_no_tag () {
     scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_CFB
     scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_OFB
     scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_ECB_NO_PADDING
+    # NOTE unsettting PSA_WANT_ALG_ECB_NO_PADDING without unsetting NIST_KW_C will
+    # mean PSA_WANT_ALG_ECB_NO_PADDING is re-enabled, so disabling it also.
+    scripts/config.py -f "$CRYPTO_CONFIG_H" unset MBEDTLS_NIST_KW_C
     scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_CBC_NO_PADDING
     scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_CBC_PKCS7
 
diff --git a/tests/scripts/depends.py b/tests/scripts/depends.py
index 816d2debae..5e025ba79b 100755
--- a/tests/scripts/depends.py
+++ b/tests/scripts/depends.py
@@ -350,6 +350,7 @@ REVERSE_DEPENDENCIES = {
                         'PSA_WANT_ALG_SHA3_256',
                         'PSA_WANT_ALG_SHA3_384',
                         'PSA_WANT_ALG_SHA3_512'],
+    'PSA_WANT_ALG_ECB_NO_PADDING' : ['MBEDTLS_NIST_KW_C'],
 }
 
 # If an option is tested in an exclusive test, alter the following defines.