diff --git a/modules/redis-it/src/test/scala/zio/redis/ApiSpec.scala b/modules/redis-it/src/test/scala/zio/redis/ApiSpec.scala
index c4de94550..c1629f0ef 100644
--- a/modules/redis-it/src/test/scala/zio/redis/ApiSpec.scala
+++ b/modules/redis-it/src/test/scala/zio/redis/ApiSpec.scala
@@ -49,7 +49,7 @@ object ApiSpec
       masterNodeConfig,
       ZLayer.succeed(ProtobufCodecSupplier)
     ).filterNotTags(_.contains(BaseSpec.ClusterExecutorUnsupported))
-      .getOrElse(Spec.empty) @@ ignore
+      .getOrElse(Spec.empty) @@ ifEnvNotSet("CI")
 
   private final val SingleNodeSuite =
     suite("Single node executor")(
diff --git a/modules/redis-it/src/test/scala/zio/redis/internal/ClusterExecutorSpec.scala b/modules/redis-it/src/test/scala/zio/redis/internal/ClusterExecutorSpec.scala
index 40965b269..3c9fcbf3a 100644
--- a/modules/redis-it/src/test/scala/zio/redis/internal/ClusterExecutorSpec.scala
+++ b/modules/redis-it/src/test/scala/zio/redis/internal/ClusterExecutorSpec.scala
@@ -63,7 +63,7 @@ object ClusterExecutorSpec extends BaseSpec {
       compose(service(BaseSpec.MasterNode, ".*Cluster correctly created.*")),
       masterNodeConfig,
       ZLayer.succeed(ProtobufCodecSupplier)
-    ) @@ TestAspect.flaky
+    ) @@ TestAspect.ifEnvNotSet("CI")
 
   private def redisNodeLayer(uri: RedisUri): Layer[Any, Redis] =
     ZLayer.make[Redis](