diff --git a/src/BUILD.gn b/src/BUILD.gn
index 02182e7..ec5c3b0 100644
--- a/src/BUILD.gn
+++ b/src/BUILD.gn
@@ -27,7 +27,7 @@
 group("tests") {
   testonly = true
 
-  data_deps = [
+  deps = [
     "cobalt:tests",
     "connectivity:tests",
     "developer:tests",
diff --git a/src/cobalt/BUILD.gn b/src/cobalt/BUILD.gn
index a9fc456..715a9ed 100644
--- a/src/cobalt/BUILD.gn
+++ b/src/cobalt/BUILD.gn
@@ -13,7 +13,7 @@
 group("tests") {
   testonly = true
 
-  data_deps = [
+  deps = [
     "//src/cobalt/bin:cobalt_tests",
     "//third_party/cobalt:cobalt_core_tests",
   ]
diff --git a/src/connectivity/BUILD.gn b/src/connectivity/BUILD.gn
index 9dcd505..ccad5c4 100644
--- a/src/connectivity/BUILD.gn
+++ b/src/connectivity/BUILD.gn
@@ -16,7 +16,7 @@
 group("tests") {
   testonly = true
 
-  data_deps = [
+  deps = [
     "//src/connectivity/bluetooth/core/bt-gap:tests",
     "//src/connectivity/bluetooth/core/bt-host:bluetooth_fuzzers_test",
     "//src/connectivity/bluetooth/lib/bt-avdtp:tests",
diff --git a/src/connectivity/telephony/lib/qmi-protocol/BUILD.gn b/src/connectivity/telephony/lib/qmi-protocol/BUILD.gn
index cac8aa1..a8327ee 100644
--- a/src/connectivity/telephony/lib/qmi-protocol/BUILD.gn
+++ b/src/connectivity/telephony/lib/qmi-protocol/BUILD.gn
@@ -41,7 +41,7 @@
 group("tests") {
   testonly = true
 
-  data_deps = [
+  deps = [
     ":qmigen_unittests($host_toolchain)",
   ]
 }
diff --git a/src/developer/BUILD.gn b/src/developer/BUILD.gn
index 0bb2201..18dcbb4 100644
--- a/src/developer/BUILD.gn
+++ b/src/developer/BUILD.gn
@@ -18,7 +18,7 @@
 group("tests") {
   testonly = true
 
-  data_deps = [
+  deps = [
     "//src/developer/bugreport/tests:bugreport_tests",
     "//src/developer/bugreport/tests:bugreport_client_tests($host_toolchain)",
     "//src/developer/crashpad_agent/tests:crashpad_agent_tests",
diff --git a/src/developer/tracing/BUILD.gn b/src/developer/tracing/BUILD.gn
index 1d61946..8bceb18 100644
--- a/src/developer/tracing/BUILD.gn
+++ b/src/developer/tracing/BUILD.gn
@@ -13,7 +13,7 @@
 group("tests") {
   testonly = true
 
-  data_deps = [
+  deps = [
     "lib:tests",
   ]
 }
diff --git a/src/developer/tracing/lib/BUILD.gn b/src/developer/tracing/lib/BUILD.gn
index bbee984..5bf2929 100644
--- a/src/developer/tracing/lib/BUILD.gn
+++ b/src/developer/tracing/lib/BUILD.gn
@@ -15,7 +15,7 @@
 
 group("tests") {
   testonly = true
-  data_deps = [
+  deps = [
     "test_utils:tracing_test_utils_tests",
   ]
 }
diff --git a/src/identity/BUILD.gn b/src/identity/BUILD.gn
index c345de5..d3c1d2c 100644
--- a/src/identity/BUILD.gn
+++ b/src/identity/BUILD.gn
@@ -14,7 +14,7 @@
 group("tests") {
   testonly = true
 
-  data_deps = [
+  deps = [
     "bin:tests",
     "lib:tests",
     "tests/account_manager_integration",
diff --git a/src/identity/bin/BUILD.gn b/src/identity/bin/BUILD.gn
index b8e89ce..641f92e 100644
--- a/src/identity/bin/BUILD.gn
+++ b/src/identity/bin/BUILD.gn
@@ -14,7 +14,7 @@
 
 group("tests") {
   testonly = true
-  data_deps = [
+  deps = [
     ":identity_bin_unittests",
   ]
 }
diff --git a/src/identity/lib/BUILD.gn b/src/identity/lib/BUILD.gn
index f650c41..44c4809 100644
--- a/src/identity/lib/BUILD.gn
+++ b/src/identity/lib/BUILD.gn
@@ -14,7 +14,7 @@
 
 group("tests") {
   testonly = true
-  data_deps = [
+  deps = [
     ":identity_lib_unittests",
   ]
 }
diff --git a/src/lib/BUILD.gn b/src/lib/BUILD.gn
index 67ebc60..7b2422c 100644
--- a/src/lib/BUILD.gn
+++ b/src/lib/BUILD.gn
@@ -20,7 +20,7 @@
 group("tests") {
   testonly = true
 
-  data_deps = [
+  deps = [
     "cobalt:tests",
     "containers/cpp:tests",
     "fidl_table_validation:tests",
diff --git a/src/lib/cobalt/BUILD.gn b/src/lib/cobalt/BUILD.gn
index 24dfd09..32ebd8e 100644
--- a/src/lib/cobalt/BUILD.gn
+++ b/src/lib/cobalt/BUILD.gn
@@ -56,7 +56,7 @@
 group("tests") {
   testonly = true
 
-  data_deps = [
+  deps = [
     ":cobalt_lib_tests",
   ]
 }
diff --git a/src/lib/containers/cpp/BUILD.gn b/src/lib/containers/cpp/BUILD.gn
index 8ffcbb0..ca20e8b 100644
--- a/src/lib/containers/cpp/BUILD.gn
+++ b/src/lib/containers/cpp/BUILD.gn
@@ -49,7 +49,7 @@
 group("tests") {
   testonly = true
 
-  data_deps = [
+  deps = [
     ":containers_cpp_tests",
   ]
 }
diff --git a/src/lib/fidl_table_validation/BUILD.gn b/src/lib/fidl_table_validation/BUILD.gn
index 96e71a7..1ed910c 100644
--- a/src/lib/fidl_table_validation/BUILD.gn
+++ b/src/lib/fidl_table_validation/BUILD.gn
@@ -14,7 +14,7 @@
 group("tests") {
   testonly = true
 
-  data_deps = [
+  deps = [
     "fidl_table_validation_tests",
   ]
 }
diff --git a/src/media/BUILD.gn b/src/media/BUILD.gn
index c22e97b..01da944 100644
--- a/src/media/BUILD.gn
+++ b/src/media/BUILD.gn
@@ -17,7 +17,7 @@
 group("tests") {
   testonly = true
 
-  data_deps = [
+  deps = [
     "audio:tests",
     "sessions:tests",
     "codecs:tests",
diff --git a/src/media/audio/BUILD.gn b/src/media/audio/BUILD.gn
index 8d80bdb..09f55b7 100644
--- a/src/media/audio/BUILD.gn
+++ b/src/media/audio/BUILD.gn
@@ -19,7 +19,7 @@
 group("tests") {
   testonly = true
 
-  data_deps = [
+  deps = [
     "audio_core:tests",
     "//sdk/lib/media/audio_dfx/cpp:audio_dfx_tests",
   ]
diff --git a/src/media/audio/audio_core/BUILD.gn b/src/media/audio/audio_core/BUILD.gn
index f2006d2..c10ad86 100644
--- a/src/media/audio/audio_core/BUILD.gn
+++ b/src/media/audio/audio_core/BUILD.gn
@@ -134,7 +134,7 @@
 group("tests") {
   testonly = true
 
-  data_deps = [
+  deps = [
     "mixer:audio_mixer_tests",
     "test",
     "//sdk/lib/media/audio_dfx/cpp:audio_dfx_tests"
diff --git a/src/modular/BUILD.gn b/src/modular/BUILD.gn
index 3244dd5..f76b36e 100644
--- a/src/modular/BUILD.gn
+++ b/src/modular/BUILD.gn
@@ -16,5 +16,5 @@
   deps = [
     "tests",  # tests/ directory
   ]
-  data_deps = []
+  deps = []
 }
diff --git a/src/speech/BUILD.gn b/src/speech/BUILD.gn
index 34f12a1..e5f4bb8 100644
--- a/src/speech/BUILD.gn
+++ b/src/speech/BUILD.gn
@@ -13,5 +13,5 @@
 group("tests") {
   testonly = true
 
-  data_deps = []
+  deps = []
 }
diff --git a/src/testing/BUILD.gn b/src/testing/BUILD.gn
index 3b99cb4..febe2ea 100644
--- a/src/testing/BUILD.gn
+++ b/src/testing/BUILD.gn
@@ -13,5 +13,5 @@
 group("tests") {
   testonly = true
 
-  data_deps = []
+  deps = []
 }
diff --git a/src/ui/BUILD.gn b/src/ui/BUILD.gn
index 1e15ed6..d1a346e 100644
--- a/src/ui/BUILD.gn
+++ b/src/ui/BUILD.gn
@@ -12,7 +12,7 @@
 group("tests") {
   testonly = true
 
-  data_deps = [
+  deps = [
     "bin:tests",
   ]
 }
diff --git a/src/ui/bin/BUILD.gn b/src/ui/bin/BUILD.gn
index def61bf..5699f89 100644
--- a/src/ui/bin/BUILD.gn
+++ b/src/ui/bin/BUILD.gn
@@ -12,7 +12,7 @@
 group("tests") {
   testonly = true
 
-  data_deps = [
+  deps = [
     "shortcut:tests",
   ]
 }
diff --git a/src/ui/bin/shortcut/BUILD.gn b/src/ui/bin/shortcut/BUILD.gn
index 2fe299a..eab2dc0 100644
--- a/src/ui/bin/shortcut/BUILD.gn
+++ b/src/ui/bin/shortcut/BUILD.gn
@@ -10,7 +10,7 @@
 group("tests") {
   testonly = true
 
-  data_deps = [
+  deps = [
     ":shortcut",
     ":shortcut_test",
   ]