diff --git a/pkg/apis/pipeline/v1/resultref_test.go b/pkg/apis/pipeline/v1/resultref_test.go
index 22f0dba5f3d..a5790b290fb 100644
--- a/pkg/apis/pipeline/v1/resultref_test.go
+++ b/pkg/apis/pipeline/v1/resultref_test.go
@@ -842,7 +842,7 @@ func TestLooksLikeResultRefWhenExpressionFalse(t *testing.T) {
 	}
 }
 
-// TestPipelineTaskResultReferences tests that PipelineTaskResultRefs()
+// TestPipelineTaskResultRefs tests that PipelineTaskResultRefs()
 // parses all the result variables used in a PipelineTask correctly and
 // returns them all in the expected order.
 func TestPipelineTaskResultRefs(t *testing.T) {
diff --git a/pkg/apis/pipeline/v1alpha1/run_types_test.go b/pkg/apis/pipeline/v1alpha1/run_types_test.go
index 6ca2eba30dd..f805882352d 100644
--- a/pkg/apis/pipeline/v1alpha1/run_types_test.go
+++ b/pkg/apis/pipeline/v1alpha1/run_types_test.go
@@ -233,7 +233,7 @@ func TestRunIsCancelledWithMessage(t *testing.T) {
 	}
 }
 
-// TestRunStatusExtraFields tests that extraFields in a RunStatus can be parsed
+// TestRunStatus tests that extraFields in a RunStatus can be parsed
 // from YAML.
 func TestRunStatus(t *testing.T) {
 	in := `apiVersion: tekton.dev/v1alpha1
diff --git a/pkg/apis/pipeline/v1beta1/resultref_test.go b/pkg/apis/pipeline/v1beta1/resultref_test.go
index 6e775582733..aa46dd09a7f 100644
--- a/pkg/apis/pipeline/v1beta1/resultref_test.go
+++ b/pkg/apis/pipeline/v1beta1/resultref_test.go
@@ -623,7 +623,7 @@ func TestLooksLikeResultRefWhenExpressionFalse(t *testing.T) {
 	}
 }
 
-// TestPipelineTaskResultReferences tests that PipelineTaskResultRefs()
+// TestPipelineTaskResultRefs tests that PipelineTaskResultRefs()
 // parses all the result variables used in a PipelineTask correctly and
 // returns them all in the expected order.
 func TestPipelineTaskResultRefs(t *testing.T) {
diff --git a/pkg/apis/resolution/v1alpha1/resolution_request_conversion.go b/pkg/apis/resolution/v1alpha1/resolution_request_conversion.go
index 10d4da384b7..71cbe99c4c8 100644
--- a/pkg/apis/resolution/v1alpha1/resolution_request_conversion.go
+++ b/pkg/apis/resolution/v1alpha1/resolution_request_conversion.go
@@ -112,7 +112,7 @@ func (rrs *ResolutionRequestSpec) ConvertFrom(ctx context.Context, from *v1beta1
 	return nil
 }
 
-// convertTo converts a v1alpha1.ResolutionRequestStatus to a v1beta1.ResolutionRequestStatus
+// convertFrom converts a v1alpha1.ResolutionRequestStatus to a v1beta1.ResolutionRequestStatus
 func (rrs *ResolutionRequestStatus) convertFrom(ctx context.Context, from *v1beta1.ResolutionRequestStatus) {
 	rrs.Data = from.Data
 
diff --git a/pkg/entrypoint/entrypointer.go b/pkg/entrypoint/entrypointer.go
index 0be35256b77..b25075faac8 100644
--- a/pkg/entrypoint/entrypointer.go
+++ b/pkg/entrypoint/entrypointer.go
@@ -400,7 +400,7 @@ func findReplacement(stepDir string, s string) (string, []string, error) {
 	return replaceWithString, replaceWithArray, nil
 }
 
-// replaceCommandAndArgs performs replacements for step results in environment variables.
+// replaceEnv performs replacements for step results in environment variables.
 func replaceEnv(stepDir string) error {
 	for _, e := range os.Environ() {
 		pair := strings.SplitN(e, "=", 2)
diff --git a/pkg/reconciler/pipelinerun/affinity_assistant_test.go b/pkg/reconciler/pipelinerun/affinity_assistant_test.go
index 3024dd740b0..d20a18526c0 100644
--- a/pkg/reconciler/pipelinerun/affinity_assistant_test.go
+++ b/pkg/reconciler/pipelinerun/affinity_assistant_test.go
@@ -465,7 +465,7 @@ func TestCreateOrUpdateAffinityAssistantsAndPVCs_Failure(t *testing.T) {
 	}
 }
 
-// TestCreateAffinityAssistantWhenNodeIsCordoned tests an existing Affinity Assistant can identify the node failure and
+// TestCreateOrUpdateAffinityAssistantWhenNodeIsCordoned tests an existing Affinity Assistant can identify the node failure and
 // can migrate the affinity assistant pod to a healthy node so that the existing pipelineRun runs to competition
 func TestCreateOrUpdateAffinityAssistantWhenNodeIsCordoned(t *testing.T) {
 	expectedAffinityAssistantName := GetAffinityAssistantName(workspacePVCName, testPRWithPVC.Name)