diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 76b18cdbe..3e1446a46 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,10 +21,10 @@ jobs:
     - name: test-tls
       run: |
         sudo apt-get -y install tcl tcl-tls
-        ./runtest --clients 1 --verbose --tls --config server-threads 3
+        ./runtest --clients 1 --verbose --tls
     - name: cluster-test
       run: |
-        ./runtest-cluster --tls --config server-threads 3
+        ./runtest-cluster --tls --config server-threads 1
     - name: sentinel test
       run: |
           ./runtest-sentinel
diff --git a/src/server.cpp b/src/server.cpp
index 3a1fbbede..222372d26 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -5167,7 +5167,7 @@ int prepareForShutdown(int flags) {
          * to unlink file actully) in background thread.
          * The temp rdb file fd may won't be closed when redis exits quickly,
          * but OS will close this fd when process exits. */
-        rdbRemoveTempFile(g_pserver->child_pid, 0);
+        rdbRemoveTempFile(g_pserver->child_pid, 1);
     }
 
     /* Kill module child if there is one. */
diff --git a/tests/cluster/run.tcl b/tests/cluster/run.tcl
index 7e1e91081..8a85e7ecb 100644
--- a/tests/cluster/run.tcl
+++ b/tests/cluster/run.tcl
@@ -7,7 +7,7 @@ source cluster.tcl
 source ../instances.tcl
 source ../../support/cluster.tcl ; # Redis Cluster client.
 
-set ::instances_count 20 ; # How many instances we use at max.
+set ::instances_count 10 ; # How many instances we use at max.
 set ::tlsdir "../../tls"
 
 proc main {} {
diff --git a/tests/cluster/tests/includes/init-tests.tcl b/tests/cluster/tests/includes/init-tests.tcl
index 466ab8f25..1f7ec8d57 100644
--- a/tests/cluster/tests/includes/init-tests.tcl
+++ b/tests/cluster/tests/includes/init-tests.tcl
@@ -26,6 +26,7 @@ test "Cluster nodes are reachable" {
 }
 
 test "Cluster nodes hard reset" {
+    after 60000
     foreach_redis_id id {
         if {$::valgrind} {
             set node_timeout 10000