diff --git a/server/events_test.go b/server/events_test.go
index 0056d697..ee02afab 100644
--- a/server/events_test.go
+++ b/server/events_test.go
@@ -423,13 +423,13 @@ func runSolicitWithCredentials(t *testing.T, opts *Options, creds string) (*Serv
 }
 
 // Helper function to check that a leaf node has connected to our server.
-func checkLeafNodeConnected(t *testing.T, s *Server) {
+func checkLeafNodeConnected(t testing.TB, s *Server) {
 	t.Helper()
 	checkLeafNodeConnectedCount(t, s, 1)
 }
 
 // Helper function to check that a leaf node has connected to n server.
-func checkLeafNodeConnectedCount(t *testing.T, s *Server, lnCons int) {
+func checkLeafNodeConnectedCount(t testing.TB, s *Server, lnCons int) {
 	t.Helper()
 	checkFor(t, 5*time.Second, 15*time.Millisecond, func() error {
 		if nln := s.NumLeafNodes(); nln != lnCons {
diff --git a/server/jetstream_helpers_test.go b/server/jetstream_helpers_test.go
index 95c8e303..7b591619 100644
--- a/server/jetstream_helpers_test.go
+++ b/server/jetstream_helpers_test.go
@@ -618,7 +618,7 @@ var jsClusterImportsTempl = `
 	}
 `
 
-func createMixedModeCluster(t *testing.T, tmpl string, clusterName, snPre string, numJsServers, numNonServers int, doJSConfig bool) *cluster {
+func createMixedModeCluster(t testing.TB, tmpl string, clusterName, snPre string, numJsServers, numNonServers int, doJSConfig bool) *cluster {
 	t.Helper()
 
 	if clusterName == _EMPTY_ || numJsServers < 0 || numNonServers < 1 {
@@ -672,27 +672,27 @@ func createMixedModeCluster(t *testing.T, tmpl string, clusterName, snPre string
 
 // This will create a cluster that is explicitly configured for the routes, etc.
 // and also has a defined clustername. All configs for routes and cluster name will be the same.
-func createJetStreamClusterExplicit(t *testing.T, clusterName string, numServers int) *cluster {
+func createJetStreamClusterExplicit(t testing.TB, clusterName string, numServers int) *cluster {
 	return createJetStreamClusterWithTemplate(t, jsClusterTempl, clusterName, numServers)
 }
 
-func createJetStreamClusterWithTemplate(t *testing.T, tmpl string, clusterName string, numServers int) *cluster {
+func createJetStreamClusterWithTemplate(t testing.TB, tmpl string, clusterName string, numServers int) *cluster {
 	return createJetStreamClusterWithTemplateAndModHook(t, tmpl, clusterName, numServers, nil)
 }
 
-func createJetStreamClusterWithTemplateAndModHook(t *testing.T, tmpl string, clusterName string, numServers int, modify modifyCb) *cluster {
+func createJetStreamClusterWithTemplateAndModHook(t testing.TB, tmpl string, clusterName string, numServers int, modify modifyCb) *cluster {
 	startPorts := []int{7_022, 9_022, 11_022, 15_022}
 	port := startPorts[rand.Intn(len(startPorts))]
 	return createJetStreamClusterAndModHook(t, tmpl, clusterName, _EMPTY_, numServers, port, true, modify)
 }
 
-func createJetStreamCluster(t *testing.T, tmpl string, clusterName, snPre string, numServers int, portStart int, waitOnReady bool) *cluster {
+func createJetStreamCluster(t testing.TB, tmpl string, clusterName, snPre string, numServers int, portStart int, waitOnReady bool) *cluster {
 	return createJetStreamClusterAndModHook(t, tmpl, clusterName, snPre, numServers, portStart, waitOnReady, nil)
 }
 
 type modifyCb func(serverName, clusterName, storeDir, conf string) string
 
-func createJetStreamClusterAndModHook(t *testing.T, tmpl string, clusterName, snPre string, numServers int, portStart int, waitOnReady bool, modify modifyCb) *cluster {
+func createJetStreamClusterAndModHook(t testing.TB, tmpl string, clusterName, snPre string, numServers int, portStart int, waitOnReady bool, modify modifyCb) *cluster {
 	t.Helper()
 	if clusterName == _EMPTY_ || numServers < 1 {
 		t.Fatalf("Bad params")
@@ -1043,7 +1043,7 @@ var skip = func(t *testing.T) {
 	t.SkipNow()
 }
 
-func jsClientConnect(t *testing.T, s *Server, opts ...nats.Option) (*nats.Conn, nats.JetStreamContext) {
+func jsClientConnect(t testing.TB, s *Server, opts ...nats.Option) (*nats.Conn, nats.JetStreamContext) {
 	t.Helper()
 	nc, err := nats.Connect(s.ClientURL(), opts...)
 	if err != nil {
@@ -1056,7 +1056,7 @@ func jsClientConnect(t *testing.T, s *Server, opts ...nats.Option) (*nats.Conn,
 	return nc, js
 }
 
-func jsClientConnectEx(t *testing.T, s *Server, domain string, opts ...nats.Option) (*nats.Conn, nats.JetStreamContext) {
+func jsClientConnectEx(t testing.TB, s *Server, domain string, opts ...nats.Option) (*nats.Conn, nats.JetStreamContext) {
 	t.Helper()
 	nc, err := nats.Connect(s.ClientURL(), opts...)
 	if err != nil {
@@ -1069,7 +1069,7 @@ func jsClientConnectEx(t *testing.T, s *Server, domain string, opts ...nats.Opti
 	return nc, js
 }
 
-func jsClientConnectCluster(t *testing.T, c *cluster, opts ...nats.Option) (*nats.Conn, nats.JetStreamContext) {
+func jsClientConnectCluster(t testing.TB, c *cluster, opts ...nats.Option) (*nats.Conn, nats.JetStreamContext) {
 	t.Helper()
 
 	var sb strings.Builder
@@ -1082,7 +1082,7 @@ func jsClientConnectCluster(t *testing.T, c *cluster, opts ...nats.Option) (*nat
 	return jsClientConnectURL(t, sb.String(), opts...)
 }
 
-func jsClientConnectURL(t *testing.T, url string, opts ...nats.Option) (*nats.Conn, nats.JetStreamContext) {
+func jsClientConnectURL(t testing.TB, url string, opts ...nats.Option) (*nats.Conn, nats.JetStreamContext) {
 	t.Helper()
 
 	nc, err := nats.Connect(url, opts...)
diff --git a/server/jwt_test.go b/server/jwt_test.go
index b8c9097e..251dfd6d 100644
--- a/server/jwt_test.go
+++ b/server/jwt_test.go
@@ -3330,28 +3330,28 @@ func createDir(t testing.TB, prefix string) string {
 	return dir
 }
 
-func createFile(t *testing.T, prefix string) *os.File {
+func createFile(t testing.TB, prefix string) *os.File {
 	t.Helper()
 	err := os.MkdirAll(tempRoot, 0700)
 	require_NoError(t, err)
 	return createFileAtDir(t, tempRoot, prefix)
 }
 
-func createFileAtDir(t *testing.T, dir, prefix string) *os.File {
+func createFileAtDir(t testing.TB, dir, prefix string) *os.File {
 	t.Helper()
 	f, err := os.CreateTemp(dir, prefix)
 	require_NoError(t, err)
 	return f
 }
 
-func removeDir(t *testing.T, dir string) {
+func removeDir(t testing.TB, dir string) {
 	t.Helper()
 	if err := os.RemoveAll(dir); err != nil {
 		t.Fatal(err)
 	}
 }
 
-func removeFile(t *testing.T, p string) {
+func removeFile(t testing.TB, p string) {
 	t.Helper()
 	if err := os.Remove(p); err != nil {
 		t.Fatal(err)
diff --git a/server/reload_test.go b/server/reload_test.go
index bd9da248..48a7d2e8 100644
--- a/server/reload_test.go
+++ b/server/reload_test.go
@@ -64,7 +64,7 @@ func newOptionsFromContent(t *testing.T, content []byte) (*Options, string) {
 	return opts, tmpFile
 }
 
-func createConfFile(t *testing.T, content []byte) string {
+func createConfFile(t testing.TB, content []byte) string {
 	t.Helper()
 	conf := createFile(t, "")
 	fName := conf.Name()
diff --git a/server/routes_test.go b/server/routes_test.go
index 0b552e9a..3c2beab9 100644
--- a/server/routes_test.go
+++ b/server/routes_test.go
@@ -285,7 +285,7 @@ func TestServerRoutesWithAuthAndBCrypt(t *testing.T) {
 }
 
 // Helper function to check that a cluster is formed
-func checkClusterFormed(t *testing.T, servers ...*Server) {
+func checkClusterFormed(t testing.TB, servers ...*Server) {
 	t.Helper()
 	expectedNumRoutes := len(servers) - 1
 	checkFor(t, 10*time.Second, 100*time.Millisecond, func() error {
diff --git a/server/server_test.go b/server/server_test.go
index 5021e868..5116c7b4 100644
--- a/server/server_test.go
+++ b/server/server_test.go
@@ -50,7 +50,7 @@ func checkForErr(totalWait, sleepDur time.Duration, f func() error) error {
 	return err
 }
 
-func checkFor(t *testing.T, totalWait, sleepDur time.Duration, f func() error) {
+func checkFor(t testing.TB, totalWait, sleepDur time.Duration, f func() error) {
 	t.Helper()
 	err := checkForErr(totalWait, sleepDur, f)
 	if err != nil {
diff --git a/server/test_test.go b/server/test_test.go
index 7327bb2f..9cb4c0c2 100644
--- a/server/test_test.go
+++ b/server/test_test.go
@@ -57,7 +57,7 @@ type cluster struct {
 	servers []*Server
 	opts    []*Options
 	name    string
-	t       *testing.T
+	t       testing.TB
 }
 
 func require_True(t *testing.T, b bool) {
diff --git a/test/cluster_test.go b/test/cluster_test.go
index 6fe577e4..eee1623b 100644
--- a/test/cluster_test.go
+++ b/test/cluster_test.go
@@ -26,7 +26,7 @@ import (
 )
 
 // Helper function to check that a cluster is formed
-func checkClusterFormed(t *testing.T, servers ...*server.Server) {
+func checkClusterFormed(t testing.TB, servers ...*server.Server) {
 	t.Helper()
 	expectedNumRoutes := len(servers) - 1
 	checkFor(t, 10*time.Second, 100*time.Millisecond, func() error {
diff --git a/test/routes_test.go b/test/routes_test.go
index 856329f9..e85c20aa 100644
--- a/test/routes_test.go
+++ b/test/routes_test.go
@@ -1099,7 +1099,7 @@ func TestRouteBasicPermissions(t *testing.T) {
 	}
 }
 
-func createConfFile(t *testing.T, content []byte) string {
+func createConfFile(t testing.TB, content []byte) string {
 	t.Helper()
 	conf := createFile(t, "")
 	fName := conf.Name()
diff --git a/test/test.go b/test/test.go
index b54f988d..8fe94b6a 100644
--- a/test/test.go
+++ b/test/test.go
@@ -638,7 +638,7 @@ func nextServerOpts(opts *server.Options) *server.Options {
 	return nopts
 }
 
-func createDir(t *testing.T, prefix string) string {
+func createDir(t testing.TB, prefix string) string {
 	t.Helper()
 	if err := os.MkdirAll(tempRoot, 0700); err != nil {
 		t.Fatal(err)
@@ -650,7 +650,7 @@ func createDir(t *testing.T, prefix string) string {
 	return dir
 }
 
-func createFile(t *testing.T, prefix string) *os.File {
+func createFile(t testing.TB, prefix string) *os.File {
 	t.Helper()
 	if err := os.MkdirAll(tempRoot, 0700); err != nil {
 		t.Fatal(err)
@@ -658,7 +658,7 @@ func createFile(t *testing.T, prefix string) *os.File {
 	return createFileAtDir(t, tempRoot, prefix)
 }
 
-func createFileAtDir(t *testing.T, dir, prefix string) *os.File {
+func createFileAtDir(t testing.TB, dir, prefix string) *os.File {
 	t.Helper()
 	f, err := os.CreateTemp(dir, prefix)
 	if err != nil {
@@ -667,14 +667,14 @@ func createFileAtDir(t *testing.T, dir, prefix string) *os.File {
 	return f
 }
 
-func removeDir(t *testing.T, dir string) {
+func removeDir(t testing.TB, dir string) {
 	t.Helper()
 	if err := os.RemoveAll(dir); err != nil {
 		t.Fatal(err)
 	}
 }
 
-func removeFile(t *testing.T, p string) {
+func removeFile(t testing.TB, p string) {
 	t.Helper()
 	if err := os.Remove(p); err != nil {
 		t.Fatal(err)
diff --git a/test/test_test.go b/test/test_test.go
index e78d9cea..43782e8e 100644
--- a/test/test_test.go
+++ b/test/test_test.go
@@ -27,7 +27,7 @@ import (
 	"golang.org/x/time/rate"
 )
 
-func checkFor(t *testing.T, totalWait, sleepDur time.Duration, f func() error) {
+func checkFor(t testing.TB, totalWait, sleepDur time.Duration, f func() error) {
 	t.Helper()
 	timeout := time.Now().Add(totalWait)
 	var err error