diff --git a/src/test/java/redis/clients/jedis/csc/ClientSideCacheTestBase.java b/src/test/java/redis/clients/jedis/csc/ClientSideCacheTestBase.java
index 47f2d1142c..4fdf76679b 100644
--- a/src/test/java/redis/clients/jedis/csc/ClientSideCacheTestBase.java
+++ b/src/test/java/redis/clients/jedis/csc/ClientSideCacheTestBase.java
@@ -23,12 +23,10 @@ public abstract class ClientSideCacheTestBase {
 
   @Rule
   public RedisVersionRule versionRule = new RedisVersionRule(
-            HostAndPorts.getRedisEndpoint("standalone1").getHostAndPort(),
-            HostAndPorts.getRedisEndpoint("standalone1").getClientConfigBuilder().build());
+            HostAndPorts.getRedisEndpoint("standalone1"));
   @Rule
   public EnabledOnCommandRule enabledOnCommandRule = new EnabledOnCommandRule(
-          HostAndPorts.getRedisEndpoint("standalone1").getHostAndPort(),
-          HostAndPorts.getRedisEndpoint("standalone1").getClientConfigBuilder().build());
+          HostAndPorts.getRedisEndpoint("standalone1"));
 
   @Before
   public void setUp() throws Exception {
diff --git a/src/test/java/redis/clients/jedis/csc/JedisPooledClientSideCacheTest.java b/src/test/java/redis/clients/jedis/csc/JedisPooledClientSideCacheTest.java
index 2bca0fe73a..ed1eaf1b93 100644
--- a/src/test/java/redis/clients/jedis/csc/JedisPooledClientSideCacheTest.java
+++ b/src/test/java/redis/clients/jedis/csc/JedisPooledClientSideCacheTest.java
@@ -11,8 +11,7 @@ public class JedisPooledClientSideCacheTest extends JedisPooledClientSideCacheTe
 
   @ClassRule
   public static RedisVersionRule versionRule = new RedisVersionRule(
-          HostAndPorts.getRedisEndpoint("standalone1").getHostAndPort(),
-          HostAndPorts.getRedisEndpoint("standalone1").getClientConfigBuilder().build());
+          HostAndPorts.getRedisEndpoint("standalone1"));
 
   @BeforeClass
   public static void prepare() {
diff --git a/src/test/resources/Arch/sentinel5/config/node-sentinel5/redis.conf b/src/test/resources/Arch/sentinel5/config/node-sentinel5/redis.conf
deleted file mode 100644
index f3104c5ba6..0000000000
--- a/src/test/resources/Arch/sentinel5/config/node-sentinel5/redis.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-port 26383
-tls-port 36383
-tls-auth-clients no
-user default off
-user sentinel on allcommands allkeys allchannels >foobared
-sentinel monitor aclmaster 127.0.0.1 6387 1
-sentinel auth-user aclmaster acljedis
-sentinel auth-pass aclmaster fizzbuzz
-sentinel down-after-milliseconds aclmaster 2000
-sentinel failover-timeout aclmaster 120000
-sentinel parallel-syncs aclmaster 1
\ No newline at end of file
diff --git a/src/test/resources/env/endpoint.map b/src/test/resources/env/endpoint.map
deleted file mode 100644
index 5070ec216b..0000000000
--- a/src/test/resources/env/endpoint.map
+++ /dev/null
@@ -1,20 +0,0 @@
-REDIS1_CONF   6379:6390     "standalone0"                         : "redis://localhost:6379"
-REDIS1_CONF   6379:6390     "standalone0-acl"                     : "redis://localhost:6379",
-REDIS1_CONF   6379:6390     "standalone0-tls"                     : "rediss://localhost:6390"
-REDIS1_CONF   6379:6390     "standalone0-acl-tls"                 : "rediss://localhost:6390"
-------------
-REDIS2_CONF   6380          "standalone1"                         : "redis://localhost:6380"
-REDIS3_CONF   6381:16381    "standalone2-primary"                 : "redis://localhost:6381"
-REDIS4_CONF   6382:16382    "standalone3-replica-of-standalone2"  : "redis://localhost:6382"
-  (slaveof 6381)
-REDIS5_CONF   6383          "standalone4-replica-of-standalone1"  : "redis://localhost:6383"
-  (slaveof 6379)
-REDIS6_CONF   6384          "standalone5-primary"                 : "redis://localhost:6384"
-REDIS7_CONF   6385          "standalone6-replica-of-standalone5"  : "redis://localhost:6385"
-  (slaveof 6384)
-REDIS8_CONF   6386          "standalone7-with-lfu-policy"         : "redis://localhost:6386"
-REDIS9_CONF   6387:16387   ? missing
-REDIS10_CONF  6388          "standalone9"                         : "redis://localhost:6388"
-REDIS11_CONF  6389          "standalone10-replica-of-standalone9" : "redis://localhost:6389"
-  (replicaof 6388)
-jedis-stack   6479          "modules-docker"                      : "redis://localhost:6479"