diff --git a/tests/unit/moduleapi/cross-version-cluster.tcl b/tests/unit/moduleapi/cross-version-cluster.tcl
index 40b38efea3..a1a36aeb7f 100644
--- a/tests/unit/moduleapi/cross-version-cluster.tcl
+++ b/tests/unit/moduleapi/cross-version-cluster.tcl
@@ -2,7 +2,8 @@
 #
 # Use minimal.conf to make sure we don't use any configs not supported on the old version.
 
-# To disable `SELECT` command to be ran on the server.
+# make sure the test infra won't use SELECT
+set old_singledb $::singledb
 set ::singledb 1
 
 tags {external:skip needs:other-server cluster modules} {
@@ -58,4 +59,6 @@ start_server {config "minimal-cluster.conf" start-other-server 1} {
         }
     }
 }
-}
\ No newline at end of file
+}
+
+set ::singledb $old_singledb
\ No newline at end of file