diff --git a/examples/interesting_deps/set_up_clean_test b/examples/interesting_deps/set_up_clean_test
index 47e0a01ab..c66e8c8ab 100755
--- a/examples/interesting_deps/set_up_clean_test
+++ b/examples/interesting_deps/set_up_clean_test
@@ -41,6 +41,12 @@ gazelle_binary(
 
 gazelle(
     name = "update_build_files",
+    data = [
+        "@swift_deps_info//:swift_deps_index",
+    ],
+    extra_args = [
+        "-swift_dependency_index=\$(location @swift_deps_info//:swift_deps_index)",
+    ],
     gazelle = ":gazelle_bin",
 )
 
@@ -49,8 +55,11 @@ swift_binary(
     srcs = ["main.swift"],
     visibility = ["//swift:__subpackages__"],
     deps = [
+        "@swiftpkg_cocoalumberjack//:CocoaLumberjackSwiftLogBackend",
+        "@swiftpkg_geoswift//:GEOSwift",
         "@swiftpkg_libwebp_xcode//:libwebp",
-        "@swiftpkg_swift_log//:Sources_Logging",
+        "@swiftpkg_opencombine//:OpenCombine",
+        "@swiftpkg_swift_log//:Logging",
     ],
 )
 
diff --git a/examples/objc_code/set_up_clean_test b/examples/objc_code/set_up_clean_test
index e2a55f2c0..195164cc9 100755
--- a/examples/objc_code/set_up_clean_test
+++ b/examples/objc_code/set_up_clean_test
@@ -18,6 +18,13 @@ cat > "${script_dir}/BUILD.bazel"  <<-EOF
 load("@bazel_gazelle//:def.bzl", "gazelle", "gazelle_binary")
 load("@cgrindel_bazel_starlib//bzltidy:defs.bzl", "tidy")
 
+tidy(
+    name = "tidy",
+    targets = [
+        ":update_build_files",
+    ],
+)
+
 # MARK: - Gazelle
 
 # Ignore the Swift build folder
@@ -35,6 +42,12 @@ gazelle_binary(
 
 gazelle(
     name = "update_build_files",
+    data = [
+        "@swift_deps_info//:swift_deps_index",
+    ],
+    extra_args = [
+        "-swift_dependency_index=\$(location @swift_deps_info//:swift_deps_index)",
+    ],
     gazelle = ":gazelle_bin",
 )
 
diff --git a/examples/vapor_example/set_up_clean_test b/examples/vapor_example/set_up_clean_test
index ce71c369d..cb2562862 100755
--- a/examples/vapor_example/set_up_clean_test
+++ b/examples/vapor_example/set_up_clean_test
@@ -22,7 +22,6 @@ EOF
 # Add back a minimal build file at the root
 cat > "${script_dir}/BUILD.bazel"  <<-EOF
 load("@bazel_gazelle//:def.bzl", "gazelle", "gazelle_binary")
-load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 load("@cgrindel_bazel_starlib//bzltidy:defs.bzl", "tidy")
 
 tidy(
@@ -45,12 +44,14 @@ gazelle_binary(
 
 gazelle(
     name = "update_build_files",
-    args = [
-        "-swift_dependency_index=swift/deps_index.json",
+    data = [
+        "@swift_deps_info//:swift_deps_index",
+    ],
+    extra_args = [
+        "-swift_dependency_index=\$(location @swift_deps_info//:swift_deps_index)",
     ],
     gazelle = ":gazelle_bin",
 )
-
 EOF
 
 cat > "${script_dir}/swift/BUILD.bazel"  <<-EOF
diff --git a/examples/xcmetrics_example/set_up_clean_test b/examples/xcmetrics_example/set_up_clean_test
index 3167148c9..45d25f952 100755
--- a/examples/xcmetrics_example/set_up_clean_test
+++ b/examples/xcmetrics_example/set_up_clean_test
@@ -41,6 +41,12 @@ gazelle_binary(
 
 gazelle(
     name = "update_build_files",
+    data = [
+        "@swift_deps_info//:swift_deps_index",
+    ],
+    extra_args = [
+        "-swift_dependency_index=\$(location @swift_deps_info//:swift_deps_index)",
+    ],
     gazelle = ":gazelle_bin",
 )