diff --git a/.github/workflows/test-server.yml b/.github/workflows/test-server.yml
index a083218..0e534c2 100644
--- a/.github/workflows/test-server.yml
+++ b/.github/workflows/test-server.yml
@@ -42,7 +42,11 @@ jobs:
       - name: Configure Go
         uses: actions/setup-go@v7.0.0
         with:
-          go-version: '1.24.13'
+          # Read from go.mod rather than pinned here. The directive is the floor the
+          # module actually declares, and GOTOOLCHAIN is local on the runner, so a
+          # version written down twice is a version that can be raised in one place and
+          # fail the build from the other.
+          go-version-file: test-server/go.mod
           cache-dependency-path: test-server/go.mod
 
       - name: Vet and Test
diff --git a/containers/src/test/kotlin/okhttp/testbed/containers/BasicLoomTest.kt b/containers/src/test/kotlin/okhttp/testbed/containers/BasicLoomTest.kt
index db37366..6252511 100644
--- a/containers/src/test/kotlin/okhttp/testbed/containers/BasicLoomTest.kt
+++ b/containers/src/test/kotlin/okhttp/testbed/containers/BasicLoomTest.kt
@@ -38,7 +38,7 @@ import org.junit.jupiter.api.parallel.Isolated
 import org.mockserver.client.MockServerClient
 import org.mockserver.model.HttpRequest.request
 import org.mockserver.model.HttpResponse.response
-import org.testcontainers.containers.MockServerContainer
+import org.testcontainers.mockserver.MockServerContainer
 import org.testcontainers.junit.jupiter.Container
 import org.testcontainers.junit.jupiter.Testcontainers
 
diff --git a/containers/src/test/kotlin/okhttp/testbed/containers/BasicMockServerTest.kt b/containers/src/test/kotlin/okhttp/testbed/containers/BasicMockServerTest.kt
index 3e5997c..8a450c9 100644
--- a/containers/src/test/kotlin/okhttp/testbed/containers/BasicMockServerTest.kt
+++ b/containers/src/test/kotlin/okhttp/testbed/containers/BasicMockServerTest.kt
@@ -29,7 +29,7 @@ import org.mockserver.logging.MockServerLogger
 import org.mockserver.model.HttpRequest.request
 import org.mockserver.model.HttpResponse.response
 import org.mockserver.socket.tls.KeyStoreFactory
-import org.testcontainers.containers.MockServerContainer
+import org.testcontainers.mockserver.MockServerContainer
 import org.testcontainers.junit.jupiter.Container
 import org.testcontainers.junit.jupiter.Testcontainers
 import org.testcontainers.utility.DockerImageName
diff --git a/containers/src/test/kotlin/okhttp/testbed/containers/BasicProxyTest.kt b/containers/src/test/kotlin/okhttp/testbed/containers/BasicProxyTest.kt
index ee5173c..496eea0 100644
--- a/containers/src/test/kotlin/okhttp/testbed/containers/BasicProxyTest.kt
+++ b/containers/src/test/kotlin/okhttp/testbed/containers/BasicProxyTest.kt
@@ -38,7 +38,7 @@ import org.mockserver.model.HttpRequest.request
 import org.mockserver.model.HttpResponse.response
 import org.mockserver.proxyconfiguration.ProxyConfiguration
 import org.mockserver.socket.tls.KeyStoreFactory
-import org.testcontainers.containers.MockServerContainer
+import org.testcontainers.mockserver.MockServerContainer
 import org.testcontainers.junit.jupiter.Container
 import org.testcontainers.junit.jupiter.Testcontainers
 
diff --git a/containers/src/test/kotlin/okhttp/testbed/containers/SocksProxyTest.kt b/containers/src/test/kotlin/okhttp/testbed/containers/SocksProxyTest.kt
index 52a060f..47e503a 100644
--- a/containers/src/test/kotlin/okhttp/testbed/containers/SocksProxyTest.kt
+++ b/containers/src/test/kotlin/okhttp/testbed/containers/SocksProxyTest.kt
@@ -29,7 +29,7 @@ import org.mockserver.client.MockServerClient
 import org.mockserver.model.HttpRequest.request
 import org.mockserver.model.HttpResponse.response
 import org.testcontainers.containers.GenericContainer
-import org.testcontainers.containers.MockServerContainer
+import org.testcontainers.mockserver.MockServerContainer
 import org.testcontainers.containers.Network
 import org.testcontainers.junit.jupiter.Container
 import org.testcontainers.junit.jupiter.Testcontainers
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 93361b8..b332a3a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -21,7 +21,7 @@ okhttp = "5.4.0"
 # ECH config list. Drop this back to `okhttp` once a release ships it.
 ech-okhttp = "5.5.0-SNAPSHOT"
 org-junit-jupiter = "5.14.4"
-testcontainers = "1.21.4"
+testcontainers = "2.0.5"
 
 [libraries]
 androidx-test-runner = { module = "androidx.test:runner", version.ref = "androidx-test-runner" }
@@ -32,11 +32,11 @@ junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", vers
 junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher", version.ref = "junit-platform" }
 junit5android-core = { module = "de.mannodermaus.junit5:android-test-core", version.ref = "android-junit5" }
 junit5android-runner = { module = "de.mannodermaus.junit5:android-test-runner", version.ref = "android-junit5" }
-mockserver = { module = "org.testcontainers:mockserver", version.ref = "testcontainers" }
+mockserver = { module = "org.testcontainers:testcontainers-mockserver", version.ref = "testcontainers" }
 mockserver-client = { module = "org.mock-server:mockserver-client-java-no-dependencies", version.ref = "mockserver" }
 okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
 testcontainers = { module = "org.testcontainers:testcontainers", version.ref = "testcontainers" }
-testcontainers-junit5 = { module = "org.testcontainers:junit-jupiter", version.ref = "testcontainers" }
+testcontainers-junit5 = { module = "org.testcontainers:testcontainers-junit-jupiter", version.ref = "testcontainers" }
 
 [plugins]
 android-junit5 = { id = "de.mannodermaus.android-junit5", version.ref = "android-junit5" }