diff --git a/BUILD.gn b/BUILD.gn
index 8e971bc97c..ef01067c90 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -3042,7 +3042,7 @@ group("v8_archive") {
 
 group("v8_fuzzers") {
   testonly = true
-  deps = [
+  data_deps = [
     ":v8_simple_json_fuzzer",
     ":v8_simple_multi_return_fuzzer",
     ":v8_simple_parser_fuzzer",
diff --git a/infra/mb/gn_isolate_map.pyl b/infra/mb/gn_isolate_map.pyl
index 38243ebbd7..34793e5121 100644
--- a/infra/mb/gn_isolate_map.pyl
+++ b/infra/mb/gn_isolate_map.pyl
@@ -27,4 +27,8 @@
     "label": "//tools/gcmole:v8_run_gcmole",
     "type": "script",
   },
+  "unittests": {
+    "label": "//test/unittests:unittests",
+    "type": "script",
+  },
 }
\ No newline at end of file
diff --git a/test/cctest/BUILD.gn b/test/cctest/BUILD.gn
index 67abfe4fdb..d2d6cdcf25 100644
--- a/test/cctest/BUILD.gn
+++ b/test/cctest/BUILD.gn
@@ -9,6 +9,17 @@ v8_executable("cctest") {
   deps = [
     ":cctest_sources",
   ]
+
+  data_deps = [
+    "../../tools:v8_testrunner",
+  ]
+
+  data = [
+    "testcfg.py",
+    "cctest.status",
+    "interpreter/bytecode_expectations/",
+  ]
+
   configs = [
     "../..:external_config",
     "../..:internal_config_base",
diff --git a/test/fuzzer/BUILD.gn b/test/fuzzer/BUILD.gn
new file mode 100644
index 0000000000..d72cb77a64
--- /dev/null
+++ b/test/fuzzer/BUILD.gn
@@ -0,0 +1,33 @@
+# Copyright 2018 the V8 project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+group("v8_fuzzer") {
+  testonly = true
+
+  data_deps = [
+    "../../tools:v8_testrunner",
+    "../..:v8_fuzzers",
+  ]
+
+  data = [
+    "./fuzzer.status",
+    "./testcfg.py",
+    "./json/",
+    "./parser/",
+    "./regexp/",
+    "./regexp_builtins/",
+    "./multi_return/",
+    "./wasm/",
+    "./wasm_async/",
+    "./wasm_code/",
+    "./wasm_compile/",
+    "./wasm_data_section/",
+    "./wasm_function_sigs_section/",
+    "./wasm_globals_section/",
+    "./wasm_imports_section/",
+    "./wasm_memory_section/",
+    "./wasm_names_section/",
+    "./wasm_types_section/",
+  ]
+}
\ No newline at end of file
diff --git a/test/inspector/BUILD.gn b/test/inspector/BUILD.gn
index eec613b212..0999e19b89 100644
--- a/test/inspector/BUILD.gn
+++ b/test/inspector/BUILD.gn
@@ -28,6 +28,26 @@ v8_executable("inspector-test") {
     "//build/win:default_exe_manifest",
   ]
 
+  data_deps = [
+    "../../tools:v8_testrunner",
+  ]
+
+  data = [
+    "console/",
+    "cpu-profiler/",
+    "debugger/",
+    "heap-profiler/",
+    "inspector.status",
+    "json-parse-expected.txt",
+    "json-parse.js",
+    "protocol-test.js",
+    "runtime/",
+    "sessions/",
+    "testcfg.py",
+    "type-profiler/",
+    "../../src/inspector/injected-script-source.js",
+  ]
+
   cflags = []
   ldflags = []
 }
diff --git a/test/mkgrokdump/BUILD.gn b/test/mkgrokdump/BUILD.gn
index 5359f675d0..e35ce57d84 100644
--- a/test/mkgrokdump/BUILD.gn
+++ b/test/mkgrokdump/BUILD.gn
@@ -24,4 +24,14 @@ v8_executable("mkgrokdump") {
     "//build/config:exe_and_shlib_deps",
     "//build/win:default_exe_manifest",
   ]
+
+  data_deps = [
+    "../../tools:v8_testrunner",
+  ]
+
+  data = [
+    "mkgrokdump.status",
+    "testcfg.py",
+    "../../tools/v8heapconst.py",
+  ]
 }
diff --git a/test/unittests/BUILD.gn b/test/unittests/BUILD.gn
index 4b1447d34b..08669793c2 100644
--- a/test/unittests/BUILD.gn
+++ b/test/unittests/BUILD.gn
@@ -23,11 +23,21 @@ v8_executable("unittests") {
     "//testing/gtest",
   ]
 
+  data_deps = [
+    "../../tools:v8_testrunner",
+  ]
+
+  data = [
+    "testcfg.py",
+    "unittests.status",
+  ]
+
   configs = [
     "../..:external_config",
     "../..:internal_config_base",
   ]
 }
+
 v8_source_set("unittests_sources") {
   testonly = true