diff --git a/src/test/java/redis/clients/jedis/csc/ClientSideCacheTestBase.java b/src/test/java/redis/clients/jedis/csc/ClientSideCacheTestBase.java
index 6eae8bc8ae..15531a5dfb 100644
--- a/src/test/java/redis/clients/jedis/csc/ClientSideCacheTestBase.java
+++ b/src/test/java/redis/clients/jedis/csc/ClientSideCacheTestBase.java
@@ -8,6 +8,7 @@
 import redis.clients.jedis.Connection;
 import redis.clients.jedis.ConnectionPoolConfig;
 import redis.clients.jedis.DefaultJedisClientConfig;
+import redis.clients.jedis.EndpointConfig;
 import redis.clients.jedis.HostAndPort;
 import redis.clients.jedis.HostAndPorts;
 import redis.clients.jedis.Jedis;
@@ -15,15 +16,17 @@
 
 abstract class ClientSideCacheTestBase {
 
-  protected static final HostAndPort hnp = HostAndPorts.getRedisServers().get(1);
+  private static final EndpointConfig endpoint = HostAndPorts.getRedisEndpoint("standalone1");
 
-  protected static final String baseUrl = "redis://:foobared@" + hnp.toString() + "/";
+  protected static final HostAndPort hnp = endpoint.getHostAndPort();
+
+  protected static final String baseUrl = "redis://:foobared@" + hnp.toString() + "/"; // TODO: use EndpointConfig
 
   protected Jedis control;
 
   @Before
   public void setUp() throws Exception {
-    control = new Jedis(hnp, DefaultJedisClientConfig.builder().password("foobared").build());
+    control = new Jedis(hnp, DefaultJedisClientConfig.builder().password("foobared").build()); // TODO: use EndpointConfig
     control.flushAll();
   }
 
@@ -33,7 +36,7 @@ public void tearDown() throws Exception {
   }
 
   protected static final Supplier<JedisClientConfig> clientConfig
-      = () -> DefaultJedisClientConfig.builder().resp3().password("foobared").build();
+      = () -> DefaultJedisClientConfig.builder().resp3().password("foobared").build(); // TODO: use EndpointConfig
 
   protected static final Supplier<GenericObjectPoolConfig<Connection>> singleConnectionPoolConfig
       = () -> {
diff --git a/src/test/java/redis/clients/jedis/csc/JedisPooledClientSideCacheTest.java b/src/test/java/redis/clients/jedis/csc/JedisPooledClientSideCacheTest.java
index 4b352a1fb9..2d1889fbc8 100644
--- a/src/test/java/redis/clients/jedis/csc/JedisPooledClientSideCacheTest.java
+++ b/src/test/java/redis/clients/jedis/csc/JedisPooledClientSideCacheTest.java
@@ -16,6 +16,7 @@
 import redis.clients.jedis.Connection;
 import redis.clients.jedis.ConnectionPoolConfig;
 import redis.clients.jedis.DefaultJedisClientConfig;
+import redis.clients.jedis.EndpointConfig;
 import redis.clients.jedis.HostAndPort;
 import redis.clients.jedis.HostAndPorts;
 import redis.clients.jedis.Jedis;
@@ -24,13 +25,15 @@
 
 public class JedisPooledClientSideCacheTest {
 
-  protected static final HostAndPort hnp = HostAndPorts.getRedisServers().get(1);
+  private static final EndpointConfig endpoint = HostAndPorts.getRedisEndpoint("standalone1");
+
+  protected static final HostAndPort hnp = endpoint.getHostAndPort();
 
   protected Jedis control;
 
   @Before
   public void setUp() throws Exception {
-    control = new Jedis(hnp, DefaultJedisClientConfig.builder().password("foobared").build());
+    control = new Jedis(hnp, DefaultJedisClientConfig.builder().password("foobared").build()); // TODO: use EndpointConfig
     control.flushAll();
   }
 
@@ -40,7 +43,7 @@ public void tearDown() throws Exception {
   }
 
   private static final Supplier<JedisClientConfig> clientConfig
-      = () -> DefaultJedisClientConfig.builder().resp3().password("foobared").build();
+      = () -> DefaultJedisClientConfig.builder().resp3().password("foobared").build(); // TODO: use EndpointConfig
 
   private static final Supplier<GenericObjectPoolConfig<Connection>> singleConnectionPoolConfig
       = () -> {