diff --git a/zircon/system/utest/elf-search/BUILD.gn b/zircon/system/ulib/elf-search/test/BUILD.gn
similarity index 86%
rename from zircon/system/utest/elf-search/BUILD.gn
rename to zircon/system/ulib/elf-search/test/BUILD.gn
index f737a7388546c6b6112f10fe50411d246dc515d4..629705530f6b983becfa186b92d496f16a18493a 100644
--- a/zircon/system/utest/elf-search/BUILD.gn
+++ b/zircon/system/ulib/elf-search/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 = [
+    ":elf-search",
+  ]
+}
+
 test("elf-search") {
   sources = [
     "elf-search-test.cpp",
diff --git a/zircon/system/utest/elf-search/elf-search-test.cpp b/zircon/system/ulib/elf-search/test/elf-search-test.cpp
similarity index 100%
rename from zircon/system/utest/elf-search/elf-search-test.cpp
rename to zircon/system/ulib/elf-search/test/elf-search-test.cpp
diff --git a/zircon/system/utest/BUILD.gn b/zircon/system/utest/BUILD.gn
index 2e730bfbc8bb9d2e891068727de308cee1b1c8a8..a8fc5cd52bf03508044be80b192e1bfe1081cdce 100644
--- a/zircon/system/utest/BUILD.gn
+++ b/zircon/system/utest/BUILD.gn
@@ -71,6 +71,7 @@ if (current_cpu != "") {
       "$zx/system/ulib/digest/test",
       "$zx/system/ulib/disk-inspector/test",
       "$zx/system/ulib/driver-integration-test/test",
+      "$zx/system/ulib/elf-search/test",
       "$zx/system/ulib/fbl/test",
       "$zx/system/ulib/fs/test",
       "$zx/system/ulib/fvm/test",
@@ -115,7 +116,6 @@ if (current_cpu != "") {
       "dlopen-indirect-deps",
       "driver-test",
       "dump1",
-      "elf-search",
       "entropy",
       "errno",
       "ethernet",