diff --git a/src/test/java/io/lettuce/core/commands/CommandInterfacesIntegrationTests.java b/src/test/java/io/lettuce/core/commands/CommandInterfacesIntegrationTests.java
index 88325440ac..87843459c7 100644
--- a/src/test/java/io/lettuce/core/commands/CommandInterfacesIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/CommandInterfacesIntegrationTests.java
@@ -20,9 +20,7 @@
 package io.lettuce.core.commands;
 
 import io.lettuce.core.RedisClient;
-import io.lettuce.core.RedisContainerIntegrationTests;
 import io.lettuce.core.RedisURI;
-import io.lettuce.core.TestSupport;
 import io.lettuce.core.api.StatefulConnection;
 import io.lettuce.core.api.StatefulRedisConnection;
 import io.lettuce.core.api.sync.RedisCommands;
@@ -30,28 +28,17 @@
 import io.lettuce.core.dynamic.RedisCommandFactory;
 import io.lettuce.core.dynamic.annotation.Command;
 import io.lettuce.core.dynamic.annotation.Param;
-import io.lettuce.test.LettuceExtension;
-import io.lettuce.test.condition.EnabledOnCommand;
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
-import org.junit.jupiter.api.extension.ExtendWith;
 import reactor.core.publisher.Flux;
 
-import javax.inject.Inject;
 import java.lang.reflect.Proxy;
 import java.util.List;
 
 import static io.lettuce.TestTags.INTEGRATION_TEST;
-import static io.lettuce.core.SetArgs.Builder.ex;
-import static io.lettuce.core.SetArgs.Builder.exAt;
-import static io.lettuce.core.SetArgs.Builder.px;
-import static io.lettuce.core.SetArgs.Builder.pxAt;
-import static io.lettuce.core.StringMatchResult.Position;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 /**
  * Integration tests for {@link io.lettuce.core.dynamic.annotation.Command}.
@@ -59,7 +46,7 @@
  * @author Tihomir Mateev
  */
 @Tag(INTEGRATION_TEST)
-public class CommandInterfacesIntegrationTests extends RedisContainerIntegrationTests {
+public class CommandInterfacesIntegrationTests {
 
     protected static RedisClient client;
 
diff --git a/src/test/java/io/lettuce/core/commands/ConsolidatedAclCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/ConsolidatedAclCommandIntegrationTests.java
index f0519af54e..08264b4b35 100644
--- a/src/test/java/io/lettuce/core/commands/ConsolidatedAclCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/ConsolidatedAclCommandIntegrationTests.java
@@ -37,7 +37,7 @@
  * @author M Sazzadul Hoque
  */
 @Tag(INTEGRATION_TEST)
-public class ConsolidatedAclCommandIntegrationTests extends RedisContainerIntegrationTests {
+public class ConsolidatedAclCommandIntegrationTests {
 
     private static RedisClient client;
 
diff --git a/src/test/java/io/lettuce/core/commands/ConsolidatedConfigurationCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/ConsolidatedConfigurationCommandIntegrationTests.java
index 3a009fc47e..f25adff7a3 100644
--- a/src/test/java/io/lettuce/core/commands/ConsolidatedConfigurationCommandIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/commands/ConsolidatedConfigurationCommandIntegrationTests.java
@@ -31,7 +31,6 @@
 import org.junit.jupiter.api.*;
 
 import java.util.Collections;
-import java.util.Map;
 
 /**
  * Integration tests for {@link io.lettuce.core.api.sync.RedisServerCommands} with Redis modules since Redis 8.0.
@@ -39,7 +38,7 @@
  * @author M Sazzadul Hoque
  */
 @Tag(INTEGRATION_TEST)
-public class ConsolidatedConfigurationCommandIntegrationTests extends RedisContainerIntegrationTests {
+public class ConsolidatedConfigurationCommandIntegrationTests {
 
     private static RedisClient client;
 
diff --git a/src/test/java/io/lettuce/core/json/RedisJsonClusterIntegrationTests.java b/src/test/java/io/lettuce/core/json/RedisJsonClusterIntegrationTests.java
index 5a3eefeebe..ee8d7c40c1 100644
--- a/src/test/java/io/lettuce/core/json/RedisJsonClusterIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/json/RedisJsonClusterIntegrationTests.java
@@ -7,7 +7,6 @@
 
 package io.lettuce.core.json;
 
-import io.lettuce.core.RedisContainerIntegrationTests;
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.cluster.RedisClusterClient;
 import io.lettuce.core.cluster.api.async.RedisClusterAsyncCommands;
@@ -39,7 +38,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 @Tag(INTEGRATION_TEST)
-public class RedisJsonClusterIntegrationTests extends RedisContainerIntegrationTests {
+public class RedisJsonClusterIntegrationTests {
 
     protected static RedisClusterClient client;
 
diff --git a/src/test/java/io/lettuce/core/json/RedisJsonIntegrationTests.java b/src/test/java/io/lettuce/core/json/RedisJsonIntegrationTests.java
index b8d4ac924c..e471050c47 100644
--- a/src/test/java/io/lettuce/core/json/RedisJsonIntegrationTests.java
+++ b/src/test/java/io/lettuce/core/json/RedisJsonIntegrationTests.java
@@ -9,7 +9,6 @@
 
 import io.lettuce.core.ClientOptions;
 import io.lettuce.core.RedisClient;
-import io.lettuce.core.RedisContainerIntegrationTests;
 import io.lettuce.core.RedisFuture;
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.api.StatefulRedisConnection;
@@ -26,7 +25,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
-import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
 import java.io.IOException;
@@ -43,7 +41,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 @Tag(INTEGRATION_TEST)
-public class RedisJsonIntegrationTests extends RedisContainerIntegrationTests {
+public class RedisJsonIntegrationTests {
 
     private static final String BIKES_INVENTORY = "bikes:inventory";
 
diff --git a/src/test/resources/docker-env/docker-compose.yml b/src/test/resources/docker-env/docker-compose.yml
index 130fb1f717..8bfa5e2d33 100644
--- a/src/test/resources/docker-env/docker-compose.yml
+++ b/src/test/resources/docker-env/docker-compose.yml
@@ -1,5 +1,7 @@
 x-client-libs-image: &client-libs-image
   image: "redislabs/client-libs-test:${REDIS_VERSION:-8.0-M04-pre}"
+x-client-libs-stack-image: &client-libs-stack-image
+  image: "redislabs/client-libs-test:${REDIS_STACK_VERSION:-8.0-M04-pre}"
 
 services:
   # Standalone Redis Servers
@@ -101,6 +103,21 @@ services:
     networks:
       - redis-network
 
+  standalone-stack:
+    <<: *client-libs-stack-image
+    environment:
+      - REDIS_CLUSTER=no
+      - PORT=6379
+    ports:
+      - "16379:6379"
+
+  clustered-stack:
+    <<: *client-libs-stack-image
+    environment:
+      - REDIS_CLUSTER=yes
+      - PORT=36379
+    ports:
+      - "36379-36381:36379-36381"
 
   ssl-test-cluster:
     <<: *client-libs-image