diff --git a/drivers/disk/Kconfig.sdmmc b/drivers/disk/Kconfig.sdmmc
index 1b65adccc4e..eb525b9a37b 100644
--- a/drivers/disk/Kconfig.sdmmc
+++ b/drivers/disk/Kconfig.sdmmc
@@ -27,13 +27,11 @@ config SDMMC_VOLUME_NAME
 
 config SDMMC_SUBSYS
 	bool "SDMMC access via SD subsystem"
-	select SD_STACK
 	select SDMMC_STACK
-	select SDHC
 	default y
 	depends on DT_HAS_ZEPHYR_SDMMC_DISK_ENABLED
 	help
-	  Enable SDMMC access via SD subsystem
+	  Enable SDMMC access via SD subsystem.
 
 config SDMMC_STM32
 	bool "STM32 SDMMC driver"
diff --git a/subsys/sd/Kconfig b/subsys/sd/Kconfig
index 9999213a422..891065cd995 100644
--- a/subsys/sd/Kconfig
+++ b/subsys/sd/Kconfig
@@ -3,17 +3,7 @@
 
 # SD stack configuration options
 
-menuconfig SD_STACK
-	bool "SD Card Support"
-	select SDHC
-	help
-	  Enable SD card support
-
-if SD_STACK
-
-module = SD
-module-str = SD stack
-source "subsys/logging/Kconfig.template.log_config"
+menu "SD"
 
 config SDMMC_STACK
 	bool "SDMMC protocol support"
@@ -26,6 +16,19 @@ config SDIO_STACK
 	help
 	  Enable SDIO protocol support. Required for SD I/O cards to function.
 
+config SD_STACK
+	bool
+	default y if SDMMC_STACK || SDIO_STACK
+	select SDHC
+	help
+	  Enable SD card support.
+
+if SD_STACK
+
+module = SD
+module-str = SD stack
+source "subsys/logging/Kconfig.template.log_config"
+
 config SD_INIT_TIMEOUT
 	int "Timeout while initializing SD card"
 	default 1500
@@ -83,3 +86,5 @@ config SD_UHS_PROTOCOL
 	  reduce code size, at the cost of data transfer speeds.
 
 endif # SD_STACK
+
+endmenu
diff --git a/tests/subsys/sd/sdmmc/prj.conf b/tests/subsys/sd/sdmmc/prj.conf
index 46b8b135cbe..186a5632a62 100644
--- a/tests/subsys/sd/sdmmc/prj.conf
+++ b/tests/subsys/sd/sdmmc/prj.conf
@@ -1,7 +1,5 @@
 CONFIG_TEST=y
 CONFIG_ZTEST=y
-CONFIG_SDHC=y
-CONFIG_SD_STACK=y
 CONFIG_SDMMC_STACK=y
 CONFIG_LOG=y
 CONFIG_ZTEST_NEW_API=y