diff --git a/workflow/controller/operator_persist_test.go b/workflow/controller/operator_persist_test.go
index 689958de0214..317a4dc09402 100644
--- a/workflow/controller/operator_persist_test.go
+++ b/workflow/controller/operator_persist_test.go
@@ -67,7 +67,7 @@ func TestPersistWithoutLargeWfSupport(t *testing.T) {
 	assert.Equal(t, wfv1.WorkflowError, woc.wf.Status.Phase)
 }
 
-// TestPersistWithoutLargeWfSupport verifies persistence error with no largeWFsuppport
+// TestPersistErrorWithoutLargeWfSupport verifies persistence error with no largeWFsuppport
 func TestPersistErrorWithoutLargeWfSupport(t *testing.T) {
 	defer makeMax()()
 	cancel, controller := newController()
@@ -87,7 +87,7 @@ func TestPersistErrorWithoutLargeWfSupport(t *testing.T) {
 	assert.Equal(t, wfv1.WorkflowError, wf.Status.Phase)
 }
 
-// TestPersistWithoutLargeWfSupport verifies persistence with largeWFsuppport
+// TestPersistWithLargeWfSupport verifies persistence with largeWFsuppport
 func TestPersistWithLargeWfSupport(t *testing.T) {
 	defer makeMax()()
 	cancel, controller := newController()
@@ -115,7 +115,7 @@ func TestPersistWithLargeWfSupport(t *testing.T) {
 	assert.Empty(t, woc.wf.Status.CompressedNodes)
 }
 
-// TestPersistWithoutLargeWfSupport verifies persistence error with largeWFsuppport
+// TestPersistErrorWithLargeWfSupport verifies persistence error with largeWFsuppport
 func TestPersistErrorWithLargeWfSupport(t *testing.T) {
 	defer makeMax()()
 	cancel, controller := newController()
diff --git a/workflow/controller/operator_test.go b/workflow/controller/operator_test.go
index ac9a350dc7b5..91992b56d4f3 100644
--- a/workflow/controller/operator_test.go
+++ b/workflow/controller/operator_test.go
@@ -977,7 +977,7 @@ func parseRetryMessage(message string) (int, error) {
 	return totalSeconds, nil
 }
 
-// TestProcessNodeRetries tests retrying when RetryOn.Error is disabled
+// TestProcessNodesNoRetryWithError tests retrying when RetryOn.Error is disabled
 func TestProcessNodesNoRetryWithError(t *testing.T) {
 	cancel, controller := newController()
 	defer cancel()
diff --git a/workflow/controller/workflowpod_test.go b/workflow/controller/workflowpod_test.go
index f87c81b6f59d..9186f0e0772a 100644
--- a/workflow/controller/workflowpod_test.go
+++ b/workflow/controller/workflowpod_test.go
@@ -125,7 +125,7 @@ script:
     ls -al
 `
 
-// TestScriptTemplateWithVolume ensure we can a script pod with input artifacts
+// TestScriptTemplateWithoutVolumeOptionalArtifact ensure we can a script pod with input artifacts
 func TestScriptTemplateWithoutVolumeOptionalArtifact(t *testing.T) {
 	volumeMount := apiv1.VolumeMount{
 		Name:             "input-artifacts",
@@ -499,7 +499,7 @@ func TestConditionalNoAddArchiveLocation(t *testing.T) {
 	assert.Nil(t, tmpl.ArchiveLocation)
 }
 
-// TestConditionalNoAddArchiveLocation verifies we do  add archive location if it is needed for logs
+// TestConditionalAddArchiveLocationArchiveLogs verifies we do  add archive location if it is needed for logs
 func TestConditionalAddArchiveLocationArchiveLogs(t *testing.T) {
 	ctx := context.Background()
 	woc := newWoc()
@@ -523,7 +523,7 @@ func TestConditionalAddArchiveLocationArchiveLogs(t *testing.T) {
 	assert.NotNil(t, tmpl.ArchiveLocation)
 }
 
-// TestConditionalNoAddArchiveLocation verifies we add archive location when it is needed
+// TestConditionalArchiveLocation verifies we add archive location when it is needed
 func TestConditionalArchiveLocation(t *testing.T) {
 	ctx := context.Background()
 	wf := wfv1.MustUnmarshalWorkflow(helloWorldWf)
diff --git a/workflow/executor/common/common_test.go b/workflow/executor/common/common_test.go
index ab62f0364672..b54453bcf3d6 100644
--- a/workflow/executor/common/common_test.go
+++ b/workflow/executor/common/common_test.go
@@ -36,7 +36,7 @@ func (*MockKC) CreateArchive(ctx context.Context, containerName, sourcePath stri
 	return nil, nil
 }
 
-// TestScriptTemplateWithVolume ensure we can a script pod with input artifacts
+// TestTerminatePodWithContainerName ensure we can a script pod with input artifacts
 func TestTerminatePodWithContainerName(t *testing.T) {
 	// Already terminated.
 	mock := &MockKC{
diff --git a/workflow/validate/validate_test.go b/workflow/validate/validate_test.go
index 4ff81fa4d772..9d08ccd2fbb2 100644
--- a/workflow/validate/validate_test.go
+++ b/workflow/validate/validate_test.go
@@ -1868,7 +1868,7 @@ spec:
       args: ["echo {{inputs.parameters.parameter}}"]
 `
 
-// TestInvalidResourceWorkflow verifies an error against a workflow of an invalid resource.
+// TestRuntimeResolutionOfVariableNames verifies an error against a workflow of an invalid resource.
 func TestRuntimeResolutionOfVariableNames(t *testing.T) {
 	wf := unmarshalWf(runtimeResolutionOfVariableNames)
 	err := ValidateWorkflow(wftmplGetter, cwftmplGetter, wf, ValidateOpts{})