diff --git a/packages/client/lib/commands/EXPIREAT.spec.ts b/packages/client/lib/commands/EXPIREAT.spec.ts
index 0335b36f5f..45677f8835 100644
--- a/packages/client/lib/commands/EXPIREAT.spec.ts
+++ b/packages/client/lib/commands/EXPIREAT.spec.ts
@@ -1,36 +1,39 @@
 import { strict as assert } from 'assert';
 import testUtils, { GLOBAL } from '../test-utils';
-import { transformArguments } from './EXPIREAT';
+import EXPIREAT from './EXPIREAT';
 
 describe('EXPIREAT', () => {
-    describe('transformArguments', () => {
-        it('number', () => {
-            assert.deepEqual(
-                transformArguments('key', 1),
-                ['EXPIREAT', 'key', '1']
-            );
-        });
-
-        it('date', () => {
-            const d = new Date();
-            assert.deepEqual(
-                transformArguments('key', d),
-                ['EXPIREAT', 'key', Math.floor(d.getTime() / 1000).toString()]
-            );
-        });
-        
-        it('with set option', () => {
-            assert.deepEqual(
-                transformArguments('key', 1, 'GT'),
-                ['EXPIREAT', 'key', '1', 'GT']
-            );
-        });
+  describe('transformArguments', () => {
+    it('number', () => {
+      assert.deepEqual(
+        EXPIREAT.transformArguments('key', 1),
+        ['EXPIREAT', 'key', '1']
+      );
     });
 
-    testUtils.testWithClient('client.expireAt', async client => {
-        assert.equal(
-            await client.expireAt('key', 1),
-            false
-        );
-    }, GLOBAL.SERVERS.OPEN);
+    it('date', () => {
+      const d = new Date();
+      assert.deepEqual(
+        EXPIREAT.transformArguments('key', d),
+        ['EXPIREAT', 'key', Math.floor(d.getTime() / 1000).toString()]
+      );
+    });
+
+    it('with set option', () => {
+      assert.deepEqual(
+        EXPIREAT.transformArguments('key', 1, 'GT'),
+        ['EXPIREAT', 'key', '1', 'GT']
+      );
+    });
+  });
+
+  testUtils.testAll('expireAt', async client => {
+    assert.equal(
+      await client.expireAt('key', 1),
+      false
+    );
+  }, {
+    client: GLOBAL.SERVERS.OPEN,
+    cluster: GLOBAL.CLUSTERS.OPEN
+  });
 });
diff --git a/packages/client/lib/commands/EXPIREAT.ts b/packages/client/lib/commands/EXPIREAT.ts
index b9b5986cac..9a959a87f9 100644
--- a/packages/client/lib/commands/EXPIREAT.ts
+++ b/packages/client/lib/commands/EXPIREAT.ts
@@ -9,7 +9,7 @@ export default {
     timestamp: number | Date,
     mode?: 'NX' | 'XX' | 'GT' | 'LT'
   ) {
-    const args = ['EXPIRE', key, transformEXAT(timestamp)];
+    const args = ['EXPIREAT', key, transformEXAT(timestamp)];
 
     if (mode) {
       args.push(mode);
diff --git a/packages/client/lib/commands/index.ts b/packages/client/lib/commands/index.ts
index 1deded3ca2..cb365ad99e 100644
--- a/packages/client/lib/commands/index.ts
+++ b/packages/client/lib/commands/index.ts
@@ -97,6 +97,7 @@ import MSETNX from './MSETNX';
 import PERSIST from './PERSIST';
 import EXISTS from './EXISTS';
 import EXPIRE from './EXPIRE';
+import EXPIREAT from './EXPIREAT';
 import PEXPIRE from './PEXPIRE';
 import PEXPIREAT from './PEXPIREAT';
 import PEXPIRETIME from './PEXPIRETIME';
@@ -381,6 +382,8 @@ export default {
   exists: EXISTS,
   EXPIRE,
   expire: EXPIRE,
+  EXPIREAT,
+  expireAt: EXPIREAT,
   PEXPIRE,
   pExpire: PEXPIRE,
   PEXPIREAT,