diff --git a/app/build.gradle b/app/build.gradle
index ee364b52a2..b2c1f2154d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -114,6 +114,17 @@ android {
         unitTests {
             includeAndroidResources = true
         }
+
+        managedDevices {
+            devices {
+                pixel3api30 (com.android.build.api.dsl.ManagedVirtualDevice) {
+                    device = "Pixel 3"
+                    apiLevel = 30
+                    systemImageSource = "google-atd"
+                    require64Bit = false
+                }
+            }
+        }
     }
 
     lintOptions {
diff --git a/gradle.properties b/gradle.properties
index 7b115be2cc..5f01bf39c8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,5 @@
 org.gradle.jvmargs=-Xmx4096m
 android.useAndroidX=true
 android.enableJetifier=true
-kapt.incremental.apt=false
\ No newline at end of file
+kapt.incremental.apt=false
+android.experimental.androidTest.numManagedDeviceShards=4
\ No newline at end of file