diff --git a/.github/workflows/android-emulator.yml b/.github/workflows/android-emulator.yml
index d42b4504e..52c6f0f69 100644
--- a/.github/workflows/android-emulator.yml
+++ b/.github/workflows/android-emulator.yml
@@ -16,12 +16,11 @@ jobs:
     - name: Build with Gradle
       run: ./gradlew assemblePlayDebugAndroidTest
     - name: Android Emulator test
-      uses: ReactiveCircus/android-emulator-runner@v1.0.1
+      uses: ReactiveCircus/android-emulator-runner@v2.2.0
       with:
         api-level: 28
-        headless: true
         disable-animations: true
-        script: ./gradlew connectedPlayDebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.notAnnotation=de.test.antennapod.IgnoreOnCi
+        script: zsh .github/workflows/runTests.sh
     - uses: actions/upload-artifact@v1
       if: failure()
       with:
diff --git a/.github/workflows/runTests.sh b/.github/workflows/runTests.sh
new file mode 100644
index 000000000..c631cce72
--- /dev/null
+++ b/.github/workflows/runTests.sh
@@ -0,0 +1,6 @@
+runTests() {
+    ./gradlew connectedPlayDebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.notAnnotation=de.test.antennapod.IgnoreOnCi 
+}
+
+# Retry tests to make them less flaky
+runTests || runTests || runTests