diff --git a/agent/consul/config_endpoint_test.go b/agent/consul/config_endpoint_test.go
index 38f9034435..0df54f9a46 100644
--- a/agent/consul/config_endpoint_test.go
+++ b/agent/consul/config_endpoint_test.go
@@ -2344,12 +2344,6 @@ func TestConfigEntry_ProxyDefaultsExposeConfig(t *testing.T) {
 	require.Equal(t, expose, proxyConf.Expose)
 }
 
-// TODO: remove this function after all usages have been switched over
-func runStep(t *testing.T, name string, fn func(t *testing.T)) {
-	t.Helper()
-	testutil.RunStep(t, name, fn)
-}
-
 func Test_gateWriteToSecondary(t *testing.T) {
 	type args struct {
 		targetDC  string
diff --git a/agent/consul/state/catalog_test.go b/agent/consul/state/catalog_test.go
index 678397e524..e9f8aac771 100644
--- a/agent/consul/state/catalog_test.go
+++ b/agent/consul/state/catalog_test.go
@@ -8146,12 +8146,6 @@ func TestStateStore_EnsureService_ServiceNames(t *testing.T) {
 	require.Empty(t, got)
 }
 
-// TODO: remove this function after all usages have been switched over
-func runStep(t *testing.T, name string, fn func(t *testing.T)) {
-	t.Helper()
-	testutil.RunStep(t, name, fn)
-}
-
 func assertMaxIndexes(t *testing.T, tx ReadTxn, expect map[string]uint64, skip ...string) {
 	t.Helper()
 
diff --git a/agent/consul/stream/event_publisher_test.go b/agent/consul/stream/event_publisher_test.go
index 23eaf6ddf2..0d53409422 100644
--- a/agent/consul/stream/event_publisher_test.go
+++ b/agent/consul/stream/event_publisher_test.go
@@ -495,12 +495,6 @@ func TestEventPublisher_SubscribeWithIndexNotZero_NewSnapshot_WithCache(t *testi
 	})
 }
 
-// TODO: remove this function after all usages have been switched over
-func runStep(t *testing.T, name string, fn func(t *testing.T)) {
-	t.Helper()
-	testutil.RunStep(t, name, fn)
-}
-
 func TestEventPublisher_Unsubscribe_ClosesSubscription(t *testing.T) {
 	req := &SubscribeRequest{
 		Topic:   testTopic,
diff --git a/agent/grpc/private/services/subscribe/subscribe_test.go b/agent/grpc/private/services/subscribe/subscribe_test.go
index 3813606fd7..0dffc2db8c 100644
--- a/agent/grpc/private/services/subscribe/subscribe_test.go
+++ b/agent/grpc/private/services/subscribe/subscribe_test.go
@@ -941,12 +941,6 @@ func logError(t *testing.T, f func() error) func() {
 	}
 }
 
-// TODO: remove this function after all usages have been switched over
-func runStep(t *testing.T, name string, fn func(t *testing.T)) {
-	t.Helper()
-	testutil.RunStep(t, name, fn)
-}
-
 func TestNewEventFromSteamEvent(t *testing.T) {
 	type testCase struct {
 		name     string
diff --git a/agent/rpc/peering/testing.go b/agent/rpc/peering/testing.go
index e8b20b88f2..25b1f184b7 100644
--- a/agent/rpc/peering/testing.go
+++ b/agent/rpc/peering/testing.go
@@ -4,14 +4,12 @@ import (
 	"context"
 	"io"
 	"sync"
-	"testing"
 	"time"
 
 	"google.golang.org/grpc/metadata"
 
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/proto/pbpeering"
-	"github.com/hashicorp/consul/sdk/testutil"
 )
 
 // same certificate that appears in our connect tests
@@ -192,9 +190,3 @@ func (t *incrementalTime) Now() time.Time {
 	t.next++
 	return t.base.Add(time.Duration(t.next) * time.Second)
 }
-
-// TODO: remove this function after all usages have been switched over
-func runStep(t *testing.T, name string, fn func(t *testing.T)) {
-	t.Helper()
-	testutil.RunStep(t, name, fn)
-}
diff --git a/agent/rpcclient/health/view_test.go b/agent/rpcclient/health/view_test.go
index c26839ba0c..244a5f35a9 100644
--- a/agent/rpcclient/health/view_test.go
+++ b/agent/rpcclient/health/view_test.go
@@ -667,12 +667,6 @@ func validateNamespace(ns string) func(request *pbsubscribe.SubscribeRequest) er
 	}
 }
 
-// TODO: remove this function after all usages have been switched over
-func runStep(t *testing.T, name string, fn func(t *testing.T)) {
-	t.Helper()
-	testutil.RunStep(t, name, fn)
-}
-
 func TestNewFilterEvaluator(t *testing.T) {
 	type testCase struct {
 		name     string
diff --git a/agent/submatview/store_test.go b/agent/submatview/store_test.go
index e6fd06aa6e..78d7b1aa17 100644
--- a/agent/submatview/store_test.go
+++ b/agent/submatview/store_test.go
@@ -505,9 +505,3 @@ func TestStore_Run_ExpiresEntries(t *testing.T) {
 	require.Len(t, store.byKey, 0)
 	require.Equal(t, ttlcache.NotIndexed, e.expiry.Index())
 }
-
-// TODO: remove this function after all usages have been switched over
-func runStep(t *testing.T, name string, fn func(t *testing.T)) {
-	t.Helper()
-	testutil.RunStep(t, name, fn)
-}
diff --git a/agent/xds/xds_protocol_helpers_test.go b/agent/xds/xds_protocol_helpers_test.go
index a25b80adbc..1863aae0b2 100644
--- a/agent/xds/xds_protocol_helpers_test.go
+++ b/agent/xds/xds_protocol_helpers_test.go
@@ -795,12 +795,6 @@ func makeTestRoute(t *testing.T, fixtureName string) *envoy_route_v3.RouteConfig
 	}
 }
 
-// TODO: remove this function after all usages have been switched over
-func runStep(t *testing.T, name string, fn func(t *testing.T)) {
-	t.Helper()
-	testutil.RunStep(t, name, fn)
-}
-
 func requireProtocolVersionGauge(
 	t *testing.T,
 	scenario *testServerScenario,
diff --git a/api/config_entry_test.go b/api/config_entry_test.go
index 89db9f7965..ba20f34a6a 100644
--- a/api/config_entry_test.go
+++ b/api/config_entry_test.go
@@ -283,12 +283,6 @@ func TestAPI_ConfigEntries(t *testing.T) {
 	})
 }
 
-// TODO: remove this function after all usages have been switched over
-func runStep(t *testing.T, name string, fn func(t *testing.T)) {
-	t.Helper()
-	testutil.RunStep(t, name, fn)
-}
-
 func TestDecodeConfigEntry(t *testing.T) {
 	t.Parallel()
 
diff --git a/lib/ttlcache/eviction_test.go b/lib/ttlcache/eviction_test.go
index 99c4c92440..ab5ae83329 100644
--- a/lib/ttlcache/eviction_test.go
+++ b/lib/ttlcache/eviction_test.go
@@ -92,9 +92,3 @@ func testMessage(t *testing.T, ch <-chan struct{}) {
 		t.Fatal("should have a message")
 	}
 }
-
-// TODO: remove this function after all usages have been switched over
-func runStep(t *testing.T, name string, fn func(t *testing.T)) {
-	t.Helper()
-	testutil.RunStep(t, name, fn)
-}