diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 39196e51..cad42bdb 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -13,7 +13,7 @@ object Dependencies {
     val scalaJavaTimeV = "2.6.0"
     val sttpV          = "4.0.13"
     val tapirV         = "1.12.6"
-    val zioV           = "2.1.22"
+    val zioV           = "2.1.23"
     val zioConfigV     = "4.0.6"
   }
 
diff --git a/zio/redisson/src/test/scala/io/kinoplan/utils/zio/redisson/RedisClientSpec.scala b/zio/redisson/src/test/scala/io/kinoplan/utils/zio/redisson/RedisClientSpec.scala
index 7fd45e03..fd12d538 100644
--- a/zio/redisson/src/test/scala/io/kinoplan/utils/zio/redisson/RedisClientSpec.scala
+++ b/zio/redisson/src/test/scala/io/kinoplan/utils/zio/redisson/RedisClientSpec.scala
@@ -37,7 +37,6 @@ object RedisClientSpec extends ZIOSpecDefault {
     suite("RedisStringOperations")(RedisStringOperationsSpec.specs.map(toSpec)),
     suite("RedisTopicOperations")(RedisTopicOperationsSpec.specs.map(toSpec)) @@
       TestAspect.withLiveClock
-  ).provideLayerShared(redisLive) @@ TestAspect.parallel @@
-    TestAspect.timeout(30.seconds) // @@ TestAspect.ignore
+  ).provideLayerShared(redisLive) @@ testAspect(30.seconds) // @@ TestAspect.ignore
 
 }
diff --git a/zio/redisson/src/test/scala/io/kinoplan/utils/zio/redisson/RedissonNativeSpec.scala b/zio/redisson/src/test/scala/io/kinoplan/utils/zio/redisson/RedissonNativeSpec.scala
index 7d129ef5..ec8239ae 100644
--- a/zio/redisson/src/test/scala/io/kinoplan/utils/zio/redisson/RedissonNativeSpec.scala
+++ b/zio/redisson/src/test/scala/io/kinoplan/utils/zio/redisson/RedissonNativeSpec.scala
@@ -90,7 +90,6 @@ object RedissonNativeSpec extends ZIOSpecDefault with DefaultRedisCodecs {
         case1 <- ZIO.fromOption(redisCheckO).forEachZIO(_.checkAvailability).map(_.getOrElse(false))
       } yield assertTrue(!case1)
     ).provideLayer(live(pingTimeout = testPingTimeout))
-  ).provideLayerShared(redisSingleContainerLive) @@ TestAspect.parallel @@
-    TestAspect.timeout(10.seconds) // @@ TestAspect.ignore
+  ).provideLayerShared(redisSingleContainerLive) @@ testAspect(10.seconds) // @@ TestAspect.ignore
 
 }
diff --git a/zio/redisson/src/test/scala/io/kinoplan/utils/zio/redisson/RedissonSentinelSpec.scala b/zio/redisson/src/test/scala/io/kinoplan/utils/zio/redisson/RedissonSentinelSpec.scala
index 655e607c..33165395 100644
--- a/zio/redisson/src/test/scala/io/kinoplan/utils/zio/redisson/RedissonSentinelSpec.scala
+++ b/zio/redisson/src/test/scala/io/kinoplan/utils/zio/redisson/RedissonSentinelSpec.scala
@@ -164,7 +164,7 @@ object RedissonSentinelSpec extends ZIOSpecDefault with DefaultRedisCodecs {
         case1 <- ZIO.fromOption(redisCheckO).forEachZIO(_.checkAvailability).map(_.getOrElse(false))
       } yield assertTrue(!case1)
     ).provideLayer(live(pingTimeout = testPingTimeout))
-  ).provideLayerShared(RedisSentinelContainers.live) @@ TestAspect.parallel @@
-    TestAspect.timeout(10.seconds) // @@ TestAspect.ignore
+  ).provideLayerShared(RedisSentinelContainers.live) @@
+    testAspect(10.seconds) // @@ TestAspect.ignore
 
 }
diff --git a/zio/redisson/src/test/scala/io/kinoplan/utils/zio/redisson/RedissonSingleSpec.scala b/zio/redisson/src/test/scala/io/kinoplan/utils/zio/redisson/RedissonSingleSpec.scala
index 7652ada1..93b92da2 100644
--- a/zio/redisson/src/test/scala/io/kinoplan/utils/zio/redisson/RedissonSingleSpec.scala
+++ b/zio/redisson/src/test/scala/io/kinoplan/utils/zio/redisson/RedissonSingleSpec.scala
@@ -142,7 +142,6 @@ object RedissonSingleSpec extends ZIOSpecDefault with DefaultRedisCodecs {
         case1 <- ZIO.fromOption(redisCheckO).forEachZIO(_.checkAvailability).map(_.getOrElse(false))
       } yield assertTrue(!case1)
     ).provideLayer(live(pingTimeout = testPingTimeout))
-  ).provideLayerShared(redisSingleContainerLive) @@ TestAspect.parallel @@
-    TestAspect.timeout(10.seconds) // @@ TestAspect.ignore
+  ).provideLayerShared(redisSingleContainerLive) @@ testAspect(10.seconds) // @@ TestAspect.ignore
 
 }
diff --git a/zio/redisson/src/test/scala/io/kinoplan/utils/zio/redisson/package.scala b/zio/redisson/src/test/scala/io/kinoplan/utils/zio/redisson/package.scala
index dae8f580..b77784c7 100644
--- a/zio/redisson/src/test/scala/io/kinoplan/utils/zio/redisson/package.scala
+++ b/zio/redisson/src/test/scala/io/kinoplan/utils/zio/redisson/package.scala
@@ -2,8 +2,8 @@ package io.kinoplan.utils.zio
 
 import com.redis.testcontainers.RedisContainer
 import org.testcontainers.utility.DockerImageName
-import zio.{Duration, Scope, Task, URIO, ZIO, ZLayer}
-import zio.test.{Spec, TestResult}
+import zio._
+import zio.test.{Spec, TestAspect, TestResult}
 
 import io.kinoplan.utils.IntegrationCheck
 import io.kinoplan.utils.zio.redisson.RedissonSentinelSpec.test
@@ -17,6 +17,11 @@ package object redisson {
   val testConfigurator: Int = 128
   val testPingTimeout: Duration = Duration.Zero
 
+  val retrySchedule = Schedule.spaced(5.seconds) && Schedule.recurs(3)
+
+  def testAspect(timeout: Duration) = TestAspect.parallel @@ TestAspect.timeout(timeout) @@
+    TestAspect.retry(retrySchedule)
+
   val commonConfig: Map[String, String] = Map(
     "lazyInitialization" -> "true",
     "nettyThreads" -> "64",