diff --git a/subsys/random/Kconfig b/subsys/random/Kconfig
index 72106f09b57..0124bb28b10 100644
--- a/subsys/random/Kconfig
+++ b/subsys/random/Kconfig
@@ -107,6 +107,7 @@ config CTR_DRBG_CSPRNG_GENERATOR
 	bool "Use CTR-DRBG CSPRNG"
 	depends on MBEDTLS || TINYCRYPT
 	depends on ENTROPY_HAS_DRIVER
+	select MBEDTLS_CIPHER_AES_ENABLED if MBEDTLS
 	select TINYCRYPT_CTR_PRNG if TINYCRYPT
 	select TINYCRYPT_AES if TINYCRYPT
 	help
diff --git a/tests/crypto/mbedtls/prj.conf b/tests/crypto/mbedtls/prj.conf
index 7f9ee7aa459..6da7c1489b7 100644
--- a/tests/crypto/mbedtls/prj.conf
+++ b/tests/crypto/mbedtls/prj.conf
@@ -9,6 +9,5 @@ CONFIG_MINIMAL_LIBC_NON_REENTRANT_FUNCTIONS=y
 CONFIG_MINIMAL_LIBC_RAND=y
 CONFIG_ENTROPY_GENERATOR=y
 CONFIG_TEST_RANDOM_GENERATOR=y
-CONFIG_MBEDTLS_CIPHER_AES_ENABLED=y
 CONFIG_MBEDTLS_USE_PSA_CRYPTO=n
 CONFIG_PSA_CRYPTO_ENABLE_ALL=n