diff --git a/constants.gradle b/constants.gradle
index 3813ba3533..ad37d86cb2 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -30,7 +30,10 @@ project.ext {
     androidxAppCompatVersion = '1.1.0'
     androidxCollectionVersion = '1.1.0'
     androidxMediaVersion = '1.0.1'
-    androidxTestVersion = '1.1.0'
+    androidxTestCoreVersion = '1.2.0'
+    androidxTestJUnitVersion = '1.1.1'
+    androidxTestRunnerVersion = '1.2.0'
+    androidxTestRulesVersion = '1.2.0'
     truthVersion = '0.44'
     modulePrefix = ':'
     if (gradle.ext.has('exoplayerModulePrefix')) {
diff --git a/extensions/flac/build.gradle b/extensions/flac/build.gradle
index 5d68711aa7..4a326ac646 100644
--- a/extensions/flac/build.gradle
+++ b/extensions/flac/build.gradle
@@ -42,7 +42,9 @@ dependencies {
     implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
     androidTestImplementation project(modulePrefix + 'testutils')
-    androidTestImplementation 'androidx.test:runner:' + androidxTestVersion
+    androidTestImplementation 'androidx.test:runner:' + androidxTestRunnerVersion
+    testImplementation 'androidx.test:core:' + androidxTestCoreVersion
+    testImplementation 'androidx.test.ext:junit:' + androidxTestJUnitVersion
     testImplementation project(modulePrefix + 'testutils')
     testImplementation 'org.robolectric:robolectric:' + robolectricVersion
 }
diff --git a/extensions/opus/build.gradle b/extensions/opus/build.gradle
index 2759299d63..28cf8f138f 100644
--- a/extensions/opus/build.gradle
+++ b/extensions/opus/build.gradle
@@ -42,8 +42,8 @@ dependencies {
     implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
     testImplementation project(modulePrefix + 'testutils')
     testImplementation 'org.robolectric:robolectric:' + robolectricVersion
-    androidTestImplementation 'androidx.test:runner:' + androidxTestVersion
-    androidTestImplementation 'androidx.test.ext:junit:' + androidxTestVersion
+    androidTestImplementation 'androidx.test:runner:' + androidxTestRunnerVersion
+    androidTestImplementation 'androidx.test.ext:junit:' + androidxTestJUnitVersion
 }
 
 ext {
diff --git a/extensions/vp9/build.gradle b/extensions/vp9/build.gradle
index e40d6e02d7..80239beb22 100644
--- a/extensions/vp9/build.gradle
+++ b/extensions/vp9/build.gradle
@@ -42,8 +42,8 @@ dependencies {
     implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
     testImplementation project(modulePrefix + 'testutils')
     testImplementation 'org.robolectric:robolectric:' + robolectricVersion
-    androidTestImplementation 'androidx.test:runner:' + androidxTestVersion
-    androidTestImplementation 'androidx.test.ext:junit:' + androidxTestVersion
+    androidTestImplementation 'androidx.test:runner:' + androidxTestRunnerVersion
+    androidTestImplementation 'androidx.test.ext:junit:' + androidxTestJUnitVersion
     androidTestImplementation 'com.google.truth:truth:' + truthVersion
 }
 
diff --git a/library/core/build.gradle b/library/core/build.gradle
index 33798c0c30..32beddfd89 100644
--- a/library/core/build.gradle
+++ b/library/core/build.gradle
@@ -62,14 +62,14 @@ dependencies {
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
     compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion
     compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion
-    androidTestImplementation 'androidx.test:runner:' + androidxTestVersion
-    androidTestImplementation 'androidx.test.ext:junit:' + androidxTestVersion
+    androidTestImplementation 'androidx.test:runner:' + androidxTestRunnerVersion
+    androidTestImplementation 'androidx.test.ext:junit:' + androidxTestJUnitVersion
     androidTestImplementation 'com.google.truth:truth:' + truthVersion
     androidTestImplementation 'com.linkedin.dexmaker:dexmaker:' + dexmakerVersion
     androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:' + dexmakerVersion
     androidTestImplementation 'org.mockito:mockito-core:' + mockitoVersion
-    testImplementation 'androidx.test:core:' + androidxTestVersion
-    testImplementation 'androidx.test.ext:junit:' + androidxTestVersion
+    testImplementation 'androidx.test:core:' + androidxTestCoreVersion
+    testImplementation 'androidx.test.ext:junit:' + androidxTestJUnitVersion
     testImplementation 'com.google.truth:truth:' + truthVersion
     testImplementation 'org.mockito:mockito-core:' + mockitoVersion
     testImplementation 'org.robolectric:robolectric:' + robolectricVersion
diff --git a/playbacktests/build.gradle b/playbacktests/build.gradle
index d77944cf23..0e93b97f5e 100644
--- a/playbacktests/build.gradle
+++ b/playbacktests/build.gradle
@@ -32,8 +32,8 @@ android {
 }
 
 dependencies {
-    androidTestImplementation 'androidx.test:rules:' + androidxTestVersion
-    androidTestImplementation 'androidx.test:runner:' + androidxTestVersion
+    androidTestImplementation 'androidx.test:rules:' + androidxTestRulesVersion
+    androidTestImplementation 'androidx.test:runner:' + androidxTestRunnerVersion
     androidTestImplementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
     androidTestImplementation project(modulePrefix + 'library-core')
     androidTestImplementation project(modulePrefix + 'library-dash')
diff --git a/testutils/build.gradle b/testutils/build.gradle
index 0d6439cf6c..204e089bd0 100644
--- a/testutils/build.gradle
+++ b/testutils/build.gradle
@@ -39,8 +39,8 @@ android {
 
 dependencies {
     api 'org.mockito:mockito-core:' + mockitoVersion
-    api 'androidx.test:core:' + androidxTestVersion
-    api 'androidx.test.ext:junit:' + androidxTestVersion
+    api 'androidx.test:core:' + androidxTestCoreVersion
+    api 'androidx.test.ext:junit:' + androidxTestJUnitVersion
     api 'com.google.truth:truth:' + truthVersion
     implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
     implementation project(modulePrefix + 'library-core')