diff --git a/tests/cluster/tests/18-info.tcl b/tests/cluster/tests/18-info.tcl
index 68c62d357..744934990 100644
--- a/tests/cluster/tests/18-info.tcl
+++ b/tests/cluster/tests/18-info.tcl
@@ -41,5 +41,5 @@ test "errorstats: rejected call due to MOVED Redirection" {
     }
     assert_match {} [errorstat $pok MOVED]
     assert_match {*count=1*} [errorstat $perr MOVED]
-    assert_match {*calls=0,*,rejected_calls=1,failed_calls=0} [cmdstat $perr set]
+    assert_match {*calls=0,*,rejected_calls=1,failed_calls=0*} [cmdstat $perr set]
 }
diff --git a/tests/unit/acl.tcl b/tests/unit/acl.tcl
index 6f9d94f29..77bb37095 100644
--- a/tests/unit/acl.tcl
+++ b/tests/unit/acl.tcl
@@ -357,7 +357,7 @@ start_server {tags {"acl external:skip"}} {
         assert_error {*NOPERM No permissions to access a key*} {$rd read}
         $rd ping
         $rd close
-        assert_match {*calls=0,usec=0,*,rejected_calls=1,failed_calls=0} [cmdrstat blpop r]
+        assert_match {*calls=0,usec=0,*,rejected_calls=1,failed_calls=0*} [cmdrstat blpop r]
     }
 
     test {Users can be configured to authenticate with any password} {
diff --git a/tests/unit/info.tcl b/tests/unit/info.tcl
index 0dee39d55..07543b3ad 100644
--- a/tests/unit/info.tcl
+++ b/tests/unit/info.tcl
@@ -121,7 +121,7 @@ start_server {tags {"info" "external:skip"}} {
             catch {r auth k} e
             assert_match {ERR AUTH*} $e
             assert_match {*count=1*} [errorstat ERR]
-            assert_match {*calls=1,*,rejected_calls=0,failed_calls=1} [cmdstat auth]
+            assert_match {*calls=1,*,rejected_calls=0,failed_calls=1*} [cmdstat auth]
             assert_equal [s total_error_replies] 1
             r config resetstat
             assert_match {} [errorstat ERR]
@@ -137,15 +137,15 @@ start_server {tags {"info" "external:skip"}} {
             catch {r exec} e
             assert_match {ERR AUTH*} $e
             assert_match {*count=1*} [errorstat ERR]
-            assert_match {*calls=1,*,rejected_calls=0,failed_calls=0} [cmdstat set]
-            assert_match {*calls=1,*,rejected_calls=0,failed_calls=1} [cmdstat auth]
-            assert_match {*calls=1,*,rejected_calls=0,failed_calls=0} [cmdstat exec]
+            assert_match {*calls=1,*,rejected_calls=0,failed_calls=0*} [cmdstat set]
+            assert_match {*calls=1,*,rejected_calls=0,failed_calls=1*} [cmdstat auth]
+            assert_match {*calls=1,*,rejected_calls=0,failed_calls=0*} [cmdstat exec]
             assert_equal [s total_error_replies] 1
 
             # MULTI/EXEC command errors should still be pinpointed to him
             catch {r exec} e
             assert_match {ERR EXEC without MULTI} $e
-            assert_match {*calls=2,*,rejected_calls=0,failed_calls=1} [cmdstat exec]
+            assert_match {*calls=2,*,rejected_calls=0,failed_calls=1*} [cmdstat exec]
             assert_match {*count=2*} [errorstat ERR]
             assert_equal [s total_error_replies] 2
         }
@@ -174,7 +174,7 @@ start_server {tags {"info" "external:skip"}} {
             catch {r evalsha NotValidShaSUM 0} e
             assert_match {NOSCRIPT*} $e
             assert_match {*count=1*} [errorstat NOSCRIPT]
-            assert_match {*calls=1,*,rejected_calls=0,failed_calls=1} [cmdstat evalsha]
+            assert_match {*calls=1,*,rejected_calls=0,failed_calls=1*} [cmdstat evalsha]
             assert_equal [s total_error_replies] 1
             r config resetstat
             assert_match {} [errorstat NOSCRIPT]
@@ -188,7 +188,7 @@ start_server {tags {"info" "external:skip"}} {
             catch {r XGROUP CREATECONSUMER mystream mygroup consumer} e
             assert_match {NOGROUP*} $e
             assert_match {*count=1*} [errorstat NOGROUP]
-            assert_match {*calls=1,*,rejected_calls=0,failed_calls=1} [cmdstat xgroup\\|createconsumer]
+            assert_match {*calls=1,*,rejected_calls=0,failed_calls=1*} [cmdstat xgroup\\|createconsumer]
             r config resetstat
             assert_match {} [errorstat NOGROUP]
         }
@@ -217,9 +217,9 @@ start_server {tags {"info" "external:skip"}} {
             assert_match {*count=1*} [errorstat ERR]
             assert_match {*count=1*} [errorstat EXECABORT]
             assert_equal [s total_error_replies] 2
-            assert_match {*calls=0,*,rejected_calls=1,failed_calls=0} [cmdstat set]
-            assert_match {*calls=1,*,rejected_calls=0,failed_calls=0} [cmdstat multi]
-            assert_match {*calls=1,*,rejected_calls=0,failed_calls=1} [cmdstat exec]
+            assert_match {*calls=0,*,rejected_calls=1,failed_calls=0*} [cmdstat set]
+            assert_match {*calls=1,*,rejected_calls=0,failed_calls=0*} [cmdstat multi]
+            assert_match {*calls=1,*,rejected_calls=0,failed_calls=1*} [cmdstat exec]
             assert_equal [s total_error_replies] 2
             r config resetstat
             assert_match {} [errorstat ERR]
@@ -232,11 +232,11 @@ start_server {tags {"info" "external:skip"}} {
             catch {r set k} e
             assert_match {ERR wrong number of arguments for 'set' command} $e
             assert_match {*count=1*} [errorstat ERR]
-            assert_match {*calls=0,*,rejected_calls=1,failed_calls=0} [cmdstat set]
+            assert_match {*calls=0,*,rejected_calls=1,failed_calls=0*} [cmdstat set]
             # ensure that after a rejected command, valid ones are counted properly
             r set k1 v1
             r set k2 v2
-            assert_match {calls=2,*,rejected_calls=1,failed_calls=0} [cmdstat set]
+            assert_match {calls=2,*,rejected_calls=1,failed_calls=0*} [cmdstat set]
             assert_equal [s total_error_replies] 1
         }
 
@@ -248,7 +248,7 @@ start_server {tags {"info" "external:skip"}} {
             catch {r set a b} e
             assert_match {OOM*} $e
             assert_match {*count=1*} [errorstat OOM]
-            assert_match {*calls=0,*,rejected_calls=1,failed_calls=0} [cmdstat set]
+            assert_match {*calls=0,*,rejected_calls=1,failed_calls=0*} [cmdstat set]
             assert_equal [s total_error_replies] 1
             r config resetstat
             assert_match {} [errorstat OOM]
@@ -264,7 +264,7 @@ start_server {tags {"info" "external:skip"}} {
             catch {r set a b} e
             assert_match {NOPERM*} $e
             assert_match {*count=1*} [errorstat NOPERM]
-            assert_match {*calls=0,*,rejected_calls=1,failed_calls=0} [cmdstat set]
+            assert_match {*calls=0,*,rejected_calls=1,failed_calls=0*} [cmdstat set]
             assert_equal [s total_error_replies] 1
             r config resetstat
             assert_match {} [errorstat NOPERM]
@@ -283,7 +283,7 @@ start_server {tags {"info" "external:skip"}} {
             r client unblock $rd_id error
             assert_error {UNBLOCKED*} {$rd read}
             assert_match {*count=1*} [errorstat UNBLOCKED]
-            assert_match {*calls=1,*,rejected_calls=0,failed_calls=1} [cmdstat blpop]
+            assert_match {*calls=1,*,rejected_calls=0,failed_calls=1*} [cmdstat blpop]
             assert_equal [s total_error_replies] 1
             $rd close
         }
diff --git a/tests/unit/moduleapi/blockedclient.tcl b/tests/unit/moduleapi/blockedclient.tcl
index 7dcc1d6a6..71aafd444 100644
--- a/tests/unit/moduleapi/blockedclient.tcl
+++ b/tests/unit/moduleapi/blockedclient.tcl
@@ -248,16 +248,16 @@ foreach call_type {nested normal} {
         # RM_Call that propagates an error
         assert_error "WRONGTYPE*" {r do_rm_call hgetall x}
         assert_equal [errorrstat WRONGTYPE r] {count=1}
-        assert_match {*calls=1,*,rejected_calls=0,failed_calls=1} [cmdrstat hgetall r]
+        assert_match {*calls=1,*,rejected_calls=0,failed_calls=1*} [cmdrstat hgetall r]
 
         # RM_Call from bg thread that propagates an error
         assert_error "WRONGTYPE*" {r do_bg_rm_call hgetall x}
         assert_equal [errorrstat WRONGTYPE r] {count=2}
-        assert_match {*calls=2,*,rejected_calls=0,failed_calls=2} [cmdrstat hgetall r]
+        assert_match {*calls=2,*,rejected_calls=0,failed_calls=2*} [cmdrstat hgetall r]
 
         assert_equal [s total_error_replies] 6
-        assert_match {*calls=5,*,rejected_calls=0,failed_calls=4} [cmdrstat do_rm_call r]
-        assert_match {*calls=2,*,rejected_calls=0,failed_calls=2} [cmdrstat do_bg_rm_call r]
+        assert_match {*calls=5,*,rejected_calls=0,failed_calls=4*} [cmdrstat do_rm_call r]
+        assert_match {*calls=2,*,rejected_calls=0,failed_calls=2*} [cmdrstat do_bg_rm_call r]
     }
 
     set master [srv 0 client]
diff --git a/tests/unit/moduleapi/moduleauth.tcl b/tests/unit/moduleapi/moduleauth.tcl
index f8b721ce1..16951175c 100644
--- a/tests/unit/moduleapi/moduleauth.tcl
+++ b/tests/unit/moduleapi/moduleauth.tcl
@@ -36,15 +36,15 @@ start_server {tags {"modules external:skip"}} {
         r acl setuser foo >pwd on ~* &* +@all
         assert_equal {OK} [r AUTH foo allow]
         assert_error {*Auth denied by Misc Module*} {r AUTH foo deny}
-        assert_match {*calls=2,*,rejected_calls=0,failed_calls=1} [cmdstat auth]
+        assert_match {*calls=2,*,rejected_calls=0,failed_calls=1*} [cmdstat auth]
         assert_error {*WRONGPASS*} {r AUTH foo nomatch}
-        assert_match {*calls=3,*,rejected_calls=0,failed_calls=2} [cmdstat auth]
+        assert_match {*calls=3,*,rejected_calls=0,failed_calls=2*} [cmdstat auth]
         assert_equal {OK} [r AUTH foo pwd]
         # Test for No Pass user
         r acl setuser foo on ~* &* +@all nopass
         assert_equal {OK} [r AUTH foo allow]
         assert_error {*Auth denied by Misc Module*} {r AUTH foo deny}
-        assert_match {*calls=6,*,rejected_calls=0,failed_calls=3} [cmdstat auth]
+        assert_match {*calls=6,*,rejected_calls=0,failed_calls=3*} [cmdstat auth]
         assert_equal {OK} [r AUTH foo nomatch]
 
         # Validate that the Module added an ACL Log entry.
@@ -67,13 +67,13 @@ start_server {tags {"modules external:skip"}} {
         assert_equal $hello3_response [r HELLO 3 AUTH foo allow]
         # Validate denying AUTH for the HELLO cmd
         assert_error {*Auth denied by Misc Module*} {r HELLO 2 AUTH foo deny}
-        assert_match {*calls=5,*,rejected_calls=0,failed_calls=1} [cmdstat hello]
+        assert_match {*calls=5,*,rejected_calls=0,failed_calls=1*} [cmdstat hello]
         assert_error {*WRONGPASS*} {r HELLO 2 AUTH foo nomatch}
-        assert_match {*calls=6,*,rejected_calls=0,failed_calls=2} [cmdstat hello]
+        assert_match {*calls=6,*,rejected_calls=0,failed_calls=2*} [cmdstat hello]
         assert_error {*Auth denied by Misc Module*} {r HELLO 3 AUTH foo deny}
-        assert_match {*calls=7,*,rejected_calls=0,failed_calls=3} [cmdstat hello]
+        assert_match {*calls=7,*,rejected_calls=0,failed_calls=3*} [cmdstat hello]
         assert_error {*WRONGPASS*} {r HELLO 3 AUTH foo nomatch}
-        assert_match {*calls=8,*,rejected_calls=0,failed_calls=4} [cmdstat hello]
+        assert_match {*calls=8,*,rejected_calls=0,failed_calls=4*} [cmdstat hello]
 
         # Validate that the Module added an ACL Log entry.
         set entry [lindex [r ACL LOG] 1]
@@ -97,10 +97,10 @@ start_server {tags {"modules external:skip"}} {
         r client setname client0
         assert_error {*Auth denied by Misc Module*} {r HELLO 2 AUTH foo deny setname client1}
         assert {[r client getname] eq {client0}}
-        assert_match {*calls=3,*,rejected_calls=0,failed_calls=1} [cmdstat hello]
+        assert_match {*calls=3,*,rejected_calls=0,failed_calls=1*} [cmdstat hello]
         assert_error {*WRONGPASS*} {r HELLO 2 AUTH foo nomatch setname client2}
         assert {[r client getname] eq {client0}}
-        assert_match {*calls=4,*,rejected_calls=0,failed_calls=2} [cmdstat hello]
+        assert_match {*calls=4,*,rejected_calls=0,failed_calls=2*} [cmdstat hello]
     }
 
     test {test blocking module AUTH} {
@@ -109,15 +109,15 @@ start_server {tags {"modules external:skip"}} {
         r acl setuser foo >pwd on ~* &* +@all
         assert_equal {OK} [r AUTH foo block_allow]
         assert_error {*Auth denied by Misc Module*} {r AUTH foo block_deny}
-        assert_match {*calls=2,*,rejected_calls=0,failed_calls=1} [cmdstat auth]
+        assert_match {*calls=2,*,rejected_calls=0,failed_calls=1*} [cmdstat auth]
         assert_error {*WRONGPASS*} {r AUTH foo nomatch}
-        assert_match {*calls=3,*,rejected_calls=0,failed_calls=2} [cmdstat auth]
+        assert_match {*calls=3,*,rejected_calls=0,failed_calls=2*} [cmdstat auth]
         assert_equal {OK} [r AUTH foo pwd]
         # Test for No Pass user
         r acl setuser foo on ~* &* +@all nopass
         assert_equal {OK} [r AUTH foo block_allow]
         assert_error {*Auth denied by Misc Module*} {r AUTH foo block_deny}
-        assert_match {*calls=6,*,rejected_calls=0,failed_calls=3} [cmdstat auth]
+        assert_match {*calls=6,*,rejected_calls=0,failed_calls=3*} [cmdstat auth]
         assert_equal {OK} [r AUTH foo nomatch]
         # Validate that every Blocking AUTH command took at least 500000 usec.
         set stats [cmdstat auth]
@@ -144,13 +144,13 @@ start_server {tags {"modules external:skip"}} {
         assert_equal $hello3_response [r HELLO 3 AUTH foo block_allow]
         # validate denying AUTH for the HELLO cmd
         assert_error {*Auth denied by Misc Module*} {r HELLO 2 AUTH foo block_deny}
-        assert_match {*calls=5,*,rejected_calls=0,failed_calls=1} [cmdstat hello]
+        assert_match {*calls=5,*,rejected_calls=0,failed_calls=1*} [cmdstat hello]
         assert_error {*WRONGPASS*} {r HELLO 2 AUTH foo nomatch}
-        assert_match {*calls=6,*,rejected_calls=0,failed_calls=2} [cmdstat hello]
+        assert_match {*calls=6,*,rejected_calls=0,failed_calls=2*} [cmdstat hello]
         assert_error {*Auth denied by Misc Module*} {r HELLO 3 AUTH foo block_deny}
-        assert_match {*calls=7,*,rejected_calls=0,failed_calls=3} [cmdstat hello]
+        assert_match {*calls=7,*,rejected_calls=0,failed_calls=3*} [cmdstat hello]
         assert_error {*WRONGPASS*} {r HELLO 3 AUTH foo nomatch}
-        assert_match {*calls=8,*,rejected_calls=0,failed_calls=4} [cmdstat hello]
+        assert_match {*calls=8,*,rejected_calls=0,failed_calls=4*} [cmdstat hello]
         # Validate that every HELLO AUTH command took at least 500000 usec.
         set stats [cmdstat hello]
         regexp "usec_per_call=(\[0-9]{1,})\.*," $stats all usec_per_call
@@ -178,10 +178,10 @@ start_server {tags {"modules external:skip"}} {
         r client setname client0
         assert_error {*Auth denied by Misc Module*} {r HELLO 2 AUTH foo block_deny setname client1}
         assert {[r client getname] eq {client0}}
-        assert_match {*calls=3,*,rejected_calls=0,failed_calls=1} [cmdstat hello]
+        assert_match {*calls=3,*,rejected_calls=0,failed_calls=1*} [cmdstat hello]
         assert_error {*WRONGPASS*} {r HELLO 2 AUTH foo nomatch setname client2}
         assert {[r client getname] eq {client0}}
-        assert_match {*calls=4,*,rejected_calls=0,failed_calls=2} [cmdstat hello]
+        assert_match {*calls=4,*,rejected_calls=0,failed_calls=2*} [cmdstat hello]
         # Validate that every HELLO AUTH SETNAME command took at least 500000 usec.
         set stats [cmdstat hello]
         regexp "usec_per_call=(\[0-9]{1,})\.*," $stats all usec_per_call
@@ -205,7 +205,7 @@ start_server {tags {"modules external:skip"}} {
 
         # Case 2 - Non Blocking Deny
         assert_error {*Auth denied by Misc Module*} {r AUTH foo deny}
-        assert_match {*calls=2,*,rejected_calls=0,failed_calls=1} [cmdstat auth]
+        assert_match {*calls=2,*,rejected_calls=0,failed_calls=1*} [cmdstat auth]
 
         r config resetstat
 
@@ -214,7 +214,7 @@ start_server {tags {"modules external:skip"}} {
 
         # Case 4 - Blocking Deny
         assert_error {*Auth denied by Misc Module*} {r AUTH foo block_deny}
-        assert_match {*calls=2,*,rejected_calls=0,failed_calls=1} [cmdstat auth]
+        assert_match {*calls=2,*,rejected_calls=0,failed_calls=1*} [cmdstat auth]
 
         # Validate that every Blocking AUTH command took at least 500000 usec.
         set stats [cmdstat auth]
@@ -228,13 +228,13 @@ start_server {tags {"modules external:skip"}} {
 
         # Case 6 - Non Blocking Deny via the second module.
         assert_error {*Auth denied by Misc Module*} {r AUTH foo deny_two}
-        assert_match {*calls=2,*,rejected_calls=0,failed_calls=1} [cmdstat auth]
+        assert_match {*calls=2,*,rejected_calls=0,failed_calls=1*} [cmdstat auth]
 
         r config resetstat
 
         # Case 7 - All four auth callbacks "Skip" by not explicitly allowing or denying.
         assert_error {*WRONGPASS*} {r AUTH foo nomatch}
-        assert_match {*calls=1,*,rejected_calls=0,failed_calls=1} [cmdstat auth]
+        assert_match {*calls=1,*,rejected_calls=0,failed_calls=1*} [cmdstat auth]
         assert_equal {OK} [r AUTH foo pwd]
 
         # Because we had to attempt all 4 callbacks, validate that the AUTH command took at least
@@ -283,7 +283,7 @@ start_server {tags {"modules external:skip"}} {
         r multi
         r AUTH foo block_allow
         assert_error {*ERR Blocking module command called from transaction*} {r exec}
-        assert_match {*calls=2,*,rejected_calls=0,failed_calls=1} [cmdstat auth]
+        assert_match {*calls=2,*,rejected_calls=0,failed_calls=1*} [cmdstat auth]
     }
 
     test {Disabling Redis User during blocking module auth} {
@@ -300,7 +300,7 @@ start_server {tags {"modules external:skip"}} {
         wait_for_blocked_clients_count 0 500 10
         $rd flush
         assert_error {*WRONGPASS*} { $rd read }
-        assert_match {*calls=1,*,rejected_calls=0,failed_calls=1} [cmdstat auth]
+        assert_match {*calls=1,*,rejected_calls=0,failed_calls=1*} [cmdstat auth]
     }
 
     test {Killing a client in the middle of blocking module auth} {
@@ -354,7 +354,7 @@ start_server {tags {"modules external:skip"}} {
         $rd flush
         assert_equal [$rd read] "OK"
         set stats [cmdstat auth]
-        assert_match {*calls=1,*,rejected_calls=0,failed_calls=0} $stats
+        assert_match {*calls=1,*,rejected_calls=0,failed_calls=0*} $stats
 
         # Validate that even the new blocking module auth cb which was registered in the middle of
         # blocking module auth is attempted - making it take twice the duration (2x 500000 us).
@@ -387,7 +387,7 @@ start_server {tags {"modules external:skip"}} {
         wait_for_blocked_clients_count 0 500 10
         $rd flush
         assert_equal [$rd read] "OK"
-        assert_match {*calls=1,*,rejected_calls=0,failed_calls=0} [cmdstat auth]
+        assert_match {*calls=1,*,rejected_calls=0,failed_calls=0*} [cmdstat auth]
 
         # Validate that unloading the moduleauthtwo module does not unregister module auth cbs of
         # of the testacl module. Module based auth should succeed.
@@ -400,6 +400,6 @@ start_server {tags {"modules external:skip"}} {
         assert_error {*WRONGPASS*} {r AUTH foo block_allow}
         assert_error {*WRONGPASS*} {r AUTH foo allow_two}
         assert_error {*WRONGPASS*} {r AUTH foo allow}
-        assert_match {*calls=5,*,rejected_calls=0,failed_calls=3} [cmdstat auth]
+        assert_match {*calls=5,*,rejected_calls=0,failed_calls=3*} [cmdstat auth]
     }
 }
diff --git a/tests/unit/type/list.tcl b/tests/unit/type/list.tcl
index 8d17c5c38..96f80e9fb 100644
--- a/tests/unit/type/list.tcl
+++ b/tests/unit/type/list.tcl
@@ -2366,7 +2366,7 @@ foreach {pop} {BLPOP BLMPOP_RIGHT} {
         r LPUSH mylist 1
         wait_for_blocked_clients_count 0
         
-        assert_match {*calls=1,*,rejected_calls=0,failed_calls=0} [cmdrstat blpop r]
+        assert_match {*calls=1,*,rejected_calls=0,failed_calls=0*} [cmdrstat blpop r]
         
         $rd close
     }
@@ -2390,7 +2390,7 @@ foreach {pop} {BLPOP BLMPOP_RIGHT} {
         # unblock the client on timeout
         r client unblock $id timeout
         
-        assert_match {*calls=1,*,rejected_calls=0,failed_calls=0} [cmdrstat blpop r]
+        assert_match {*calls=1,*,rejected_calls=0,failed_calls=0*} [cmdrstat blpop r]
         
         $rd close
     }
diff --git a/tests/unit/type/stream-cgroups.tcl b/tests/unit/type/stream-cgroups.tcl
index 357e3baea..60e40596b 100644
--- a/tests/unit/type/stream-cgroups.tcl
+++ b/tests/unit/type/stream-cgroups.tcl
@@ -690,7 +690,7 @@ start_server {
 
         # verify command stats, error stats and error counter work on failed blocked command
         assert_match {*count=1*} [errorrstat NOGROUP r]
-        assert_match {*calls=1,*,rejected_calls=0,failed_calls=1} [cmdrstat xreadgroup r]
+        assert_match {*calls=1,*,rejected_calls=0,failed_calls=1*} [cmdrstat xreadgroup r]
         assert_equal [s total_error_replies] 1
     }