diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index eb5fcbdc1..f1ab3255f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -86,10 +86,10 @@ jobs:
         version: [23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35]
         type: [""]
         include:
-          - version: "35"
-            type: "google_apis_ps16k"
           - version: "Baklava"
             type: "google_apis"
+          - version: "Baklava"
+            type: "google_apis_ps16k"
 
     steps:
       - name: Check out
diff --git a/scripts/avd_test.sh b/scripts/avd_test.sh
index 0d640335a..5d72f4c86 100755
--- a/scripts/avd_test.sh
+++ b/scripts/avd_test.sh
@@ -227,7 +227,7 @@ else
   # Android 16 Beta
   run_test Baklava google_apis
   # Run 16k page tests
-  run_test 35 google_apis_ps16k
+  run_test Baklava google_apis_ps16k
 fi
 
 "$avd" delete avd -n test