diff --git a/packages/client/lib/commands/EXPIRETIME.spec.ts b/packages/client/lib/commands/EXPIRETIME.spec.ts
index 1d63e759a5..8936c7638d 100644
--- a/packages/client/lib/commands/EXPIRETIME.spec.ts
+++ b/packages/client/lib/commands/EXPIRETIME.spec.ts
@@ -1,21 +1,24 @@
 import { strict as assert } from 'assert';
 import testUtils, { GLOBAL } from '../test-utils';
-import { transformArguments } from './EXPIRETIME';
+import EXPIRETIME from './EXPIRETIME';
 
 describe('EXPIRETIME', () => {
-    testUtils.isVersionGreaterThanHook([7]);
+  testUtils.isVersionGreaterThanHook([7]);
 
-    it('transformArguments', () => {
-        assert.deepEqual(
-            transformArguments('key'),
-            ['EXPIRETIME', 'key']
-        );
-    });
+  it('transformArguments', () => {
+    assert.deepEqual(
+      EXPIRETIME.transformArguments('key'),
+      ['EXPIRETIME', 'key']
+    );
+  });
 
-    testUtils.testWithClient('client.expireTime', async client => {
-        assert.equal(
-            await client.expireTime('key'),
-            -2
-        );
-    }, GLOBAL.SERVERS.OPEN);
+  testUtils.testAll('expireTime', async client => {
+    assert.equal(
+      await client.expireTime('key'),
+      -2
+    );
+  }, {
+    client: GLOBAL.SERVERS.OPEN,
+    cluster: GLOBAL.CLUSTERS.OPEN
+  });
 });
diff --git a/packages/client/lib/commands/index.ts b/packages/client/lib/commands/index.ts
index cb365ad99e..7aca8d7136 100644
--- a/packages/client/lib/commands/index.ts
+++ b/packages/client/lib/commands/index.ts
@@ -98,6 +98,7 @@ import PERSIST from './PERSIST';
 import EXISTS from './EXISTS';
 import EXPIRE from './EXPIRE';
 import EXPIREAT from './EXPIREAT';
+import EXPIRETIME from './EXPIRETIME';
 import PEXPIRE from './PEXPIRE';
 import PEXPIREAT from './PEXPIREAT';
 import PEXPIRETIME from './PEXPIRETIME';
@@ -384,6 +385,8 @@ export default {
   expire: EXPIRE,
   EXPIREAT,
   expireAt: EXPIREAT,
+  EXPIRETIME,
+  expireTime: EXPIRETIME,
   PEXPIRE,
   pExpire: PEXPIRE,
   PEXPIREAT,