diff --git a/test/Makefile b/test/Makefile
index 220a249..0b1affc 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -21,7 +21,6 @@
 obj-y += boot/
 obj-$(CONFIG_UNIT_TEST) += common/
 obj-y += log/
-obj-$(CONFIG_$(XPL_)UT_UNICODE) += unicode_ut.o
 else
 obj-$(CONFIG_SPL_UT_LOAD) += image/
 endif
diff --git a/test/lib/Makefile b/test/lib/Makefile
index be20bbc..c36c8b0 100644
--- a/test/lib/Makefile
+++ b/test/lib/Makefile
@@ -27,6 +27,7 @@
 obj-$(CONFIG_GETOPT) += getopt.o
 obj-$(CONFIG_CRC8) += test_crc8.o
 obj-$(CONFIG_UT_LIB_CRYPT) += test_crypt.o
+obj-$(CONFIG_$(XPL_)UT_UNICODE) += unicode.o
 obj-$(CONFIG_LIB_UUID) += uuid.o
 else
 obj-$(CONFIG_SANDBOX) += kconfig_spl.o
diff --git a/test/unicode_ut.c b/test/lib/unicode.c
similarity index 100%
rename from test/unicode_ut.c
rename to test/lib/unicode.c