diff --git a/test/e2e/apps/daemon_restart.go b/test/e2e/apps/daemon_restart.go
index e49670115b7..32e4b109c47 100644
--- a/test/e2e/apps/daemon_restart.go
+++ b/test/e2e/apps/daemon_restart.go
@@ -311,7 +311,6 @@ var _ = SIGDescribe("DaemonRestart [Disruptive]", func() {
 		if err != nil {
 			framework.Logf("Unexpected error occurred: %v", err)
 		}
-		// TODO: write a wrapper for ExpectNoErrorWithOffset()
 		framework.ExpectNoErrorWithOffset(0, err)
 		preRestarts, badNodes := getContainerRestarts(f.ClientSet, ns, labelSelector)
 		if preRestarts != 0 {
diff --git a/test/e2e/autoscaling/cluster_size_autoscaling.go b/test/e2e/autoscaling/cluster_size_autoscaling.go
index 0d74b04aa7a..7ae78971900 100644
--- a/test/e2e/autoscaling/cluster_size_autoscaling.go
+++ b/test/e2e/autoscaling/cluster_size_autoscaling.go
@@ -1241,7 +1241,6 @@ func getPoolNodes(f *framework.Framework, poolName string) []*v1.Node {
 	if err != nil {
 		framework.Logf("Unexpected error occurred: %v", err)
 	}
-	// TODO: write a wrapper for ExpectNoErrorWithOffset()
 	framework.ExpectNoErrorWithOffset(0, err)
 	for _, node := range nodeList.Items {
 		if node.Labels[gkeNodepoolNameKey] == poolName {
diff --git a/test/e2e/cloud/nodes.go b/test/e2e/cloud/nodes.go
index 09cfc0e9dc1..11293d56a44 100644
--- a/test/e2e/cloud/nodes.go
+++ b/test/e2e/cloud/nodes.go
@@ -52,7 +52,6 @@ var _ = SIGDescribe("[Feature:CloudProvider][Disruptive] Nodes", func() {
 		if err != nil {
 			framework.Logf("Unexpected error occurred: %v", err)
 		}
-		// TODO: write a wrapper for ExpectNoErrorWithOffset()
 		framework.ExpectNoErrorWithOffset(0, err)
 
 		framework.Logf("Original number of ready nodes: %d", len(origNodes.Items))
diff --git a/test/e2e/scheduling/predicates.go b/test/e2e/scheduling/predicates.go
index 8689f71ff61..32314e76eca 100644
--- a/test/e2e/scheduling/predicates.go
+++ b/test/e2e/scheduling/predicates.go
@@ -106,7 +106,6 @@ var _ = SIGDescribe("SchedulerPredicates [Serial]", func() {
 			framework.Logf("Unexpected error occurred: %v", err)
 		}
 
-		// TODO: write a wrapper for ExpectNoErrorWithOffset()
 		framework.ExpectNoErrorWithOffset(0, err)
 
 		err = framework.CheckTestingNSDeletedExcept(cs, ns)
diff --git a/test/e2e/scheduling/preemption.go b/test/e2e/scheduling/preemption.go
index ba898f625b3..07940e8a208 100644
--- a/test/e2e/scheduling/preemption.go
+++ b/test/e2e/scheduling/preemption.go
@@ -92,7 +92,6 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() {
 		if err != nil {
 			framework.Logf("Unexpected error occurred: %v", err)
 		}
-		// TODO: write a wrapper for ExpectNoErrorWithOffset()
 		framework.ExpectNoErrorWithOffset(0, err)
 
 		err = framework.CheckTestingNSDeletedExcept(cs, ns)
diff --git a/test/e2e/scheduling/priorities.go b/test/e2e/scheduling/priorities.go
index 0f3ba0df72c..e96ff7d0a14 100644
--- a/test/e2e/scheduling/priorities.go
+++ b/test/e2e/scheduling/priorities.go
@@ -148,7 +148,6 @@ var _ = SIGDescribe("SchedulerPriorities [Serial]", func() {
 		if err != nil {
 			framework.Logf("Unexpected error occurred: %v", err)
 		}
-		// TODO: write a wrapper for ExpectNoErrorWithOffset()
 		framework.ExpectNoErrorWithOffset(0, err)
 
 		err = framework.CheckTestingNSDeletedExcept(cs, ns)