diff --git a/crypto/Kconfig b/crypto/Kconfig
index 6f5c50fdbbdd41b02f487bcee9c3316696dcc75c..e573077f1672e06bf159c9a242564c5436fc0a75 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -103,7 +103,8 @@ config CRYPTO_MANAGER2
 
 config CRYPTO_MANAGER_DISABLE_TESTS
 	bool "Disable run-time self tests"
-	depends on CRYPTO_MANAGER2 && EMBEDDED
+	default y
+	depends on CRYPTO_MANAGER2
 	help
 	  Disable run-time self tests that normally take place at
 	  algorithm registration.