diff --git a/internal/lsp/testdata/rename/crosspkg/crosspkg.go b/internal/lsp/testdata/rename/crosspkg/crosspkg.go
new file mode 100644
index 0000000000..8510bcfe05
--- /dev/null
+++ b/internal/lsp/testdata/rename/crosspkg/crosspkg.go
@@ -0,0 +1,7 @@
+package crosspkg
+
+func Foo() { //@rename("Foo", "Dolphin")
+
+}
+
+var Bar int //@rename("Bar", "Tomato")
diff --git a/internal/lsp/testdata/rename/crosspkg/crosspkg.go.golden b/internal/lsp/testdata/rename/crosspkg/crosspkg.go.golden
new file mode 100644
index 0000000000..44c6367726
--- /dev/null
+++ b/internal/lsp/testdata/rename/crosspkg/crosspkg.go.golden
@@ -0,0 +1,40 @@
+-- Dolphin-rename --
+crosspkg.go:
+package crosspkg
+
+func Dolphin() { //@rename("Foo", "Dolphin")
+
+}
+
+var Bar int //@rename("Bar", "Tomato")
+
+other.go:
+package other
+
+import "golang.org/x/tools/internal/lsp/rename/crosspkg"
+
+func Other() {
+	crosspkg.Bar
+	crosspkg.Dolphin()
+}
+
+-- Tomato-rename --
+crosspkg.go:
+package crosspkg
+
+func Foo() { //@rename("Foo", "Dolphin")
+
+}
+
+var Tomato int //@rename("Bar", "Tomato")
+
+other.go:
+package other
+
+import "golang.org/x/tools/internal/lsp/rename/crosspkg"
+
+func Other() {
+	crosspkg.Tomato
+	crosspkg.Foo()
+}
+
diff --git a/internal/lsp/testdata/rename/crosspkg/other/other.go b/internal/lsp/testdata/rename/crosspkg/other/other.go
new file mode 100644
index 0000000000..e402854ec2
--- /dev/null
+++ b/internal/lsp/testdata/rename/crosspkg/other/other.go
@@ -0,0 +1,8 @@
+package other
+
+import "golang.org/x/tools/internal/lsp/rename/crosspkg"
+
+func Other() {
+	crosspkg.Bar
+	crosspkg.Foo()
+}
diff --git a/internal/lsp/testdata/summary.txt.golden b/internal/lsp/testdata/summary.txt.golden
index ade9cf3d92..19e9ad33cd 100644
--- a/internal/lsp/testdata/summary.txt.golden
+++ b/internal/lsp/testdata/summary.txt.golden
@@ -15,7 +15,7 @@ DefinitionsCount = 38
 TypeDefinitionsCount = 2
 HighlightsCount = 2
 ReferencesCount = 7
-RenamesCount = 20
+RenamesCount = 22
 PrepareRenamesCount = 8
 SymbolsCount = 1
 SignaturesCount = 21