diff --git a/zircon/system/utest/hid-parser/BUILD.gn b/zircon/system/ulib/hid-parser/test/BUILD.gn
similarity index 88%
rename from zircon/system/utest/hid-parser/BUILD.gn
rename to zircon/system/ulib/hid-parser/test/BUILD.gn
index f1dcd3ae6eb8cd86cf07704acfe8d0e0f05645a5..4e552867ed714143435142e63d0a18c82705d650 100644
--- a/zircon/system/utest/hid-parser/BUILD.gn
+++ b/zircon/system/ulib/hid-parser/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 = [
+    ":hid-parser",
+  ]
+}
+
 test("hid-parser") {
   sources = [
     "hid-helper-test.cpp",
diff --git a/zircon/system/utest/hid-parser/hid-helper-test.cpp b/zircon/system/ulib/hid-parser/test/hid-helper-test.cpp
similarity index 100%
rename from zircon/system/utest/hid-parser/hid-helper-test.cpp
rename to zircon/system/ulib/hid-parser/test/hid-helper-test.cpp
diff --git a/zircon/system/utest/hid-parser/hid-parser-fuzztest.cpp b/zircon/system/ulib/hid-parser/test/hid-parser-fuzztest.cpp
similarity index 100%
rename from zircon/system/utest/hid-parser/hid-parser-fuzztest.cpp
rename to zircon/system/ulib/hid-parser/test/hid-parser-fuzztest.cpp
diff --git a/zircon/system/utest/hid-parser/hid-parser-test.cpp b/zircon/system/ulib/hid-parser/test/hid-parser-test.cpp
similarity index 100%
rename from zircon/system/utest/hid-parser/hid-parser-test.cpp
rename to zircon/system/ulib/hid-parser/test/hid-parser-test.cpp
diff --git a/zircon/system/utest/hid-parser/hid-report-data.cpp b/zircon/system/ulib/hid-parser/test/hid-report-data.cpp
similarity index 100%
rename from zircon/system/utest/hid-parser/hid-report-data.cpp
rename to zircon/system/ulib/hid-parser/test/hid-report-data.cpp
diff --git a/zircon/system/utest/hid-parser/hid-utest-data.cpp b/zircon/system/ulib/hid-parser/test/hid-utest-data.cpp
similarity index 100%
rename from zircon/system/utest/hid-parser/hid-utest-data.cpp
rename to zircon/system/ulib/hid-parser/test/hid-utest-data.cpp
diff --git a/zircon/system/utest/BUILD.gn b/zircon/system/utest/BUILD.gn
index 1eb2a0824e88ff81c700bc3611e319887ccf39cc..253f1403d51e93a6cd5b5d4855cb287ccddb5b27 100644
--- a/zircon/system/utest/BUILD.gn
+++ b/zircon/system/utest/BUILD.gn
@@ -78,6 +78,7 @@ if (current_cpu != "") {
       "$zx/system/ulib/fvm/test",
       "$zx/system/ulib/fzl/test",
       "$zx/system/ulib/gpt/test",
+      "$zx/system/ulib/hid-parser/test",
       "$zx/system/ulib/hwreg/test",
       "$zx/system/ulib/id_allocator/test",
       "$zx/system/ulib/launchpad/test",
@@ -146,7 +147,6 @@ if (current_cpu != "") {
       "goldfish",
       "handle-alias",
       "hid",
-      "hid-parser",
       "hypervisor",
       "inspect-vmo",
       "int-types",