diff --git a/Makefile b/Makefile
index 3fe1873..94cc3f1 100644
--- a/Makefile
+++ b/Makefile
@@ -893,7 +893,6 @@
 libs-y += post/
 endif
 libs-$(CONFIG_$(PHASE_)UNIT_TEST) += test/
-libs-$(CONFIG_UT_OPTEE) += test/optee/
 libs-$(CONFIG_UT_FDT_OVERLAY) += test/fdt_overlay/
 
 libs-y += $(if $(wildcard $(srctree)/board/$(BOARDDIR)/Makefile),board/$(BOARDDIR)/)
diff --git a/test/Makefile b/test/Makefile
index 17716ef..5ef8c37 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -14,6 +14,7 @@
 ifneq ($(CONFIG_HUSH_PARSER),)
 obj-$(CONFIG_$(XPL_)CMDLINE) += hush/
 endif
+obj-$(CONFIG_UT_OPTEE) += optee/
 obj-y += ut.o
 
 ifeq ($(CONFIG_XPL_BUILD),)