diff --git a/client/build_test.go b/client/build_test.go
index 22ca6c81bab6..35a587b28926 100644
--- a/client/build_test.go
+++ b/client/build_test.go
@@ -1221,7 +1221,7 @@ func testClientGatewayContainerExecTty(t *testing.T, sb integration.Sandbox) {
 	checkAllReleasable(t, c, sb, true)
 }
 
-// testClientGatewayContainerExecTty is testing the tty shuts down cleanly
+// testClientGatewayContainerCancelExecTty is testing the tty shuts down cleanly
 // on context.Cancel
 func testClientGatewayContainerCancelExecTty(t *testing.T, sb integration.Sandbox) {
 	requiresLinux(t)
diff --git a/executor/runcexecutor/executor.go b/executor/runcexecutor/executor.go
index c4a70ea37432..310806106706 100644
--- a/executor/runcexecutor/executor.go
+++ b/executor/runcexecutor/executor.go
@@ -479,7 +479,7 @@ func (s *forwardIO) Stderr() io.ReadCloser {
 	return nil
 }
 
-// newRuncProcKiller returns an abstraction for sending SIGKILL to the
+// newRunProcKiller returns an abstraction for sending SIGKILL to the
 // process inside the container initiated from `runc run`.
 func newRunProcKiller(runC *runc.Runc, id string) procKiller {
 	return procKiller{runC: runC, id: id}
diff --git a/solver/scheduler_test.go b/solver/scheduler_test.go
index 2a3544ba4cff..81acbc986ed3 100644
--- a/solver/scheduler_test.go
+++ b/solver/scheduler_test.go
@@ -2378,7 +2378,7 @@ func TestSlowCacheAvoidAccess(t *testing.T) {
 	require.Equal(t, int64(1), cacheManager.loadCounter)
 }
 
-// TestSlowCacheAvoidExecOnCache tests a regression where an input with
+// TestSlowCacheAvoidLoadOnCache tests a regression where an input with
 // possible matches and a content based checksum should not try to checksum
 // before other inputs with no keys have at least made into a slow state.
 // moby/buildkit#648
diff --git a/util/overlay/overlay_linux.go b/util/overlay/overlay_linux.go
index e424cc627304..a5d4ed472196 100644
--- a/util/overlay/overlay_linux.go
+++ b/util/overlay/overlay_linux.go
@@ -271,7 +271,7 @@ func checkDelete(path string, base string, f os.FileInfo) (delete, skip bool, _
 	return false, false, nil
 }
 
-// checkDelete checks if the specified file is an opaque directory
+// checkOpaque checks if the specified file is an opaque directory
 func checkOpaque(upperdir string, path string, base string, f os.FileInfo) (isOpaque bool, _ error) {
 	if f.IsDir() {
 		for _, oKey := range []string{"trusted.overlay.opaque", "user.overlay.opaque"} {