diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 40e1da03c..e02437207 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -3,6 +3,7 @@ name: Test
 on: [ push ]
 jobs:
   test:
+    timeout-minutes: 45
     runs-on: macos-latest
     strategy:
       matrix:
diff --git a/build.gradle b/build.gradle
index feb203dc9..2c606dab8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -66,6 +66,7 @@ android {
         targetSdkVersion 30
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunnerArguments clearPackageData: 'true'
     }
 
     buildTypes {
@@ -104,4 +105,6 @@ dependencies {
     androidTestImplementation 'androidx.test:runner:1.4.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     androidTestImplementation 'org.mockito:mockito-android:3.10.0'
+
+    androidTestUtil 'androidx.test:orchestrator:1.4.0'
 }