diff --git a/server/jwt_test.go b/server/jwt_test.go
index 68591d06..c5c6b492 100644
--- a/server/jwt_test.go
+++ b/server/jwt_test.go
@@ -2130,7 +2130,7 @@ func TestAccountURLResolverFetchFailureInCluster(t *testing.T) {
 		cluster {
 			name: clust
 			no_advertise: true
-			listen: -1 
+			listen: -1
 			routes [
 				nats-route://localhost:%d
 			]
@@ -3407,7 +3407,7 @@ func TestAccountNATSResolverFetch(t *testing.T) {
 		}
 		cluster {
 			name: clust
-			listen: -1 
+			listen: -1
 			no_advertise: true
 			routes [
 				nats-route://localhost:%d
@@ -3431,7 +3431,7 @@ func TestAccountNATSResolverFetch(t *testing.T) {
 		}
 		cluster {
 			name: clust
-			listen: -1 
+			listen: -1
 			no_advertise: true
 			routes [
 				nats-route://localhost:%d
@@ -3650,7 +3650,7 @@ func TestAccountNATSResolverCrossClusterFetch(t *testing.T) {
 		}
 		cluster {
 			name: clust-A
-			listen: -1 
+			listen: -1
 			no_advertise: true
 			routes [
 				nats-route://localhost:%d
@@ -4107,7 +4107,7 @@ func TestJWTJetStreamLimits(t *testing.T) {
 	}
 	expect_JSDisabledForAccount := func(c *nats.Conn) {
 		t.Helper()
-		if _, err := c.Request("$JS.API.INFO", nil, time.Second); err != nats.ErrTimeout {
+		if _, err := c.Request("$JS.API.INFO", nil, time.Second); err != nats.ErrTimeout && err != nats.ErrNoResponders {
 			t.Fatalf("Unexpected error: %v", err)
 		}
 	}
diff --git a/server/reload_test.go b/server/reload_test.go
index 0d46fe51..50d11efd 100644
--- a/server/reload_test.go
+++ b/server/reload_test.go
@@ -3180,7 +3180,7 @@ func TestConfigReloadAccountServicesImportExport(t *testing.T) {
 			if string(msg.Data) != reply {
 				t.Fatalf("Expected reply %s on subject %s, got %s", reply, subj, msg.Data)
 			}
-		} else if err != nats.ErrTimeout {
+		} else if err != nats.ErrTimeout && err != nats.ErrNoResponders {
 			t.Fatalf("Expected timeout on subject %s, got %v", subj, err)
 		}
 	}