diff --git a/BUILD.gn b/BUILD.gn
index 47896c327d..d8bd8d1381 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -2069,6 +2069,7 @@ group("gn_all") {
   deps = [
     ":d8",
     ":v8_hello_world",
+    ":v8_parser_shell",
     ":v8_sample_process",
     ":v8_simple_json_fuzzer",
     ":v8_simple_parser_fuzzer",
@@ -2206,6 +2207,36 @@ v8_executable("v8_sample_process") {
   }
 }
 
+v8_executable("v8_parser_shell") {
+  sources = [
+    "tools/parser-shell.cc",
+    "tools/shell-utils.h",
+  ]
+
+  configs = [
+    ":external_config",
+    ":internal_config_base",
+  ]
+
+  deps = [
+    ":v8_libplatform",
+    "//build/config/sanitizers:deps",
+    "//build/win:default_exe_manifest",
+  ]
+
+  if (is_component_build) {
+    # v8_parser_shell can't be built against a shared library, so we
+    # need to depend on the underlying static target in that case.
+    deps += [ ":v8_maybe_snapshot" ]
+  } else {
+    deps += [ ":v8" ]
+  }
+
+  if (v8_enable_i18n_support) {
+    deps += [ "//third_party/icu" ]
+  }
+}
+
 if (want_v8_shell) {
   v8_executable("v8_shell") {
     sources = [
diff --git a/test/BUILD.gn b/test/BUILD.gn
index a43c432ad6..271df0d6ef 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -15,6 +15,7 @@ group("gn_all") {
     # These items don't compile for Android on Mac.
     deps += [
       "cctest:cctest",
+      "cctest:generate-bytecode-expectations",
       "unittests:unittests",
     ]
   }
diff --git a/test/cctest/BUILD.gn b/test/cctest/BUILD.gn
index 88c6cf0738..c8c0377b06 100644
--- a/test/cctest/BUILD.gn
+++ b/test/cctest/BUILD.gn
@@ -372,4 +372,29 @@ action("resources") {
   ]
   args += rebase_path(sources, root_build_dir)
 }
-# TODO(machenbach): Migrate generate-bytecode-expectations.
+
+v8_executable("generate-bytecode-expectations") {
+  sources = [
+    "interpreter/bytecode-expectations-printer.cc",
+    "interpreter/bytecode-expectations-printer.h",
+    "interpreter/generate-bytecode-expectations.cc",
+  ]
+
+  configs = [
+    "../..:external_config",
+    "../..:internal_config_base",
+  ]
+
+  deps = [
+    "../..:v8_libplatform",
+    "//build/config/sanitizers:deps",
+    "//build/win:default_exe_manifest",
+  ]
+
+  if (is_component_build) {
+    # Same as cctest, we need to depend on the underlying static target.
+    deps += [ "../..:v8_maybe_snapshot" ]
+  } else {
+    deps += [ "../..:v8" ]
+  }
+}