diff --git a/common/Kconfig b/common/Kconfig
index 0df45d1..44a955c 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -39,8 +39,8 @@
 	bool
 
 config ELF
-	bool
-	depends on MIPS
+	bool "ELF Support" if COMPILE_TEST
+	depends on MIPS || COMPILE_TEST
 
 config FILETYPE
 	bool
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index 0a9be0c..6dfe615 100644
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -12,16 +12,16 @@
 	depends on ARM && CPU_V7
 
 config CLOCKSOURCE_BCM283X
-	bool
-	depends on ARCH_BCM283X
+	bool "BCM283x clock source" if COMPILE_TEST
+	depends on ARCH_BCM283X || COMPILE_TEST
 
 config CLOCKSOURCE_CLPS711X
-	bool
-	depends on ARCH_CLPS711X
+	bool "CLPS711x clock source" if COMPILE_TEST
+	depends on ARCH_CLPS711X || COMPILE_TEST
 
 config CLOCKSOURCE_DIGIC
-	bool
-	depends on ARCH_DIGIC
+	bool "DIGIC clock source" if COMPILE_TEST
+	depends on ARCH_DIGIC || COMPILE_TEST
 
 config CLOCKSOURCE_DUMMY_RATE
 	int
@@ -52,20 +52,20 @@
 	depends on KVX
 
 config CLOCKSOURCE_MVEBU
-	bool
-	depends on ARCH_MVEBU
+	bool "MVEBU clock source" if COMPILE_TEST
+	depends on ARCH_MVEBU || COMPILE_TEST
 
 config CLOCKSOURCE_NOMADIK
-	bool
-	depends on ARM
+	bool "Nomadik clock source" if COMPILE_TEST
+	depends on ARM || COMPILE_TEST
 
 config CLOCKSOURCE_ORION
-	bool
-	depends on ARCH_MVEBU
+	bool "ORION clock source" if COMPILE_TEST
+	depends on ARCH_MVEBU || COMPILE_TEST
 
 config CLOCKSOURCE_UEMD
-	bool
-	depends on ARCH_UEMD
+	bool "UEMD clock source" if COMPILE_TEST
+	depends on ARCH_UEMD || COMPILE_TEST
 
 config CLOCKSOURCE_ROCKCHIP
 	bool
diff --git a/drivers/ddr/fsl/Kconfig b/drivers/ddr/fsl/Kconfig
index 9cae902..09920bb 100644
--- a/drivers/ddr/fsl/Kconfig
+++ b/drivers/ddr/fsl/Kconfig
@@ -1,5 +1,5 @@
 config DDR_FSL
-	bool
+	bool "Freescale DDR support" if COMPILE_TEST
 
 if DDR_FSL
 
diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index 542d734..0585460 100644
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -1,5 +1,5 @@
 config HW_HAS_PCI
-	bool
+	bool "Compile in PCI core" if COMPILE_TEST
 
 if HW_HAS_PCI
 
diff --git a/lib/Kconfig b/lib/Kconfig
index 9a80780..081fffb 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -94,7 +94,7 @@
 	bool
 
 config STMP_DEVICE
-	bool
+	bool "STMP device support" if COMPILE_TEST
 
 config FSL_QE_FIRMWARE
 	select CRC32