diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index bae33849a..53412e118 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -16,7 +16,7 @@ jobs:
         uses: reactivecircus/android-emulator-runner@v2
         with:
           api-level: 29
-          script: ./gradlew -Pcoverage :app:combinedTestReportGenericDebug :app:combinedTestReportGoogleplayDebug
+          script: ./gradlew -Pcoverage :app:jacocoTestReportGoogleplayDebug :app:createGoogleplayDebugAndroidTestCoverageReport
       - name: upload coverage
         uses: codecov/codecov-action@v1
         with:
diff --git a/app/src/androidTestGeneric/java/org/tasks/location/AndroidLocationProviderTest.kt b/app/src/androidTest/java/org/tasks/location/AndroidLocationProviderTest.kt
similarity index 100%
rename from app/src/androidTestGeneric/java/org/tasks/location/AndroidLocationProviderTest.kt
rename to app/src/androidTest/java/org/tasks/location/AndroidLocationProviderTest.kt
diff --git a/app/src/generic/java/org/tasks/location/AndroidLocationProvider.kt b/app/src/main/java/org/tasks/location/AndroidLocationProvider.kt
similarity index 96%
rename from app/src/generic/java/org/tasks/location/AndroidLocationProvider.kt
rename to app/src/main/java/org/tasks/location/AndroidLocationProvider.kt
index 85e7bf133..af0f2a8a1 100644
--- a/app/src/generic/java/org/tasks/location/AndroidLocationProvider.kt
+++ b/app/src/main/java/org/tasks/location/AndroidLocationProvider.kt
@@ -6,7 +6,7 @@ import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
 class AndroidLocationProvider @Inject constructor(
-        internal val locationManager: LocationManager,
+        private val locationManager: LocationManager,
         private val permissionChecker: PermissionChecker,
 ) : LocationProvider {