diff --git a/src/app/data-model/BUILD.gn b/src/app/data-model/BUILD.gn
index 8615d8f9a1b071..d8e314e2a523b6 100644
--- a/src/app/data-model/BUILD.gn
+++ b/src/app/data-model/BUILD.gn
@@ -23,7 +23,6 @@ source_set("nullable") {
     "${chip_root}/src/app/util:nullable-primitives",
     "${chip_root}/src/lib/core",
     "${chip_root}/src/lib/core:error",
-    "${chip_root}/src/lib/core:string-builder-adapters",
     "${chip_root}/src/lib/support",
   ]
 }
diff --git a/src/app/data-model/tests/BUILD.gn b/src/app/data-model/tests/BUILD.gn
index e97b35f37cfbd1..892e0c1494df55 100644
--- a/src/app/data-model/tests/BUILD.gn
+++ b/src/app/data-model/tests/BUILD.gn
@@ -22,6 +22,8 @@ chip_test_suite("tests") {
 
   public_deps = [
     "${chip_root}/src/app/data-model:nullable",
-    "${chip_root}/src/lib/core",
+    "${chip_root}/src/lib/core:error",
+    "${chip_root}/src/lib/core:string-builder-adapters",
+    "${chip_root}/src/lib/support/tests:pw-test-macros",
   ]
 }