diff --git a/zircon/system/utest/launchpad/BUILD.gn b/zircon/system/ulib/launchpad/test/BUILD.gn
similarity index 87%
rename from zircon/system/utest/launchpad/BUILD.gn
rename to zircon/system/ulib/launchpad/test/BUILD.gn
index c470a30a8666b4c81a82bbcd63597e40f6f613fd..466e54e3265dbb7f71e01cbe0c763d33e8ba3b22 100644
--- a/zircon/system/utest/launchpad/BUILD.gn
+++ b/zircon/system/ulib/launchpad/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 = [
+    ":launchpad",
+  ]
+}
+
 test("launchpad") {
   sources = [
     "launchpad.cpp",
diff --git a/zircon/system/utest/launchpad/launchpad.cpp b/zircon/system/ulib/launchpad/test/launchpad.cpp
similarity index 100%
rename from zircon/system/utest/launchpad/launchpad.cpp
rename to zircon/system/ulib/launchpad/test/launchpad.cpp
diff --git a/zircon/system/utest/BUILD.gn b/zircon/system/utest/BUILD.gn
index 78c5108667208fdf8fc6d08d4dffbdb1276738cb..152777ef7e592c407262aa1079bc149060707882 100644
--- a/zircon/system/utest/BUILD.gn
+++ b/zircon/system/utest/BUILD.gn
@@ -77,6 +77,7 @@ if (current_cpu != "") {
       "$zx/system/ulib/fzl/test",
       "$zx/system/ulib/gpt/test",
       "$zx/system/ulib/id_allocator/test",
+      "$zx/system/ulib/launchpad/test",
       "$zx/system/ulib/libzbi/test",
       "$zx/system/ulib/kvstore:kvstore-test",
       "$zx/system/ulib/lazy_init:lazy_init-test",
@@ -147,7 +148,6 @@ if (current_cpu != "") {
       "int-types",
       "kcounter",
       "kernel-unittests",
-      "launchpad",
       "libhwreg",
       "log",
       "logger",