diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 7f5c362dc..b28b6a236 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -16,8 +16,9 @@ jobs:
     strategy:
       matrix:
         api-level: [21,30]
+        target: [ google_apis ]
       fail-fast: false
-    runs-on: macos-10.15
+    runs-on: macos-11
     steps:
       - name: checkout
         uses: actions/checkout@v3
@@ -32,12 +33,12 @@ jobs:
       - name: Restore Cache
         uses: actions/cache@v2
         with:
-            path: |
-              ~/.gradle/caches
-              ~/.gradle/wrapper
-            key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
-            restore-keys: |
-              ${{ runner.os }}-gradle-
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
 
       - name: create instrumentation coverage
         uses: ReactiveCircus/android-emulator-runner@v2.23.0
@@ -46,6 +47,7 @@ jobs:
         with:
           api-level: ${{ matrix.api-level }}
           arch: x86_64
+          profile: pixel_2
           ndk: 21.4.7075529
           sdcard-path-or-size: '1000M'
           disable-animations: false
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 1f345c24e..c6d2c6dd8 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -13,7 +13,7 @@ jobs:
         api-level: [21, 22, 23, 24, 25, 27, 28, 30]
         target: [google_apis]
       fail-fast: false
-    runs-on: macos-latest
+    runs-on: macos-11
     steps:
 
       - name: checkout
diff --git a/jacoco.gradle b/jacoco.gradle
index 2e7372e5a..1bde2f7b0 100644
--- a/jacoco.gradle
+++ b/jacoco.gradle
@@ -49,6 +49,7 @@ task jacocoInstrumentationTestReport(type: JacocoReport, dependsOn: ['createDebu
     kotlinSrc << "$proj.projectDir/src/main/kotlin"
     execution << fileTree(dir: proj.buildDir,
       includes: ['jacoco/testDebugUnitTest.exec',
+        'outputs/code-coverage/connected/*coverage.ec',
         'outputs/code_coverage/debugAndroidTest/connected/**/*.ec'])
   }
   sourceDirectories.from = files(javaSrc, kotlinSrc)