diff --git a/Makefile b/Makefile
index a9cc235b6da..3fe1873f5d8 100644
--- a/Makefile
+++ b/Makefile
@@ -893,7 +893,6 @@ ifdef CONFIG_POST
 libs-y += post/
 endif
 libs-$(CONFIG_$(PHASE_)UNIT_TEST) += test/
-libs-$(CONFIG_UT_ENV) += test/env/
 libs-$(CONFIG_UT_OPTEE) += test/optee/
 libs-$(CONFIG_UT_FDT_OVERLAY) += test/fdt_overlay/
 
diff --git a/test/Makefile b/test/Makefile
index 47a07d653a9..17716ef384a 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -19,6 +19,7 @@ obj-y += ut.o
 ifeq ($(CONFIG_XPL_BUILD),)
 obj-y += boot/
 obj-$(CONFIG_UNIT_TEST) += common/
+obj-$(CONFIG_UT_ENV) += env/
 obj-y += log/
 else
 obj-$(CONFIG_SPL_UT_LOAD) += image/