diff --git a/gopls/internal/lsp/regtest/expectation.go b/gopls/internal/lsp/regtest/expectation.go
index 7fcaf51..55280ad 100644
--- a/gopls/internal/lsp/regtest/expectation.go
+++ b/gopls/internal/lsp/regtest/expectation.go
@@ -732,11 +732,9 @@
 	}
 }
 
-// EmptyOrNoDiagnostics asserts that either no diagnostics are sent for the
+// NoDiagnostics asserts that either no diagnostics are sent for the
 // workspace-relative path name, or empty diagnostics are sent.
-// TODO(rFindley): this subtlety shouldn't be necessary. Gopls should always
-// send at least one diagnostic set for open files.
-func EmptyOrNoDiagnostics(name string) Expectation {
+func NoDiagnostics(name string) Expectation {
 	check := func(s State) Verdict {
 		if diags := s.diagnostics[name]; diags == nil || len(diags.Diagnostics) == 0 {
 			return Met
diff --git a/gopls/internal/regtest/diagnostics/builtin_test.go b/gopls/internal/regtest/diagnostics/builtin_test.go
index ae775d9..8de47bc 100644
--- a/gopls/internal/regtest/diagnostics/builtin_test.go
+++ b/gopls/internal/regtest/diagnostics/builtin_test.go
@@ -32,7 +32,7 @@
 		}
 		env.Await(OnceMet(
 			env.DoneWithOpen(),
-			EmptyOrNoDiagnostics("builtin.go"),
+			NoDiagnostics("builtin.go"),
 		))
 	})
 }
diff --git a/gopls/internal/regtest/diagnostics/diagnostics_test.go b/gopls/internal/regtest/diagnostics/diagnostics_test.go
index 9ef429c..6f91c00 100644
--- a/gopls/internal/regtest/diagnostics/diagnostics_test.go
+++ b/gopls/internal/regtest/diagnostics/diagnostics_test.go
@@ -886,8 +886,8 @@
 		env.Await(
 			OnceMet(
 				env.DoneWithChange(),
-				EmptyOrNoDiagnostics("foo/bar_test.go"),
-				EmptyOrNoDiagnostics("foo/foo.go"),
+				NoDiagnostics("foo/bar_test.go"),
+				NoDiagnostics("foo/foo.go"),
 			),
 		)
 	})
@@ -1092,7 +1092,7 @@
 		env.Await(
 			OnceMet(
 				env.DoneWithChange(),
-				EmptyOrNoDiagnostics("foo/foo.go"),
+				NoDiagnostics("foo/foo.go"),
 			),
 		)
 	})
@@ -1218,7 +1218,7 @@
 	).Run(t, mod, func(t *testing.T, env *Env) {
 		env.OpenFile("a/main.go")
 		env.AfterChange(
-			EmptyOrNoDiagnostics("main.go"),
+			NoDiagnostics("main.go"),
 		)
 	})
 }
@@ -1636,8 +1636,8 @@
 		env.RegexpReplace("b/b.go", `const B = a\.B`, "")
 		env.SaveBuffer("b/b.go")
 		env.Await(
-			EmptyOrNoDiagnostics("a/a.go"),
-			EmptyOrNoDiagnostics("b/b.go"),
+			NoDiagnostics("a/a.go"),
+			NoDiagnostics("b/b.go"),
 		)
 	})
 }
diff --git a/gopls/internal/regtest/misc/failures_test.go b/gopls/internal/regtest/misc/failures_test.go
index f996514..b3ff37a 100644
--- a/gopls/internal/regtest/misc/failures_test.go
+++ b/gopls/internal/regtest/misc/failures_test.go
@@ -77,8 +77,8 @@
 		// Fix the error by editing the const name in b.go to `b`.
 		env.RegexpReplace("b.go", "(a) = 2", "b")
 		env.Await(
-			EmptyOrNoDiagnostics("a.go"),
-			EmptyOrNoDiagnostics("b.go"),
+			NoDiagnostics("a.go"),
+			NoDiagnostics("b.go"),
 		)
 	})
 }
diff --git a/gopls/internal/regtest/misc/vuln_test.go b/gopls/internal/regtest/misc/vuln_test.go
index 45d52c3..1b44caf 100644
--- a/gopls/internal/regtest/misc/vuln_test.go
+++ b/gopls/internal/regtest/misc/vuln_test.go
@@ -229,7 +229,7 @@
 			OnceMet(
 				CompletedProgress(result.Token, nil),
 				ShownMessage("Found GOSTDLIB"),
-				EmptyOrNoDiagnostics("go.mod"),
+				NoDiagnostics("go.mod"),
 			),
 		)
 		testFetchVulncheckResult(t, env, map[string]fetchVulncheckResult{
@@ -276,7 +276,7 @@
 	).Run(t, files, func(t *testing.T, env *Env) {
 		env.OpenFile("go.mod")
 		env.AfterChange(
-			EmptyOrNoDiagnostics("go.mod"),
+			NoDiagnostics("go.mod"),
 			// we don't publish diagnostics for standard library vulnerability yet.
 		)
 		testFetchVulncheckResult(t, env, map[string]fetchVulncheckResult{
@@ -868,7 +868,7 @@
 		}
 		env.ApplyCodeAction(reset)
 
-		env.Await(EmptyOrNoDiagnostics("go.mod"))
+		env.Await(NoDiagnostics("go.mod"))
 	})
 }
 
diff --git a/gopls/internal/regtest/modfile/modfile_test.go b/gopls/internal/regtest/modfile/modfile_test.go
index e15fa4c..2a178e4 100644
--- a/gopls/internal/regtest/modfile/modfile_test.go
+++ b/gopls/internal/regtest/modfile/modfile_test.go
@@ -1166,8 +1166,8 @@
 		)
 		env.ApplyQuickFixes("main.go", d.Diagnostics)
 		env.Await(
-			EmptyOrNoDiagnostics("main.go"),
-			EmptyOrNoDiagnostics("go.mod"),
+			NoDiagnostics("main.go"),
+			NoDiagnostics("go.mod"),
 		)
 	})
 }
diff --git a/gopls/internal/regtest/template/template_test.go b/gopls/internal/regtest/template/template_test.go
index 4e87d04..c82c829 100644
--- a/gopls/internal/regtest/template/template_test.go
+++ b/gopls/internal/regtest/template/template_test.go
@@ -124,7 +124,7 @@
 			OnceMet(
 				InitialWorkspaceLoad,
 				env.DiagnosticAtRegexp("a/a.tmpl", "()A"),
-				EmptyOrNoDiagnostics("b/b.tmpl"),
+				NoDiagnostics("b/b.tmpl"),
 			),
 		)
 	})
@@ -149,7 +149,7 @@
 		env.SetBufferContent("hello.tmpl", "{{range .Planets}}\nHello {{}}\n{{end}}")
 		env.Await(env.DiagnosticAtRegexp("hello.tmpl", "()Hello {{}}"))
 		env.RegexpReplace("hello.tmpl", "{{}}", "{{.}}")
-		env.Await(EmptyOrNoDiagnostics("hello.tmpl"))
+		env.Await(NoDiagnostics("hello.tmpl"))
 	})
 }
 
diff --git a/gopls/internal/regtest/watch/watch_test.go b/gopls/internal/regtest/watch/watch_test.go
index a62b473..5a03656 100644
--- a/gopls/internal/regtest/watch/watch_test.go
+++ b/gopls/internal/regtest/watch/watch_test.go
@@ -139,7 +139,7 @@
 		})
 		env.Await(
 			EmptyDiagnostics("a/a.go"),
-			EmptyOrNoDiagnostics("b/b.go"),
+			NoDiagnostics("b/b.go"),
 		)
 	})
 }
@@ -226,7 +226,7 @@
 		env.WriteWorkspaceFile("c/c.go", `package c; func C() {};`)
 		env.WriteWorkspaceFile("a/a.go", `package a; import "mod.com/c"; func _() { c.C() }`)
 		env.AfterChange(
-			EmptyOrNoDiagnostics("a/a.go"),
+			NoDiagnostics("a/a.go"),
 		)
 	})
 }
@@ -341,12 +341,12 @@
 			env.Await(
 				OnceMet(
 					env.DoneWithChangeWatchedFiles(),
-					EmptyOrNoDiagnostics("a/a.go"),
+					NoDiagnostics("a/a.go"),
 				),
 			)
 			env.WriteWorkspaceFile("b/b.go", newMethod)
 			env.Await(
-				EmptyOrNoDiagnostics("a/a.go"),
+				NoDiagnostics("a/a.go"),
 			)
 		})
 	})
@@ -360,9 +360,9 @@
 			env.Await(
 				OnceMet(
 					env.DoneWithChangeWatchedFiles(),
-					EmptyOrNoDiagnostics("a/a.go"),
+					NoDiagnostics("a/a.go"),
 				),
-				EmptyOrNoDiagnostics("b/b.go"),
+				NoDiagnostics("b/b.go"),
 			)
 		})
 	})
@@ -490,7 +490,7 @@
 		env.RemoveWorkspaceFile("a/a1.go")
 		env.WriteWorkspaceFile("a/a2.go", "package a; func _() {};")
 		env.AfterChange(
-			EmptyOrNoDiagnostics("main.go"),
+			NoDiagnostics("main.go"),
 		)
 	})
 }
@@ -567,7 +567,7 @@
 		})
 		env.AfterChange(
 			env.DoneWithChangeWatchedFiles(),
-			EmptyOrNoDiagnostics("main.go"),
+			NoDiagnostics("main.go"),
 		)
 	})
 }
@@ -694,11 +694,11 @@
 		env.Await(
 			OnceMet(
 				env.DoneWithChangeWatchedFiles(),
-				EmptyOrNoDiagnostics("a/a.go"),
+				NoDiagnostics("a/a.go"),
 			),
 			OnceMet(
 				env.DoneWithChangeWatchedFiles(),
-				EmptyOrNoDiagnostics("a/a_test.go"),
+				NoDiagnostics("a/a_test.go"),
 			),
 		)
 		// Now, add a new file to the test variant and use its symbol in the
@@ -726,11 +726,11 @@
 		env.Await(
 			OnceMet(
 				env.DoneWithChangeWatchedFiles(),
-				EmptyOrNoDiagnostics("a/a_test.go"),
+				NoDiagnostics("a/a_test.go"),
 			),
 			OnceMet(
 				env.DoneWithChangeWatchedFiles(),
-				EmptyOrNoDiagnostics("a/a2_test.go"),
+				NoDiagnostics("a/a2_test.go"),
 			),
 		)
 	})
diff --git a/gopls/internal/regtest/workspace/directoryfilters_test.go b/gopls/internal/regtest/workspace/directoryfilters_test.go
index 0a1f596..69f91cd 100644
--- a/gopls/internal/regtest/workspace/directoryfilters_test.go
+++ b/gopls/internal/regtest/workspace/directoryfilters_test.go
@@ -56,7 +56,7 @@
 		env.Await(
 			OnceMet(
 				InitialWorkspaceLoad,
-				EmptyOrNoDiagnostics("exclude/x.go"),
+				NoDiagnostics("exclude/x.go"),
 			),
 		)
 	})
@@ -88,8 +88,8 @@
 		env.Await(
 			OnceMet(
 				InitialWorkspaceLoad,
-				EmptyOrNoDiagnostics("exclude/exclude.go"), // filtered out
-				EmptyOrNoDiagnostics("include/include.go"), // successfully builds
+				NoDiagnostics("exclude/exclude.go"), // filtered out
+				NoDiagnostics("include/include.go"), // successfully builds
 			),
 		)
 	})
diff --git a/gopls/internal/regtest/workspace/standalone_test.go b/gopls/internal/regtest/workspace/standalone_test.go
index 8233458..698c8aa 100644
--- a/gopls/internal/regtest/workspace/standalone_test.go
+++ b/gopls/internal/regtest/workspace/standalone_test.go
@@ -219,7 +219,7 @@
 			OnceMet(
 				env.DoneWithOpen(),
 				env.DiagnosticAtRegexp("ignore.go", "package (main)"),
-				EmptyOrNoDiagnostics("standalone.go"),
+				NoDiagnostics("standalone.go"),
 			),
 		)
 
@@ -236,7 +236,7 @@
 		env.Await(
 			OnceMet(
 				env.DoneWithChange(),
-				EmptyOrNoDiagnostics("ignore.go"),
+				NoDiagnostics("ignore.go"),
 				env.DiagnosticAtRegexp("standalone.go", "package (main)"),
 			),
 		)
diff --git a/gopls/internal/regtest/workspace/workspace_test.go b/gopls/internal/regtest/workspace/workspace_test.go
index 0028f84..022b04f 100644
--- a/gopls/internal/regtest/workspace/workspace_test.go
+++ b/gopls/internal/regtest/workspace/workspace_test.go
@@ -652,7 +652,7 @@
 
 		// This fails if guarded with a OnceMet(DoneWithSave(), ...), because it is
 		// debounced (and therefore not synchronous with the change).
-		env.Await(EmptyOrNoDiagnostics("modb/go.mod"))
+		env.Await(NoDiagnostics("modb/go.mod"))
 
 		// Test Formatting.
 		env.SetBufferContent("go.work", `go 1.18
@@ -1173,7 +1173,7 @@
 	Run(t, ws, func(t *testing.T, env *Env) {
 		env.OpenFile("b/main.go")
 		env.AfterChange(
-			EmptyOrNoDiagnostics("a/main.go"),
+			NoDiagnostics("a/main.go"),
 		)
 		env.OpenFile("a/main.go")
 		env.Await(