diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index c1888b949..296aaeec4 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -40,31 +40,29 @@ jobs:
       with:
         arguments: testProdDebugUnitTest
 
-  ui-test:
-    runs-on: macos-latest
-    strategy:
-      matrix:
-        api-level: [24, 26, 28, 29, 30, 31]
-    steps:
-    - uses: actions/checkout@v2
-    - name: set up JDK 11
-      uses: actions/setup-java@v2
-      with:
-        java-version: '11'
-        distribution: 'adopt'
-        cache: gradle
-    - name: Prepare
-      run: ./.github/prepare-workflow
-    - name: Validate Gradle wrapper
-      uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b
-    - name: run tests
-      uses: reactivecircus/android-emulator-runner@v2
-      with:
-        api-level: ${{ matrix.api-level }}
-        arch: x86_64
-        emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
-        disable-animations: true
-        script: ./gradlew connectedProdDebugAndroidTest
+#  ui-test:
+#    runs-on: ubuntu-latest
+#    strategy:
+#      matrix:
+#        api-level: [28, 29, 30, 31, 32]
+#    steps:
+#    - uses: actions/checkout@v2
+#    - name: set up JDK 11
+#      uses: actions/setup-java@v2
+#      with:
+#        java-version: '11'
+#        distribution: 'adopt'
+#        cache: gradle
+#    - name: Prepare
+#      run: ./.github/prepare-workflow
+#    - name: run tests
+#      uses: reactivecircus/android-emulator-runner@v2
+#      with:
+#        api-level: ${{ matrix.api-level }}
+#        arch: x86_64
+#        emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+#        disable-animations: true
+#        script: ./gradlew connectedProdDebugAndroidTest
 
   lint:
     runs-on: ubuntu-latest
diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 5851f8cdc..a2af3749d 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -67,16 +67,18 @@ dependencies {
     androidTestImplementation ('com.kaspersky.android-components:kaspresso:1.5.1') {
         exclude module: "protobuf-lite"
     }
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation "com.kaspersky.android-components:kaspresso-compose-support:1.5.1"
+
     androidTestImplementation 'androidx.test:runner:1.5.2'
     androidTestImplementation 'androidx.test:rules:1.5.0'
     debugImplementation 'androidx.fragment:fragment-testing:1.5.5'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test:core-ktx:1.5.0'
+    debugImplementation "androidx.test:monitor:1.6.1"
     androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.5'
     androidTestImplementation "io.mockk:mockk-android:$mockk_version"
+    androidTestImplementation "io.mockk:mockk-agent:$mockk_version"
     androidTestImplementation "io.kotest:kotest-assertions-core:$kotest_version"
-    androidTestImplementation("org.jetbrains.kotlin:kotlin-reflect:$kotlin_version")
+    androidTestImplementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
 
     androidTestUtil("androidx.test:orchestrator:1.4.2")