diff --git a/packages/client/lib/commander.ts b/packages/client/lib/commander.ts
index 661e53cb9b5..1407a80344c 100644
--- a/packages/client/lib/commander.ts
+++ b/packages/client/lib/commander.ts
@@ -1,4 +1,5 @@
 
+import { ClientCommandOptions } from './client';
 import { CommandOptions, isCommandOptions } from './command-options';
 import { RedisCommand, RedisCommandArgument, RedisCommandArguments, RedisCommandReply, RedisFunction, RedisFunctions, RedisModules, RedisScript, RedisScripts } from './commands';
 
@@ -103,7 +104,7 @@ function attachWithNamespaces<C extends RedisCommand>({
     return Commander;
 }
 
-export function transformCommandArguments<T>(
+export function transformCommandArguments<T = ClientCommandOptions>(
     command: RedisCommand,
     args: Array<unknown>
 ): {
diff --git a/packages/test-utils/lib/index.ts b/packages/test-utils/lib/index.ts
index 1e814c29746..3e33971fddb 100644
--- a/packages/test-utils/lib/index.ts
+++ b/packages/test-utils/lib/index.ts
@@ -1,6 +1,7 @@
 import { RedisModules, RedisFunctions, RedisScripts } from '@redis/client/lib/commands';
 import RedisClient, { RedisClientOptions, RedisClientType } from '@redis/client/lib/client';
 import RedisCluster, { RedisClusterOptions, RedisClusterType } from '@redis/client/lib/cluster';
+import { RedisSocketCommonOptions } from '@redis/client/lib/client/socket';
 import { RedisServerDockerConfig, spawnRedisServer, spawnRedisCluster } from './dockers';
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
@@ -21,7 +22,7 @@ interface ClientTestOptions<
     S extends RedisScripts
 > extends CommonTestOptions {
     serverArguments: Array<string>;
-    clientOptions?: Partial<RedisClientOptions<M, F, S>>;
+    clientOptions?: Partial<Omit<RedisClientOptions<M, F, S>, 'socket'> & { socket: RedisSocketCommonOptions }>;
     disableClientSetup?: boolean;
 }