diff --git a/zircon/system/utest/utf_conversion/BUILD.gn b/zircon/system/ulib/utf_conversion/test/BUILD.gn
similarity index 84%
rename from zircon/system/utest/utf_conversion/BUILD.gn
rename to zircon/system/ulib/utf_conversion/test/BUILD.gn
index 37f4cb0a5c3af7b9a5d082ecff8d35b39b331d02..d1a5264faf73fc6c9e07bb820caef150717f67fa 100644
--- a/zircon/system/utest/utf_conversion/BUILD.gn
+++ b/zircon/system/ulib/utf_conversion/test/BUILD.gn
@@ -2,6 +2,13 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+group("test") {
+  testonly = true
+  deps = [
+    ":utf_conversion",
+  ]
+}
+
 test("utf_conversion") {
   sources = [
     "main.cpp",
diff --git a/zircon/system/utest/utf_conversion/main.cpp b/zircon/system/ulib/utf_conversion/test/main.cpp
similarity index 100%
rename from zircon/system/utest/utf_conversion/main.cpp
rename to zircon/system/ulib/utf_conversion/test/main.cpp
diff --git a/zircon/system/utest/BUILD.gn b/zircon/system/utest/BUILD.gn
index 075182f5dc2a788abd9f58a1bd3f79b49038ad05..8a8ede7aa314c200fd530b17e0f77adab1a66bdc 100644
--- a/zircon/system/utest/BUILD.gn
+++ b/zircon/system/utest/BUILD.gn
@@ -94,6 +94,7 @@ if (current_cpu != "") {
       "$zx/system/ulib/tftp:tftp-test",
       "$zx/system/ulib/trace-reader:tests",
       "$zx/system/ulib/trace-vthread:tests",
+      "$zx/system/ulib/utf_conversion/test",
       "$zx/system/ulib/zbi-bootfs/test",
       "$zx/system/ulib/zx/test",
       "$zx/system/ulib/zxio/test",
@@ -184,7 +185,6 @@ if (current_cpu != "") {
       "trace",
       "usb",
       "usb-virtual-bus",
-      "utf_conversion",
       "util",
       "vdso",
       "vdso-base",