diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn
index f73144729d..2561597f73 100644
--- a/sdk/android/BUILD.gn
+++ b/sdk/android/BUILD.gn
@@ -1697,9 +1697,9 @@ if (is_android) {
       ":peerconnection_java",
       ":video_api_java",
       ":video_java",
-      "//base:base_java_test_support",
       "//third_party/android_deps:guava_android_java",
       "//third_party/androidx:androidx_annotation_annotation_java",
+      "//third_party/androidx:androidx_test_runner_java",
       "//third_party/google-truth:google_truth_java",
     ]
 
diff --git a/sdk/android/tests/src/org/webrtc/AndroidVideoDecoderTest.java b/sdk/android/tests/src/org/webrtc/AndroidVideoDecoderTest.java
index 04891e2563..da7539879c 100644
--- a/sdk/android/tests/src/org/webrtc/AndroidVideoDecoderTest.java
+++ b/sdk/android/tests/src/org/webrtc/AndroidVideoDecoderTest.java
@@ -27,10 +27,10 @@ import android.graphics.SurfaceTexture;
 import android.media.MediaCodecInfo.CodecCapabilities;
 import android.media.MediaFormat;
 import android.os.Handler;
+import androidx.test.runner.AndroidJUnit4;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
-import org.chromium.testing.local.LocalRobolectricTestRunner;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -46,7 +46,7 @@ import org.webrtc.VideoDecoder.DecodeInfo;
 import org.webrtc.VideoFrame.I420Buffer;
 import org.webrtc.VideoFrame.TextureBuffer.Type;
 
-@RunWith(LocalRobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 @Config(manifest = Config.NONE)
 public class AndroidVideoDecoderTest {
   private static final VideoDecoder.Settings TEST_DECODER_SETTINGS =
diff --git a/sdk/android/tests/src/org/webrtc/CameraEnumerationTest.java b/sdk/android/tests/src/org/webrtc/CameraEnumerationTest.java
index 6047b559dc..2c33992f99 100644
--- a/sdk/android/tests/src/org/webrtc/CameraEnumerationTest.java
+++ b/sdk/android/tests/src/org/webrtc/CameraEnumerationTest.java
@@ -13,8 +13,8 @@ package org.webrtc;
 import static org.junit.Assert.assertEquals;
 import static org.webrtc.CameraEnumerationAndroid.getClosestSupportedFramerateRange;
 
+import androidx.test.runner.AndroidJUnit4;
 import java.util.Arrays;
-import org.chromium.testing.local.LocalRobolectricTestRunner;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
@@ -23,7 +23,7 @@ import org.webrtc.CameraEnumerationAndroid.CaptureFormat.FramerateRange;
 /**
  * Tests for CameraEnumerationAndroid.
  */
-@RunWith(LocalRobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 @Config(manifest = Config.NONE)
 public class CameraEnumerationTest {
   @Test
diff --git a/sdk/android/tests/src/org/webrtc/CryptoOptionsTest.java b/sdk/android/tests/src/org/webrtc/CryptoOptionsTest.java
index f03811e6fc..c6cd2c2008 100644
--- a/sdk/android/tests/src/org/webrtc/CryptoOptionsTest.java
+++ b/sdk/android/tests/src/org/webrtc/CryptoOptionsTest.java
@@ -12,13 +12,13 @@ package org.webrtc;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import org.chromium.testing.local.LocalRobolectricTestRunner;
+import androidx.test.runner.AndroidJUnit4;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
 import org.webrtc.CryptoOptions;
 
-@RunWith(LocalRobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 @Config(manifest = Config.NONE)
 public class CryptoOptionsTest {
   // Validates the builder builds by default all false options.
diff --git a/sdk/android/tests/src/org/webrtc/FramerateBitrateAdjusterTest.java b/sdk/android/tests/src/org/webrtc/FramerateBitrateAdjusterTest.java
index 0b210892b8..5fcf9c87d6 100644
--- a/sdk/android/tests/src/org/webrtc/FramerateBitrateAdjusterTest.java
+++ b/sdk/android/tests/src/org/webrtc/FramerateBitrateAdjusterTest.java
@@ -12,13 +12,13 @@ package org.webrtc;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import org.chromium.testing.local.LocalRobolectricTestRunner;
+import androidx.test.runner.AndroidJUnit4;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
 import org.webrtc.VideoEncoder.ScalingSettings;
 
-@RunWith(LocalRobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 @Config(manifest = Config.NONE)
 public class FramerateBitrateAdjusterTest {
   @Test
diff --git a/sdk/android/tests/src/org/webrtc/GlGenericDrawerTest.java b/sdk/android/tests/src/org/webrtc/GlGenericDrawerTest.java
index 1f92b9c426..fdb8f4bf08 100644
--- a/sdk/android/tests/src/org/webrtc/GlGenericDrawerTest.java
+++ b/sdk/android/tests/src/org/webrtc/GlGenericDrawerTest.java
@@ -16,7 +16,7 @@ import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
-import org.chromium.testing.local.LocalRobolectricTestRunner;
+import androidx.test.runner.AndroidJUnit4;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -24,7 +24,7 @@ import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
 import org.webrtc.GlShader;
 
-@RunWith(LocalRobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 @Config(manifest = Config.NONE)
 public class GlGenericDrawerTest {
   // Simplest possible valid generic fragment shader.
diff --git a/sdk/android/tests/src/org/webrtc/HardwareVideoEncoderTest.java b/sdk/android/tests/src/org/webrtc/HardwareVideoEncoderTest.java
index 08f7fb055f..635fffb140 100644
--- a/sdk/android/tests/src/org/webrtc/HardwareVideoEncoderTest.java
+++ b/sdk/android/tests/src/org/webrtc/HardwareVideoEncoderTest.java
@@ -23,10 +23,10 @@ import android.media.MediaCodec;
 import android.media.MediaCodecInfo;
 import android.media.MediaFormat;
 import android.os.Bundle;
+import androidx.test.runner.AndroidJUnit4;
 import java.nio.ByteBuffer;
 import java.util.HashMap;
 import java.util.Map;
-import org.chromium.testing.local.LocalRobolectricTestRunner;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -47,7 +47,7 @@ import org.webrtc.VideoFrame;
 import org.webrtc.VideoFrame.Buffer;
 import org.webrtc.VideoFrame.I420Buffer;
 
-@RunWith(LocalRobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 @Config(manifest = Config.NONE)
 public class HardwareVideoEncoderTest {
   private static final VideoEncoder.Settings TEST_ENCODER_SETTINGS = new Settings(
diff --git a/sdk/android/tests/src/org/webrtc/IceCandidateTest.java b/sdk/android/tests/src/org/webrtc/IceCandidateTest.java
index e169694788..437e146415 100644
--- a/sdk/android/tests/src/org/webrtc/IceCandidateTest.java
+++ b/sdk/android/tests/src/org/webrtc/IceCandidateTest.java
@@ -12,13 +12,13 @@ package org.webrtc;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import org.chromium.testing.local.LocalRobolectricTestRunner;
+import androidx.test.runner.AndroidJUnit4;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
 import org.webrtc.IceCandidate;
 
-@RunWith(LocalRobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 @Config(manifest = Config.NONE)
 public class IceCandidateTest {
   @Test
diff --git a/sdk/android/tests/src/org/webrtc/RefCountDelegateTest.java b/sdk/android/tests/src/org/webrtc/RefCountDelegateTest.java
index 1f449c8bb7..eafd722a17 100644
--- a/sdk/android/tests/src/org/webrtc/RefCountDelegateTest.java
+++ b/sdk/android/tests/src/org/webrtc/RefCountDelegateTest.java
@@ -14,7 +14,7 @@ import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 
-import org.chromium.testing.local.LocalRobolectricTestRunner;
+import androidx.test.runner.AndroidJUnit4;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -22,7 +22,7 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
-@RunWith(LocalRobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 @Config(manifest = Config.NONE)
 public class RefCountDelegateTest {
   @Mock Runnable mockReleaseCallback;
diff --git a/sdk/android/tests/src/org/webrtc/ScalingSettingsTest.java b/sdk/android/tests/src/org/webrtc/ScalingSettingsTest.java
index a092a7c485..18db61d2dc 100644
--- a/sdk/android/tests/src/org/webrtc/ScalingSettingsTest.java
+++ b/sdk/android/tests/src/org/webrtc/ScalingSettingsTest.java
@@ -12,13 +12,13 @@ package org.webrtc;
 
 import static org.junit.Assert.assertEquals;
 
-import org.chromium.testing.local.LocalRobolectricTestRunner;
+import androidx.test.runner.AndroidJUnit4;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
 import org.webrtc.VideoEncoder.ScalingSettings;
 
-@RunWith(LocalRobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 @Config(manifest = Config.NONE)
 public class ScalingSettingsTest {
   @Test
diff --git a/sdk/android/tests/src/org/webrtc/audio/LowLatencyAudioBufferManagerTest.java b/sdk/android/tests/src/org/webrtc/audio/LowLatencyAudioBufferManagerTest.java
index c76ee8dab8..2575cea60e 100644
--- a/sdk/android/tests/src/org/webrtc/audio/LowLatencyAudioBufferManagerTest.java
+++ b/sdk/android/tests/src/org/webrtc/audio/LowLatencyAudioBufferManagerTest.java
@@ -20,7 +20,7 @@ import static org.mockito.Mockito.when;
 
 import android.media.AudioTrack;
 import android.os.Build;
-import org.chromium.testing.local.LocalRobolectricTestRunner;
+import androidx.test.runner.AndroidJUnit4;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -32,7 +32,7 @@ import org.webrtc.audio.LowLatencyAudioBufferManager;
 /**
  * Tests for LowLatencyAudioBufferManager.
  */
-@RunWith(LocalRobolectricTestRunner.class)
+@RunWith(AndroidJUnit4.class)
 @Config(manifest = Config.NONE, sdk = Build.VERSION_CODES.O)
 public class LowLatencyAudioBufferManagerTest {
   @Mock private AudioTrack mockAudioTrack;