diff --git a/zircon/system/utest/libhwreg/BUILD.gn b/zircon/system/ulib/hwreg/test/BUILD.gn
similarity index 87%
rename from zircon/system/utest/libhwreg/BUILD.gn
rename to zircon/system/ulib/hwreg/test/BUILD.gn
index 2b20b26747d5d3ae27c13d8adf6867e92060f01f..be0fa02cc3e315f9987254a6110c4f2f0a5b9e44 100644
--- a/zircon/system/utest/libhwreg/BUILD.gn
+++ b/zircon/system/ulib/hwreg/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 = [
+    ":libhwreg",
+  ]
+}
+
 test("libhwreg") {
   sources = [
     "bitfields-test.cpp",
diff --git a/zircon/system/utest/libhwreg/bitfields-test.cpp b/zircon/system/ulib/hwreg/test/bitfields-test.cpp
similarity index 100%
rename from zircon/system/utest/libhwreg/bitfields-test.cpp
rename to zircon/system/ulib/hwreg/test/bitfields-test.cpp
diff --git a/zircon/system/utest/BUILD.gn b/zircon/system/utest/BUILD.gn
index 152777ef7e592c407262aa1079bc149060707882..2e730bfbc8bb9d2e891068727de308cee1b1c8a8 100644
--- a/zircon/system/utest/BUILD.gn
+++ b/zircon/system/utest/BUILD.gn
@@ -76,6 +76,7 @@ if (current_cpu != "") {
       "$zx/system/ulib/fvm/test",
       "$zx/system/ulib/fzl/test",
       "$zx/system/ulib/gpt/test",
+      "$zx/system/ulib/hwreg/test",
       "$zx/system/ulib/id_allocator/test",
       "$zx/system/ulib/launchpad/test",
       "$zx/system/ulib/libzbi/test",
@@ -148,7 +149,6 @@ if (current_cpu != "") {
       "int-types",
       "kcounter",
       "kernel-unittests",
-      "libhwreg",
       "log",
       "logger",
       "memfs",