diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a32c7f6c7..e3e20770d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -82,13 +82,17 @@ jobs:
         run: ./gradlew --stop
 
   test:
-    name: Test x86_64 on API ${{ matrix.api }}
+    name: Test x86_64 on API ${{ matrix.version }}
     runs-on: ubuntu-latest
     needs: build
     strategy:
       fail-fast: false
       matrix:
-        api: [23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34]
+        version: [23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34]
+        type: [""]
+        include:
+          - version: 35
+            type: "google_apis"
 
     steps:
       - name: Check out
@@ -114,16 +118,16 @@ jobs:
           sudo udevadm trigger --name-match=kvm
 
       - name: AVD test
-        run: scripts/avd_test.sh ${{ matrix.api }}
+        run: scripts/avd_test.sh ${{ matrix.version }} ${{ matrix.type }}
 
   test-32:
-    name: Test x86 on API ${{ matrix.api }}
+    name: Test x86 on API ${{ matrix.version }}
     runs-on: ubuntu-latest
     needs: build
     strategy:
       fail-fast: false
       matrix:
-        api: [23, 24, 25, 26, 27, 28, 29, 30]
+        version: [23, 24, 25, 26, 27, 28, 29, 30]
 
     steps:
       - name: Check out
@@ -151,4 +155,4 @@ jobs:
       - name: AVD test
         env:
           FORCE_32_BIT: 1
-        run: scripts/avd_test.sh ${{ matrix.api }}
+        run: scripts/avd_test.sh ${{ matrix.version }}