diff --git a/packages/client/lib/commands/BLMOVE.spec.ts b/packages/client/lib/commands/BLMOVE.spec.ts
index 3afda7f8a0..489afff09b 100644
--- a/packages/client/lib/commands/BLMOVE.spec.ts
+++ b/packages/client/lib/commands/BLMOVE.spec.ts
@@ -1,5 +1,5 @@
 import { strict as assert } from 'assert';
-import testUtils, { GLOBAL } from '../test-utils';
+import testUtils, { GLOBAL, MIN_BLOCKING_TIME } from '../test-utils';
 import BLMOVE from './BLMOVE';
 
 describe('BLMOVE', () => {
@@ -14,7 +14,7 @@ describe('BLMOVE', () => {
 
   testUtils.testAll('blMove - null', async client => {
     assert.equal(
-      await client.blMove('{tag}source', '{tag}destination', 'LEFT', 'RIGHT', Number.MIN_VALUE),
+      await client.blMove('{tag}source', '{tag}destination', 'LEFT', 'RIGHT', MIN_BLOCKING_TIME),
       null
     );
   }, {
@@ -25,7 +25,7 @@ describe('BLMOVE', () => {
   testUtils.testAll('blMove - with member', async client => {
     const [, reply] = await Promise.all([
       client.lPush('{tag}source', 'element'),
-      client.blMove('{tag}source', '{tag}destination', 'LEFT', 'RIGHT', Number.MIN_VALUE)
+      client.blMove('{tag}source', '{tag}destination', 'LEFT', 'RIGHT', MIN_BLOCKING_TIME)
     ]);
     assert.equal(reply, 'element');
   }, {
diff --git a/packages/client/lib/commands/BLMPOP.spec.ts b/packages/client/lib/commands/BLMPOP.spec.ts
index 6e87446ca8..6a2f01c4ed 100644
--- a/packages/client/lib/commands/BLMPOP.spec.ts
+++ b/packages/client/lib/commands/BLMPOP.spec.ts
@@ -1,5 +1,5 @@
 import { strict as assert } from 'assert';
-import testUtils, { GLOBAL } from '../test-utils';
+import testUtils, { GLOBAL, MIN_BLOCKING_TIME } from '../test-utils';
 import BLMPOP from './BLMPOP';
 
 describe('BLMPOP', () => {
@@ -25,7 +25,7 @@ describe('BLMPOP', () => {
 
   testUtils.testAll('blmPop - null', async client => {
     assert.equal(
-      await client.blmPop(Number.MIN_VALUE, 'key', 'RIGHT'),
+      await client.blmPop(MIN_BLOCKING_TIME, 'key', 'RIGHT'),
       null
     );
   }, {
@@ -36,7 +36,7 @@ describe('BLMPOP', () => {
   testUtils.testAll('blmPop - with member', async client => {
     const [, reply] = await Promise.all([
       client.lPush('key', 'element'),
-      client.blmPop(Number.MIN_VALUE, 'key', 'RIGHT')
+      client.blmPop(MIN_BLOCKING_TIME, 'key', 'RIGHT')
     ]);
     assert.deepEqual(reply, [
       'key',
diff --git a/packages/client/lib/commands/BLPOP.spec.ts b/packages/client/lib/commands/BLPOP.spec.ts
index 35b9d95396..ca9dd76ce7 100644
--- a/packages/client/lib/commands/BLPOP.spec.ts
+++ b/packages/client/lib/commands/BLPOP.spec.ts
@@ -1,5 +1,5 @@
 import { strict as assert } from 'assert';
-import testUtils, { GLOBAL } from '../test-utils';
+import testUtils, { GLOBAL, BLOCKING_MIN_VALUE } from '../test-utils';
 import BLPOP from './BLPOP';
 
 describe('BLPOP', () => {
@@ -21,7 +21,7 @@ describe('BLPOP', () => {
 
   testUtils.testAll('blPop - null', async client => {
     assert.equal(
-      await client.blPop('key', Number.MIN_VALUE),
+      await client.blPop('key', BLOCKING_MIN_VALUE),
       null
     );
   }, {
diff --git a/packages/client/lib/commands/BRPOP.spec.ts b/packages/client/lib/commands/BRPOP.spec.ts
index f484036aca..3e61ff7581 100644
--- a/packages/client/lib/commands/BRPOP.spec.ts
+++ b/packages/client/lib/commands/BRPOP.spec.ts
@@ -1,5 +1,5 @@
 import { strict as assert } from 'assert';
-import testUtils, { GLOBAL } from '../test-utils';
+import testUtils, { GLOBAL, BLOCKING_MIN_VALUE } from '../test-utils';
 import BRPOP from './BRPOP';
 
 describe('BRPOP', () => {
@@ -21,7 +21,7 @@ describe('BRPOP', () => {
 
   testUtils.testAll('brPop - null', async client => {
     assert.equal(
-      await client.brPop('key', Number.MIN_VALUE),
+      await client.brPop('key', BLOCKING_MIN_VALUE),
       null
     );
   }, {
diff --git a/packages/client/lib/commands/BRPOPLPUSH.spec.ts b/packages/client/lib/commands/BRPOPLPUSH.spec.ts
index 1c1484868b..d9f433707d 100644
--- a/packages/client/lib/commands/BRPOPLPUSH.spec.ts
+++ b/packages/client/lib/commands/BRPOPLPUSH.spec.ts
@@ -1,5 +1,5 @@
 import { strict as assert } from 'assert';
-import testUtils, { GLOBAL } from '../test-utils';
+import testUtils, { GLOBAL, BLOCKING_MIN_VALUE } from '../test-utils';
 import BRPOPLPUSH from './BRPOPLPUSH';
 
 describe('BRPOPLPUSH', () => {
@@ -15,7 +15,7 @@ describe('BRPOPLPUSH', () => {
       await client.brPopLPush(
         '{tag}source',
         '{tag}destination',
-        Number.MIN_VALUE
+        BLOCKING_MIN_VALUE
       ),
       null
     );
diff --git a/packages/client/lib/commands/BZMPOP.spec.ts b/packages/client/lib/commands/BZMPOP.spec.ts
index 60bc3fe471..dcd480c872 100644
--- a/packages/client/lib/commands/BZMPOP.spec.ts
+++ b/packages/client/lib/commands/BZMPOP.spec.ts
@@ -1,5 +1,5 @@
 import { strict as assert } from 'assert';
-import testUtils, { GLOBAL } from '../test-utils';
+import testUtils, { GLOBAL, BLOCKING_MIN_VALUE } from '../test-utils';
 import BZMPOP from './BZMPOP';
 
 describe('BZMPOP', () => {
@@ -25,7 +25,7 @@ describe('BZMPOP', () => {
 
   testUtils.testAll('bzmPop - null', async client => {
     assert.equal(
-      await client.bzmPop(Number.MIN_VALUE, 'key', 'MAX'),
+      await client.bzmPop(BLOCKING_MIN_VALUE, 'key', 'MAX'),
       null
     );
   }, {
@@ -41,7 +41,7 @@ describe('BZMPOP', () => {
       },
       [, reply] = await Promise.all([
         client.zAdd(key, member),
-        client.bzmPop(Number.MIN_VALUE, key, 'MAX')
+        client.bzmPop(BLOCKING_MIN_VALUE, key, 'MAX')
       ]);
 
     assert.deepEqual(reply, {
diff --git a/packages/client/lib/commands/BZPOPMAX.spec.ts b/packages/client/lib/commands/BZPOPMAX.spec.ts
index 64fb6b85b7..53c6187e4e 100644
--- a/packages/client/lib/commands/BZPOPMAX.spec.ts
+++ b/packages/client/lib/commands/BZPOPMAX.spec.ts
@@ -1,5 +1,5 @@
 import { strict as assert } from 'assert';
-import testUtils, { GLOBAL } from '../test-utils';
+import testUtils, { GLOBAL, BLOCKING_MIN_VALUE } from '../test-utils';
 import BZPOPMAX from './BZPOPMAX';
 
 describe('BZPOPMAX', () => {
@@ -21,7 +21,7 @@ describe('BZPOPMAX', () => {
 
   testUtils.testAll('bzPopMax - null', async client => {
     assert.equal(
-      await client.bzPopMax('key', Number.MIN_VALUE),
+      await client.bzPopMax('key', BLOCKING_MIN_VALUE),
       null
     );
   }, {
@@ -37,7 +37,7 @@ describe('BZPOPMAX', () => {
       },
       [, reply] = await Promise.all([
         client.zAdd(key, member),
-        client.bzPopMax(key, Number.MIN_VALUE)
+        client.bzPopMax(key, BLOCKING_MIN_VALUE)
       ]);
 
     assert.deepEqual(reply, {
diff --git a/packages/client/lib/commands/BZPOPMIN.spec.ts b/packages/client/lib/commands/BZPOPMIN.spec.ts
index 399c8f30b9..96acf25a1e 100644
--- a/packages/client/lib/commands/BZPOPMIN.spec.ts
+++ b/packages/client/lib/commands/BZPOPMIN.spec.ts
@@ -1,5 +1,5 @@
 import { strict as assert } from 'assert';
-import testUtils, { GLOBAL } from '../test-utils';
+import testUtils, { GLOBAL, BLOCKING_MIN_VALUE } from '../test-utils';
 import BZPOPMIN from './BZPOPMIN';
 
 describe('BZPOPMIN', () => {
@@ -21,7 +21,7 @@ describe('BZPOPMIN', () => {
 
   testUtils.testAll('bzPopMin - null', async client => {
     assert.equal(
-      await client.bzPopMin('key', Number.MIN_VALUE),
+      await client.bzPopMin('key', BLOCKING_MIN_VALUE),
       null
     );
   }, {
@@ -37,7 +37,7 @@ describe('BZPOPMIN', () => {
       },
       [, reply] = await Promise.all([
         client.zAdd(key, member),
-        client.bzPopMin(key, Number.MIN_VALUE)
+        client.bzPopMin(key, BLOCKING_MIN_VALUE)
       ]);
 
     assert.deepEqual(reply, {