diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
index 1a13f5b722c57e4d2d523c6be9b289084dba115a..be16ce2ffd697575f61cb859a6ba78add6710d5f 100644
--- a/drivers/of/Kconfig
+++ b/drivers/of/Kconfig
@@ -7,8 +7,8 @@ config OF
 menu "Device Tree and Open Firmware support"
 	depends on OF
 
-config OF_SELFTEST
-	bool "Device Tree Runtime self tests"
+config OF_UNITTEST
+	bool "Device Tree runtime unit tests"
 	depends on OF_IRQ && OF_EARLY_FLATTREE
 	select OF_DYNAMIC
 	select OF_RESOLVE
diff --git a/drivers/of/Makefile b/drivers/of/Makefile
index ca9209ce50cd74b85c599e16482c0e38078e03e0..d90553fcd37f78edd6ad665f980c1b3bfb232db6 100644
--- a/drivers/of/Makefile
+++ b/drivers/of/Makefile
@@ -6,8 +6,8 @@ obj-$(CONFIG_OF_PROMTREE) += pdt.o
 obj-$(CONFIG_OF_ADDRESS)  += address.o
 obj-$(CONFIG_OF_IRQ)    += irq.o
 obj-$(CONFIG_OF_NET)	+= of_net.o
-obj-$(CONFIG_OF_SELFTEST) += of_selftest.o
-of_selftest-objs := selftest.o testcase-data/testcases.dtb.o
+obj-$(CONFIG_OF_UNITTEST) += of_unittest.o
+of_unittest-objs := unittest.o unittest-data/testcases.dtb.o
 obj-$(CONFIG_OF_MDIO)	+= of_mdio.o
 obj-$(CONFIG_OF_PCI)	+= of_pci.o
 obj-$(CONFIG_OF_PCI_IRQ)  += of_pci_irq.o
diff --git a/drivers/of/testcase-data/testcases.dts b/drivers/of/unittest-data/testcases.dts
similarity index 100%
rename from drivers/of/testcase-data/testcases.dts
rename to drivers/of/unittest-data/testcases.dts
diff --git a/drivers/of/testcase-data/tests-interrupts.dtsi b/drivers/of/unittest-data/tests-interrupts.dtsi
similarity index 100%
rename from drivers/of/testcase-data/tests-interrupts.dtsi
rename to drivers/of/unittest-data/tests-interrupts.dtsi
diff --git a/drivers/of/testcase-data/tests-match.dtsi b/drivers/of/unittest-data/tests-match.dtsi
similarity index 100%
rename from drivers/of/testcase-data/tests-match.dtsi
rename to drivers/of/unittest-data/tests-match.dtsi
diff --git a/drivers/of/testcase-data/tests-phandle.dtsi b/drivers/of/unittest-data/tests-phandle.dtsi
similarity index 100%
rename from drivers/of/testcase-data/tests-phandle.dtsi
rename to drivers/of/unittest-data/tests-phandle.dtsi
diff --git a/drivers/of/testcase-data/tests-platform.dtsi b/drivers/of/unittest-data/tests-platform.dtsi
similarity index 100%
rename from drivers/of/testcase-data/tests-platform.dtsi
rename to drivers/of/unittest-data/tests-platform.dtsi
diff --git a/drivers/of/selftest.c b/drivers/of/unittest.c
similarity index 100%
rename from drivers/of/selftest.c
rename to drivers/of/unittest.c