diff --git a/zircon/system/utest/digest/BUILD.gn b/zircon/system/ulib/digest/test/BUILD.gn
similarity index 87%
rename from zircon/system/utest/digest/BUILD.gn
rename to zircon/system/ulib/digest/test/BUILD.gn
index fcc90a0f6f71a3fcb345d8549f1202a53c102f25..aca6784cc7ba3561d2562657bf0e88969d26eb96 100644
--- a/zircon/system/utest/digest/BUILD.gn
+++ b/zircon/system/ulib/digest/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 = [
+    ":digest",
+  ]
+}
+
 test("digest") {
   sources = [
     "digest.cpp",
diff --git a/zircon/system/utest/digest/digest.cpp b/zircon/system/ulib/digest/test/digest.cpp
similarity index 100%
rename from zircon/system/utest/digest/digest.cpp
rename to zircon/system/ulib/digest/test/digest.cpp
diff --git a/zircon/system/utest/digest/merkle-tree.cpp b/zircon/system/ulib/digest/test/merkle-tree.cpp
similarity index 100%
rename from zircon/system/utest/digest/merkle-tree.cpp
rename to zircon/system/ulib/digest/test/merkle-tree.cpp
diff --git a/zircon/system/utest/BUILD.gn b/zircon/system/utest/BUILD.gn
index a608cdc35cc6a6d20978937f75d239b71e917195..76ff7af09c6a3aaac43bfa8b117627db5d126ff3 100644
--- a/zircon/system/utest/BUILD.gn
+++ b/zircon/system/utest/BUILD.gn
@@ -59,6 +59,7 @@ if (current_cpu != "") {
       "$zx/system/ulib/c:tests",
       "$zx/system/ulib/cobalt-client/test",
       "$zx/system/ulib/ddk:ddk-unittest",
+      "$zx/system/ulib/digest/test",
       "$zx/system/ulib/disk-inspector/test",
       "$zx/system/ulib/driver-integration-test/test",
       "$zx/system/ulib/fvm/test",
@@ -95,7 +96,6 @@ if (current_cpu != "") {
       "debugger",
       "devfs",
       "device-enumeration",
-      "digest",
       "dlfcn",
       "dlopen-indirect-deps",
       "driver-test",