diff --git a/common_library_config.gradle b/common_library_config.gradle
index 5ac9e337f6..9d14a1f601 100644
--- a/common_library_config.gradle
+++ b/common_library_config.gradle
@@ -29,5 +29,10 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
-    testOptions.unitTests.includeAndroidResources = true
+    testOptions {
+        unitTests.all {
+            jvmArgs "-Xmx2g"
+        }
+        unitTests.includeAndroidResources true
+    }
 }
diff --git a/constants.gradle b/constants.gradle
index 5545b5f4ab..0d49ac63ab 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -26,7 +26,7 @@ project.ext {
     // https://cs.android.com/android/platform/superproject/+/master:external/guava/METADATA
     guavaVersion = '31.0.1-android'
     mockitoVersion = '3.12.4'
-    robolectricVersion = '4.8-alpha-1'
+    robolectricVersion = '4.8.1'
     // Keep this in sync with Google's internal Checker Framework version.
     checkerframeworkVersion = '3.13.0'
     checkerframeworkCompatVersion = '2.5.5'