diff --git a/server/jetstream_cluster_3_test.go b/server/jetstream_cluster_3_test.go
index 7ab208aa219..46138816b5b 100644
--- a/server/jetstream_cluster_3_test.go
+++ b/server/jetstream_cluster_3_test.go
@@ -1046,6 +1046,7 @@ func TestJetStreamClusterSourceWithOptStartTime(t *testing.T) {
 			sd := s.JetStreamConfig().StoreDir
 			s.Shutdown()
 			s = RunJetStreamServerOnPort(-1, sd)
+			defer s.Shutdown()
 		}
 
 		// Wait a bit before checking because sync'ing (even with the defect)
@@ -2728,13 +2729,16 @@ func TestJetStreamClusterInterestPolicyEphemeral(t *testing.T) {
 			}
 
 			const msgs = 5_000
-			done, count := make(chan bool), 0
+			done, count := make(chan bool, 1), 0
 
 			sub, err := js.Subscribe(_EMPTY_, func(msg *nats.Msg) {
 				require_NoError(t, msg.Ack())
 				count++
 				if count >= msgs {
-					done <- true
+					select {
+					case done <- true:
+					default:
+					}
 				}
 			}, nats.Bind(test.stream, name), nats.ManualAck())
 			require_NoError(t, err)
diff --git a/server/jetstream_test.go b/server/jetstream_test.go
index 91b82ca15db..a777af68cff 100644
--- a/server/jetstream_test.go
+++ b/server/jetstream_test.go
@@ -18642,6 +18642,7 @@ func TestJetStreamAccountPurge(t *testing.T) {
 	require_NoError(t, os.Remove(storeDir+"/jwt/"+accpub+".jwt"))
 
 	s, o = RunServerWithConfig(o.ConfigFile)
+	defer s.Shutdown()
 	inspectDirs(t, 1)
 	purge(t)
 	inspectDirs(t, 0)
diff --git a/server/norace_test.go b/server/norace_test.go
index a4ca6b9edc8..d0883f5e365 100644
--- a/server/norace_test.go
+++ b/server/norace_test.go
@@ -6121,12 +6121,15 @@ func TestNoRaceJetStreamClusterEnsureWALCompact(t *testing.T) {
 	err = node.InstallSnapshot(snap)
 	require_NoError(t, err)
 
-	received, done := 0, make(chan bool)
+	received, done := 0, make(chan bool, 1)
 
 	nc.Subscribe("zz", func(m *nats.Msg) {
 		received++
 		if received >= ns {
-			done <- true
+			select {
+			case done <- true:
+			default:
+			}
 		}
 		m.Ack()
 	})