diff --git a/gopls/go.mod b/gopls/go.mod
index 5cf2cf72f9..bdc0b56a24 100644
--- a/gopls/go.mod
+++ b/gopls/go.mod
@@ -5,6 +5,7 @@ go 1.13
 require (
 	github.com/sergi/go-diff v1.1.0
 	golang.org/x/tools v0.0.0-20200828161849-5deb26317202
+	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1
 	honnef.co/go/tools v0.0.1-2020.1.5
 	mvdan.cc/gofumpt v0.0.0-20200802201014-ab5a8192947d
 	mvdan.cc/xurls/v2 v2.2.0
diff --git a/internal/lsp/regtest/bench_test.go b/gopls/internal/regtest/bench_test.go
similarity index 100%
rename from internal/lsp/regtest/bench_test.go
rename to gopls/internal/regtest/bench_test.go
diff --git a/internal/lsp/regtest/codelens_test.go b/gopls/internal/regtest/codelens_test.go
similarity index 100%
rename from internal/lsp/regtest/codelens_test.go
rename to gopls/internal/regtest/codelens_test.go
diff --git a/internal/lsp/regtest/completion_test.go b/gopls/internal/regtest/completion_test.go
similarity index 100%
rename from internal/lsp/regtest/completion_test.go
rename to gopls/internal/regtest/completion_test.go
diff --git a/internal/lsp/regtest/definition_test.go b/gopls/internal/regtest/definition_test.go
similarity index 100%
rename from internal/lsp/regtest/definition_test.go
rename to gopls/internal/regtest/definition_test.go
diff --git a/internal/lsp/regtest/diagnostics_test.go b/gopls/internal/regtest/diagnostics_test.go
similarity index 100%
rename from internal/lsp/regtest/diagnostics_test.go
rename to gopls/internal/regtest/diagnostics_test.go
diff --git a/internal/lsp/regtest/doc.go b/gopls/internal/regtest/doc.go
similarity index 100%
rename from internal/lsp/regtest/doc.go
rename to gopls/internal/regtest/doc.go
diff --git a/internal/lsp/regtest/env.go b/gopls/internal/regtest/env.go
similarity index 100%
rename from internal/lsp/regtest/env.go
rename to gopls/internal/regtest/env.go
diff --git a/internal/lsp/regtest/env_test.go b/gopls/internal/regtest/env_test.go
similarity index 100%
rename from internal/lsp/regtest/env_test.go
rename to gopls/internal/regtest/env_test.go
diff --git a/internal/lsp/regtest/fix_test.go b/gopls/internal/regtest/fix_test.go
similarity index 100%
rename from internal/lsp/regtest/fix_test.go
rename to gopls/internal/regtest/fix_test.go
diff --git a/internal/lsp/regtest/formatting_test.go b/gopls/internal/regtest/formatting_test.go
similarity index 100%
rename from internal/lsp/regtest/formatting_test.go
rename to gopls/internal/regtest/formatting_test.go
diff --git a/internal/lsp/regtest/generate_test.go b/gopls/internal/regtest/generate_test.go
similarity index 100%
rename from internal/lsp/regtest/generate_test.go
rename to gopls/internal/regtest/generate_test.go
diff --git a/internal/lsp/regtest/imports_test.go b/gopls/internal/regtest/imports_test.go
similarity index 100%
rename from internal/lsp/regtest/imports_test.go
rename to gopls/internal/regtest/imports_test.go
diff --git a/internal/lsp/regtest/link_test.go b/gopls/internal/regtest/link_test.go
similarity index 100%
rename from internal/lsp/regtest/link_test.go
rename to gopls/internal/regtest/link_test.go
diff --git a/internal/lsp/regtest/modfile_test.go b/gopls/internal/regtest/modfile_test.go
similarity index 100%
rename from internal/lsp/regtest/modfile_test.go
rename to gopls/internal/regtest/modfile_test.go
diff --git a/internal/lsp/regtest/references_test.go b/gopls/internal/regtest/references_test.go
similarity index 100%
rename from internal/lsp/regtest/references_test.go
rename to gopls/internal/regtest/references_test.go
diff --git a/internal/lsp/regtest/reg_test.go b/gopls/internal/regtest/reg_test.go
similarity index 100%
rename from internal/lsp/regtest/reg_test.go
rename to gopls/internal/regtest/reg_test.go
diff --git a/internal/lsp/regtest/runner.go b/gopls/internal/regtest/runner.go
similarity index 100%
rename from internal/lsp/regtest/runner.go
rename to gopls/internal/regtest/runner.go
diff --git a/internal/lsp/regtest/shared_test.go b/gopls/internal/regtest/shared_test.go
similarity index 100%
rename from internal/lsp/regtest/shared_test.go
rename to gopls/internal/regtest/shared_test.go
diff --git a/internal/lsp/regtest/stress_test.go b/gopls/internal/regtest/stress_test.go
similarity index 100%
rename from internal/lsp/regtest/stress_test.go
rename to gopls/internal/regtest/stress_test.go
diff --git a/internal/lsp/regtest/symbol_helper_test.go b/gopls/internal/regtest/symbol_helper_test.go
similarity index 100%
rename from internal/lsp/regtest/symbol_helper_test.go
rename to gopls/internal/regtest/symbol_helper_test.go
diff --git a/internal/lsp/regtest/symbol_test.go b/gopls/internal/regtest/symbol_test.go
similarity index 100%
rename from internal/lsp/regtest/symbol_test.go
rename to gopls/internal/regtest/symbol_test.go
diff --git a/internal/lsp/regtest/unix_test.go b/gopls/internal/regtest/unix_test.go
similarity index 100%
rename from internal/lsp/regtest/unix_test.go
rename to gopls/internal/regtest/unix_test.go
diff --git a/internal/lsp/regtest/vendor_test.go b/gopls/internal/regtest/vendor_test.go
similarity index 100%
rename from internal/lsp/regtest/vendor_test.go
rename to gopls/internal/regtest/vendor_test.go
diff --git a/internal/lsp/regtest/watch_test.go b/gopls/internal/regtest/watch_test.go
similarity index 100%
rename from internal/lsp/regtest/watch_test.go
rename to gopls/internal/regtest/watch_test.go
diff --git a/internal/lsp/regtest/workspace_test.go b/gopls/internal/regtest/workspace_test.go
similarity index 100%
rename from internal/lsp/regtest/workspace_test.go
rename to gopls/internal/regtest/workspace_test.go
diff --git a/internal/lsp/regtest/wrappers.go b/gopls/internal/regtest/wrappers.go
similarity index 100%
rename from internal/lsp/regtest/wrappers.go
rename to gopls/internal/regtest/wrappers.go