diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
index ad9a9578f9c453a63332db175e27629a0234d7fa..5020d7ef74945e9659ed0941834357dae498454e 100644
--- a/drivers/of/Kconfig
+++ b/drivers/of/Kconfig
@@ -13,7 +13,8 @@ if OF
 
 config OF_UNITTEST
 	bool "Device Tree runtime unit tests"
-	depends on OF_IRQ
+	depends on !SPARC
+	select IRQ_DOMAIN
 	select OF_EARLY_FLATTREE
 	select OF_RESOLVE
 	help
@@ -61,7 +62,7 @@ config OF_DYNAMIC
 
 config OF_ADDRESS
 	def_bool y
-	depends on !SPARC && HAS_IOMEM
+	depends on !SPARC && (HAS_IOMEM || UML)
 	select OF_ADDRESS_PCI if PCI
 
 config OF_ADDRESS_PCI