diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/gradle.lockfile b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/gradle.lockfile
index 7a07618272f..8a1268cc71c 100644
--- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/gradle.lockfile
+++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/gradle.lockfile
@@ -58,7 +58,7 @@ de.thetaphi:forbiddenapis:3.8=compileClasspath
 info.picocli:picocli:4.6.3=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath
 io.leangen.geantyref:geantyref:1.3.16=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath
 io.lettuce:lettuce-core:5.0.0.RELEASE=compileClasspath,testCompileClasspath,testRuntimeClasspath
-io.lettuce:lettuce-core:6.8.1.RELEASE=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
+io.lettuce:lettuce-core:7.0.0.BETA2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
 io.netty:netty-buffer:4.1.118.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
 io.netty:netty-buffer:4.1.15.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-codec-dns:4.1.118.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/test/groovy/Lettuce5AsyncClientTest.groovy b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/test/groovy/Lettuce5AsyncClientTest.groovy
index 519373506ac..376f1aec296 100644
--- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/test/groovy/Lettuce5AsyncClientTest.groovy
+++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/test/groovy/Lettuce5AsyncClientTest.groovy
@@ -356,7 +356,7 @@ abstract class Lettuce5AsyncClientTest extends Lettuce5ClientTestBase {
   def "command completes exceptionally"() {
     setup:
     // turn off auto flush to complete the command exceptionally manually
-    asyncCommands.setAutoFlushCommands(false)
+    connection.setAutoFlushCommands(false)
     def conds = new AsyncConditions()
     RedisFuture redisFuture = asyncCommands.del("key1", "key2")
     boolean completedExceptionally = ((AsyncCommand) redisFuture).completeExceptionally(new IllegalStateException("TestException"))
@@ -371,7 +371,8 @@ abstract class Lettuce5AsyncClientTest extends Lettuce5ClientTestBase {
 
     when:
     // now flush and execute the command
-    asyncCommands.flushCommands()
+    connection.flushCommands()
+    connection.setAutoFlushCommands(true)
     redisFuture.get()
 
     then:
@@ -405,7 +406,7 @@ abstract class Lettuce5AsyncClientTest extends Lettuce5ClientTestBase {
 
   def "cancel command before it finishes"() {
     setup:
-    asyncCommands.setAutoFlushCommands(false)
+    connection.setAutoFlushCommands(false)
     def conds = new AsyncConditions()
     RedisFuture redisFuture = asyncCommands.sadd("SKEY", "1", "2")
     redisFuture.whenCompleteAsync({ res, throwable ->
@@ -417,7 +418,8 @@ abstract class Lettuce5AsyncClientTest extends Lettuce5ClientTestBase {
 
     when:
     boolean cancelSuccess = redisFuture.cancel(true)
-    asyncCommands.flushCommands()
+    connection.flushCommands()
+    connection.setAutoFlushCommands(true)
 
     then:
     conds.await()