diff --git a/WORKSPACE b/WORKSPACE
index 1cbbad363..6d599a8ff 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -46,12 +46,13 @@ bazel_skylib_workspace()
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
+# Point to the https://github.com/bazel-contrib/rules_bazel_integration_test/tree/add_remove_bazel_symlinks_new branch.
 http_archive(
     name = "contrib_rules_bazel_integration_test",
-    sha256 = "e26a1cd5799785a822206f7d017b6771f446e6f2c5e0cb5eb02183ff7e2bccc0",
-    strip_prefix = "rules_bazel_integration_test-c4f5f6ff82b14de35beb53b36e535ff887384945",
+    sha256 = "985fa668fc555687c8e7e08ae209f228a8723a4fc6e51122025a17f413e9278a",
+    strip_prefix = "rules_bazel_integration_test-d94af0ffe3fdaab01c26a5e46816f9c217e5e20d",
     urls = [
-        "http://github.com/bazel-contrib/rules_bazel_integration_test/archive/c4f5f6ff82b14de35beb53b36e535ff887384945.tar.gz",
+        "http://github.com/bazel-contrib/rules_bazel_integration_test/archive/d94af0ffe3fdaab01c26a5e46816f9c217e5e20d.tar.gz",
     ],
 )
 
diff --git a/gazelle/internal/spdesc/BUILD.bazel b/gazelle/internal/spdesc/BUILD.bazel
index d73861e93..165c1c42a 100644
--- a/gazelle/internal/spdesc/BUILD.bazel
+++ b/gazelle/internal/spdesc/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@cgrindel_bazel_starlib//bzlformat:defs.bzl", "bzlformat_pkg")
 load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 
 # MARK: - Integration Test
@@ -25,3 +26,5 @@ go_test(
         "@com_github_stretchr_testify//assert",
     ],
 )
+
+bzlformat_pkg(name = "bzlformat")
diff --git a/gazelle/internal/spdump/BUILD.bazel b/gazelle/internal/spdump/BUILD.bazel
index 1ac25421b..6b377e785 100644
--- a/gazelle/internal/spdump/BUILD.bazel
+++ b/gazelle/internal/spdump/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@cgrindel_bazel_starlib//bzlformat:defs.bzl", "bzlformat_pkg")
 load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 
 # MARK: - Integration Test
@@ -29,3 +30,5 @@ go_test(
         "@com_github_stretchr_testify//assert",
     ],
 )
+
+bzlformat_pkg(name = "bzlformat")
diff --git a/go.sum b/go.sum
index 51267bdf9..e8c977d5b 100644
--- a/go.sum
+++ b/go.sum
@@ -49,8 +49,6 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
 go.starlark.net v0.0.0-20210223155950-e043a3d3c984/go.mod h1:t3mmBBPzAVvK0L0n1drDmrQsJ8FoIx4INCqVMTr/Zo0=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20221110155412-d0897a79cd37 h1:wKMvZzBFHbOCGvF2OmxR5Fqv/jDlkt7slnPz5ejEU8A=
-golang.org/x/exp v0.0.0-20221110155412-d0897a79cd37/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
 golang.org/x/exp v0.0.0-20221114191408-850992195362 h1:NoHlPRbyl1VFI6FjwHtPQCN7wAMXI6cKcqrmXhOOfBQ=
 golang.org/x/exp v0.0.0-20221114191408-850992195362/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
diff --git a/go_deps.bzl b/go_deps.bzl
index 8a38b94b8..b908f547d 100644
--- a/go_deps.bzl
+++ b/go_deps.bzl
@@ -264,8 +264,8 @@ def swift_bazel_go_dependencies():
         name = "org_golang_x_exp",
         build_external = "external",
         importpath = "golang.org/x/exp",
-        sum = "h1:wKMvZzBFHbOCGvF2OmxR5Fqv/jDlkt7slnPz5ejEU8A=",
-        version = "v0.0.0-20221110155412-d0897a79cd37",
+        sum = "h1:NoHlPRbyl1VFI6FjwHtPQCN7wAMXI6cKcqrmXhOOfBQ=",
+        version = "v0.0.0-20221114191408-850992195362",
     )
     go_repository(
         name = "org_golang_x_lint",