diff --git a/buildserver/integration_test.go b/buildserver/integration_test.go
index b2fcda90..5259d824 100644
--- a/buildserver/integration_test.go
+++ b/buildserver/integration_test.go
@@ -239,9 +239,9 @@ func TestIntegration(t *testing.T) {
 					}
 					return orig(ctx, cloneURL, rev, zipURLTemplate)
 				}
-				defer func() {
+				t.Cleanup(func() {
 					gobuildserver.NewDepRepoVFS = orig
-				}()
+				})
 			}
 
 			ctx := context.Background()
diff --git a/buildserver/proxy_test.go b/buildserver/proxy_test.go
index 8314bcd7..ae8a4f79 100644
--- a/buildserver/proxy_test.go
+++ b/buildserver/proxy_test.go
@@ -496,18 +496,18 @@ func yza() {}
 					}
 					return nil, fmt.Errorf("no file system found for dep at %s rev %q", cloneURL, rev)
 				}
-				defer func() {
+				t.Cleanup(func() {
 					gobuildserver.NewDepRepoVFS = orig
-				}()
+				})
 
 				origRemoteFS := gobuildserver.RemoteFS
 				gobuildserver.RemoteFS = func(ctx context.Context, initializeParams lspext.InitializeParams) (ctxvfs.FileSystem, io.Closer, error) {
 					return mapFS(test.fs), ioutil.NopCloser(strings.NewReader("")), nil
 				}
 
-				defer func() {
+				t.Cleanup(func() {
 					gobuildserver.RemoteFS = origRemoteFS
-				}()
+				})
 			}
 
 			ctx := context.Background()
diff --git a/langserver/integration_test.go b/langserver/integration_test.go
index 411684cf..bd3d753e 100644
--- a/langserver/integration_test.go
+++ b/langserver/integration_test.go
@@ -477,11 +477,11 @@ func integrationTest(
 		notifies <- req
 		return nil, nil
 	}))
-	defer func() {
+	t.Cleanup(func() {
 		if err := conn.Close(); err != nil {
 			t.Fatal("conn.Close:", err)
 		}
-	}()
+	})
 
 	rootURI := util.PathToURI(rootFSPath)
 	params := InitializeParams{
diff --git a/langserver/internal/godef/go/types/types_test.go b/langserver/internal/godef/go/types/types_test.go
index 1d42e863..2a64a76b 100644
--- a/langserver/internal/godef/go/types/types_test.go
+++ b/langserver/internal/godef/go/types/types_test.go
@@ -107,12 +107,12 @@ func checkExprs(t *testing.T, pkg *ast.File, importer Importer, fset *token.File
 		default:
 			return true
 		}
-		defer func() {
+		t.Cleanup(func() {
 			if err := recover(); err != nil {
 				t.Fatalf("panic (%v) on %T", err, e)
 				//t.Fatalf("panic (%v) on %v at %v\n", err, e, FileSet.Position(e.Pos()))
 			}
-		}()
+		})
 		obj, _ := ExprType(e, importer, fset)
 		if obj == nil && mustResolve {
 			t.Errorf("no object for %v(%p, %T) at %v\n", e, e, e, fset.Position(e.Pos()))
@@ -127,9 +127,9 @@ func TestStdLib(t *testing.T) {
 		t.SkipNow()
 	}
 	Panic = false
-	defer func() {
+	t.Cleanup(func() {
 		Panic = true
-	}()
+	})
 	root := os.Getenv("GOROOT") + "/src"
 	cache := make(map[string]*ast.Package)
 	fset := token.NewFileSet()
diff --git a/langserver/langserver_test.go b/langserver/langserver_test.go
index 8b0d2e2b..ed0af7c7 100644
--- a/langserver/langserver_test.go
+++ b/langserver/langserver_test.go
@@ -1233,11 +1233,11 @@ func TestServer(t *testing.T) {
 			addr, done := startServer(t, jsonrpc2.HandlerWithError(h.handle))
 			defer done()
 			conn := dialServer(t, addr)
-			defer func() {
+			t.Cleanup(func() {
 				if err := conn.Close(); err != nil {
 					t.Fatal("conn.Close:", err)
 				}
-			}()
+			})
 
 			rootFSPath := util.UriToPath(test.rootURI)