diff --git a/BUILD.gn b/BUILD.gn
index ffd1c576..709ce495 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -36,7 +36,7 @@ if (crashpad_is_in_chromium || crashpad_is_in_fuchsia) {
     import("//build/package.gni")
     package("crashpad_test") {
       testonly = true
-      system_image = true
+      deprecated_system_image = true
 
       deps = [
         ":crashpad_tests",
@@ -48,6 +48,14 @@ if (crashpad_is_in_chromium || crashpad_is_in_fuchsia) {
         },
       ]
     }
+
+    package("crashpad_handler") {
+      deprecated_system_image = true
+
+      deps = [
+        "handler:crashpad_handler",
+      ]
+    }
   }
 } else if (crashpad_is_standalone) {
   test("crashpad_client_test") {
diff --git a/test/BUILD.gn b/test/BUILD.gn
index a8d65954..ab37dc16 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -125,7 +125,13 @@ static_library("test") {
   }
 
   if (crashpad_is_fuchsia) {
-    libs = [ "launchpad" ]
+    if (crashpad_is_in_fuchsia) {
+      deps += [
+        "//zircon/public/lib/launchpad",
+      ]
+    } else {
+      libs = [ "launchpad" ]
+    }
   }
 }
 
diff --git a/util/BUILD.gn b/util/BUILD.gn
index 5f886f20..1723ddcd 100644
--- a/util/BUILD.gn
+++ b/util/BUILD.gn
@@ -462,9 +462,11 @@ crashpad_executable("http_transport_test_server") {
     "../tools:tool_support",
   ]
 
-  remove_configs = [
-    "//third_party/mini_chromium/mini_chromium/build:Wexit_time_destructors",
-  ]
+  if (crashpad_is_standalone) {
+    remove_configs = [
+      "//third_party/mini_chromium/mini_chromium/build:Wexit_time_destructors",
+    ]
+  }
 
   if (crashpad_is_win) {
     libs = [ "ws2_32.lib" ]