diff --git a/dd-java-agent/instrumentation/lettuce-4/src/test/groovy/Lettuce4ClientTestBase.groovy b/dd-java-agent/instrumentation/lettuce-4/src/test/groovy/Lettuce4ClientTestBase.groovy
index 3ef7f319ca3..9d1f8785262 100644
--- a/dd-java-agent/instrumentation/lettuce-4/src/test/groovy/Lettuce4ClientTestBase.groovy
+++ b/dd-java-agent/instrumentation/lettuce-4/src/test/groovy/Lettuce4ClientTestBase.groovy
@@ -80,7 +80,13 @@ abstract class Lettuce4ClientTestBase extends VersionedNamingTestBase {
 
   def cleanup() {
     connection.close()
-    redisClient.shutdown()
+
+    try {
+      redisClient.shutdown(5, 10, TimeUnit.SECONDS)
+    } catch (Throwable ignored) {
+      // No-op.
+    }
+
     redisServer.stop()
   }
 
diff --git a/dd-java-agent/instrumentation/lettuce-5/src/test/groovy/Lettuce5ClientTestBase.groovy b/dd-java-agent/instrumentation/lettuce-5/src/test/groovy/Lettuce5ClientTestBase.groovy
index 5d917b78d92..b38c142cede 100644
--- a/dd-java-agent/instrumentation/lettuce-5/src/test/groovy/Lettuce5ClientTestBase.groovy
+++ b/dd-java-agent/instrumentation/lettuce-5/src/test/groovy/Lettuce5ClientTestBase.groovy
@@ -81,7 +81,13 @@ abstract class Lettuce5ClientTestBase extends VersionedNamingTestBase {
 
   def cleanup() {
     connection.close()
-    redisClient.shutdown()
+
+    try {
+      redisClient.shutdown(5, 10, TimeUnit.SECONDS)
+    } catch (Throwable ignored) {
+      // No-op.
+    }
+
     redisServer.stop()
   }
 }