diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index d55817141..314c574df 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -72,12 +72,15 @@ jobs:
       matrix:
         include:
           - variant: "PlayDebug"
+            base-variant: "Debug"
             execute-tests: true
             upload-artifact: true
           - variant: "PlayRelease"
+            base-variant: "Release"
             execute-tests: true
             upload-artifact: false
           - variant: "FreeRelease"
+            base-variant: "Release"
             execute-tests: false
             upload-artifact: false
     steps:
@@ -95,7 +98,7 @@ jobs:
         run: ./gradlew assemble${{ matrix.variant }}
       - name: Test
         if: matrix.execute-tests == true
-        run: ./gradlew test${{ matrix.variant }}UnitTest
+        run: ./gradlew test${{ matrix.variant }}UnitTest test${{ matrix.base-variant }}UnitTest
       - uses: actions/upload-artifact@v2
         if: matrix.upload-artifact == true
         with:
diff --git a/.github/workflows/runEmulatorTests.sh b/.github/workflows/runEmulatorTests.sh
index ee7a42e0a..106b69444 100644
--- a/.github/workflows/runEmulatorTests.sh
+++ b/.github/workflows/runEmulatorTests.sh
@@ -3,7 +3,7 @@
 set -o pipefail
 
 runTests() {
-    ./gradlew connectedPlayDebugAndroidTest \
+    ./gradlew connectedPlayDebugAndroidTest connectedDebugAndroidTest \
         -Pandroid.testInstrumentationRunnerArguments.notAnnotation=de.test.antennapod.IgnoreOnCi \
         | grep -v "V/InstrumentationResultParser: INSTRUMENTATION_STATUS"
 }