diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index 8694e3c6d183..ba24db7eb4d6 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -226,10 +226,13 @@ source "drivers/media/common/Kconfig"
 
 if MEDIA_PLATFORM_SUPPORT
 source "drivers/media/platform/Kconfig"
-source "drivers/media/test_drivers/Kconfig"
 source "drivers/media/mmc/Kconfig"
 endif
 
+if MEDIA_TEST_SUPPORT
+source "drivers/media/test_drivers/Kconfig"
+endif
+
 source "drivers/media/firewire/Kconfig"
 
 endmenu
diff --git a/drivers/media/test_drivers/Kconfig b/drivers/media/test_drivers/Kconfig
index 9f4a9cfbacc9..e62abec030c3 100644
--- a/drivers/media/test_drivers/Kconfig
+++ b/drivers/media/test_drivers/Kconfig
@@ -1,7 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-if MEDIA_TEST_SUPPORT
-
 menuconfig V4L_TEST_DRIVERS
 	bool "V4L test drivers"
 	depends on VIDEO_DEV
@@ -24,5 +22,3 @@ config VIDEO_VIM2M
 source "drivers/media/test_drivers/vicodec/Kconfig"
 
 endif #V4L_TEST_DRIVERS
-
-endif #MEDIA_TEST_SUPPORT