diff --git a/android-test/build.gradle.kts b/android-test/build.gradle.kts
index 60e705263d64..e704ee806d08 100644
--- a/android-test/build.gradle.kts
+++ b/android-test/build.gradle.kts
@@ -111,3 +111,9 @@ dependencies {
   androidTestImplementation(libs.junit5android.core)
   androidTestRuntimeOnly(libs.junit5android.runner)
 }
+
+junitPlatform {
+  filters {
+    excludeTags("Remote")
+  }
+}
diff --git a/android-test/src/androidTest/java/okhttp/android/test/SingleAndroidTest.kt b/android-test/src/androidTest/java/okhttp/android/test/SingleAndroidTest.kt
index 2697f5cbfaae..3844948b197f 100644
--- a/android-test/src/androidTest/java/okhttp/android/test/SingleAndroidTest.kt
+++ b/android-test/src/androidTest/java/okhttp/android/test/SingleAndroidTest.kt
@@ -23,7 +23,7 @@ import okhttp3.ConnectionPool
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.tls.internal.TlsUtil.localhost
-import org.junit.Test
+import org.junit.jupiter.api.Test
 
 /**
  * This single Junit 4 test is our Android test suite on API 21-25.
diff --git a/android-test/src/androidTest/java/okhttp/android/test/StrictModeTest.kt b/android-test/src/androidTest/java/okhttp/android/test/StrictModeTest.kt
index 83317b9f021e..b75225373bcf 100644
--- a/android-test/src/androidTest/java/okhttp/android/test/StrictModeTest.kt
+++ b/android-test/src/androidTest/java/okhttp/android/test/StrictModeTest.kt
@@ -27,8 +27,8 @@ import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.internal.platform.Platform
-import org.junit.After
-import org.junit.Test
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.parallel.Isolated
 
 @Isolated
@@ -36,7 +36,7 @@ import org.junit.jupiter.api.parallel.Isolated
 class StrictModeTest {
   private val violations = mutableListOf<Violation>()
 
-  @After
+  @AfterEach
   fun cleanup() {
     StrictMode.setThreadPolicy(
       ThreadPolicy