diff --git a/constants.gradle b/constants.gradle
index c9d73dc908..47c25e2bd9 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -27,7 +27,7 @@ project.ext {
     junitVersion = '4.13.2'
     // Use the same Guava version as the Android repo:
     // https://cs.android.com/android/platform/superproject/+/master:external/guava/METADATA
-    guavaVersion = '31.0.1-android'
+    guavaVersion = '31.1-android'
     mockitoVersion = '3.12.4'
     robolectricVersion = '4.8.1'
     // Keep this in sync with Google's internal Checker Framework version.
diff --git a/libraries/exoplayer/build.gradle b/libraries/exoplayer/build.gradle
index c65cddffe6..017d903c81 100644
--- a/libraries/exoplayer/build.gradle
+++ b/libraries/exoplayer/build.gradle
@@ -56,6 +56,7 @@ dependencies {
         exclude module: modulePrefix.substring(1) + 'library-core'
     }
     androidTestImplementation 'com.squareup.okhttp3:mockwebserver:' + okhttpVersion
+    testCompileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkCompatVersion
     testImplementation 'com.squareup.okhttp3:mockwebserver:' + okhttpVersion
     testImplementation 'org.robolectric:robolectric:' + robolectricVersion
     testImplementation project(modulePrefix + 'test-utils')
diff --git a/libraries/transformer/build.gradle b/libraries/transformer/build.gradle
index 6038fbb26e..693d80c921 100644
--- a/libraries/transformer/build.gradle
+++ b/libraries/transformer/build.gradle
@@ -49,6 +49,7 @@ dependencies {
     testImplementation project(modulePrefix + 'test-data')
     testImplementation 'org.robolectric:robolectric:' + robolectricVersion
     testImplementation 'com.google.truth:truth:' + truthVersion
+    testCompileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkCompatVersion
     androidTestImplementation 'junit:junit:' + junitVersion
     androidTestImplementation 'androidx.test:runner:' + androidxTestRunnerVersion
     androidTestImplementation 'com.google.truth:truth:' + truthVersion