diff --git a/tests/unit/bitops.tcl b/tests/unit/bitops.tcl
index 5945d32d710c..127a0e680346 100644
--- a/tests/unit/bitops.tcl
+++ b/tests/unit/bitops.tcl
@@ -76,7 +76,12 @@ start_server {tags {"bitops"}} {
     test {BITCOUNT regression test for github issue #582} {
         r del str
         r setbit foo 0 1
-        r bitcount foo 0 4294967296
+        if {[catch {r bitcount foo 0 4294967296} e]} {
+            assert_match {*ERR*out of range*} $e
+            set _ 1
+        } else {
+            set e
+        }
     } {1}
 
     test {BITOP NOT (empty string)} {