diff --git a/bundles/bringup/BUILD.gn b/bundles/bringup/BUILD.gn
index 436dd67..6a491ad 100644
--- a/bundles/bringup/BUILD.gn
+++ b/bundles/bringup/BUILD.gn
@@ -95,7 +95,7 @@
     "//zircon/system/ulib/trace-vthread/test:trace-vthread-test-package",
     "//zircon/system/ulib/trace-vthread/test:trace-vthread-with-static-engine-test-package",
     "//zircon/system/ulib/utf_conversion/test:utf-conversion-package",
-    "//zircon/system/ulib/zbitl/test:zbitl-test-package",
+    "//zircon/system/ulib/zbitl/test",
     "//zircon/system/ulib/zircon-crypto/test:zircon-crypto-package",
     "//zircon/system/ulib/zx-panic-libc/test:zx-panic-libc-test-package",
     "//zircon/system/ulib/zx/test:zx-package",
diff --git a/zircon/system/ulib/zbitl/test/BUILD.gn b/zircon/system/ulib/zbitl/test/BUILD.gn
index 0625e16..50739dd5 100644
--- a/zircon/system/ulib/zbitl/test/BUILD.gn
+++ b/zircon/system/ulib/zbitl/test/BUILD.gn
@@ -19,7 +19,7 @@
   testonly = true
   deps = [
     ":zbitl-test-package",
-    ":zbitl-unittests",
+    ":zbitl-unittests($host_toolchain)",
   ]
 }