diff --git a/task/backend/executor/limits_test.go b/task/backend/executor/limits_test.go
index cb779471ef..2578154e74 100644
--- a/task/backend/executor/limits_test.go
+++ b/task/backend/executor/limits_test.go
@@ -52,7 +52,4 @@ func TestTaskConcurrency(t *testing.T) {
 	if err := clFunc(taskWith10Concurrency, r4); err != nil {
 		t.Fatal(err)
 	}
-
-	// TODO(lh): add testing around infinite concurrency once the task options
-	// are not setting a default concurrency to 1.
 }
diff --git a/task/backend/middleware/middleware_test.go b/task/backend/middleware/middleware_test.go
index a7e7c81545..8267fe8bb2 100644
--- a/task/backend/middleware/middleware_test.go
+++ b/task/backend/middleware/middleware_test.go
@@ -30,7 +30,6 @@ func timeoutSelector(ch <-chan scheduler.ID) (scheduler.ID, error) {
 
 const script = `option task = {name: "a task",cron: "* * * * *"} from(bucket:"test") |> range(start:-1h)`
 
-// TODO(lh): Once we have a kv.TaskService this entire part can be replaced with kv.TaskService using a inmem kv.Store
 func inmemTaskService() influxdb.TaskService {
 	gen := snowflake.NewDefaultIDGenerator()
 	tasks := map[influxdb.ID]*influxdb.Task{}
diff --git a/task/servicetest/servicetest.go b/task/servicetest/servicetest.go
index 577797a665..79abd0f83d 100644
--- a/task/servicetest/servicetest.go
+++ b/task/servicetest/servicetest.go
@@ -1017,8 +1017,6 @@ func testTaskRuns(t *testing.T, sys *System) {
 			t.Fatalf("expected: 1970-01-01T00:01:17Z, got %s", r.ScheduledFor)
 		}
 
-		// TODO(lh): Once we have moved over to kv we can list runs and see the manual queue in the list
-
 		// Forcing the same run before it's executed should be rejected.
 		if _, err = sys.TaskService.ForceRun(sys.Ctx, task.ID, scheduledFor); err == nil {
 			t.Fatalf("subsequent force should have been rejected; failed to error: %s", task.ID)
@@ -1474,7 +1472,6 @@ func testRunStorage(t *testing.T, sys *System) {
 
 	// Look for a run that doesn't exist.
 	_, err = sys.TaskService.FindRunByID(sys.Ctx, task.ID, influxdb.ID(math.MaxUint64))
-	// TODO(lh): use kv.ErrRunNotFound in the future. Our error's are not exact
 	if err == nil {
 		t.Fatalf("expected %s but got %s instead", influxdb.ErrRunNotFound, err)
 	}