diff --git a/sys/crypto/Kconfig b/sys/crypto/Kconfig
index ce99ad759a..9311436a8a 100644
--- a/sys/crypto/Kconfig
+++ b/sys/crypto/Kconfig
@@ -5,28 +5,13 @@
 # directory for more details.
 #
 
-menu "Crypto"
-
-config MODULE_CRYPTO
-    bool "Common cryptographic functionalities"
+menuconfig MODULE_CRYPTO
+    bool "Crypto"
     depends on TEST_KCONFIG
 
-choice
-    bool "Crypto block ciphers API implementation"
-    optional
-    depends on TEST_KCONFIG
-    help
-        The common Crypto block ciphers API has multiple implementations. Choose
-        one of the following.
-
-config CRYPTO_AES
-    bool "AES"
-    select MODULE_CRYPTO
-
-endchoice
+if MODULE_CRYPTO
 
 menu "Crypto AES options"
-depends on CRYPTO_AES
 
 config MODULE_CRYPTO_AES_128
     bool "AES-128"
@@ -50,4 +35,4 @@ endmenu # Crypto AES options
 
 rsource "modes/Kconfig"
 
-endmenu # Crypto
+endif # Crypto
diff --git a/sys/random/Kconfig b/sys/random/Kconfig
index f771737ee7..21aaaabc67 100644
--- a/sys/random/Kconfig
+++ b/sys/random/Kconfig
@@ -25,7 +25,7 @@ config MODULE_PRNG_FORTUNA
     select MODULE_XTIMER
     select MODULE_FORTUNA
     select MODULE_CRYPTO
-    depends on MODULE_CRYPTO_AES
+    select MODULE_CRYPTO_AES_128
 
 config MODULE_PRNG_HWRNG
     bool "Hardware RNG"