diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e4c7b13ae..da887f0a0 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -12,7 +12,7 @@ org-jetbrains-kotlin = "1.8.10"
 org-junit-jupiter = "5.9.2"
 
 [libraries]
-amazonCorretto = "software.amazon.cryptools:AmazonCorrettoCryptoProvider:1.6.1"
+amazonCorretto = "software.amazon.cryptools:AmazonCorrettoCryptoProvider:2.0.0"
 androidx-annotation = "androidx.annotation:annotation:1.5.0"
 androidx-espresso-core = "androidx.test.espresso:espresso-core:3.5.1"
 androidx-junit = "androidx.test.ext:junit:1.1.5"
diff --git a/okhttp-testing-support/src/main/kotlin/okhttp3/OkHttpClientTestRule.kt b/okhttp-testing-support/src/main/kotlin/okhttp3/OkHttpClientTestRule.kt
index 5e3706e8d..3fd02d1ba 100644
--- a/okhttp-testing-support/src/main/kotlin/okhttp3/OkHttpClientTestRule.kt
+++ b/okhttp-testing-support/src/main/kotlin/okhttp3/OkHttpClientTestRule.kt
@@ -23,6 +23,7 @@ import java.util.logging.Level
 import java.util.logging.LogManager
 import java.util.logging.LogRecord
 import java.util.logging.Logger
+import kotlin.concurrent.withLock
 import okhttp3.internal.buildConnectionPool
 import okhttp3.internal.concurrent.TaskRunner
 import okhttp3.internal.connection.RealConnectionPool
@@ -200,7 +201,7 @@ class OkHttpClientTestRule : BeforeEachCallback, AfterEachCallback {
       // a test timeout failure.
       val waitTime = (entryTime + 1_000_000_000L - System.nanoTime())
       if (!queue.idleLatch().await(waitTime, TimeUnit.NANOSECONDS)) {
-        synchronized (TaskRunner.INSTANCE) {
+        TaskRunner.INSTANCE.lock.withLock {
           TaskRunner.INSTANCE.cancelAll()
         }
         fail<Unit>("Queue still active after 1000 ms")