diff --git a/scripts/gha/print_matrix_configuration.py b/scripts/gha/print_matrix_configuration.py
index 17e1302e3d..2191f8a13a 100644
--- a/scripts/gha/print_matrix_configuration.py
+++ b/scripts/gha/print_matrix_configuration.py
@@ -166,8 +166,8 @@
   "android_target": {"type": "real", "model":"gts4lltevzw", "version":"28"},
   "android_latest": {"type": "real", "model":"redfin", "version":"30"},
   "emulator_min": {"type": "virtual", "image":"system-images;android-18;google_apis;x86"},
-  "emulator_target": {"type": "virtual", "image":"system-images;android-28;google_apis;x86_64"},
-  "emulator_latest": {"type": "virtual", "image":"system-images;android-30;google_apis;x86_64"},
+  "emulator_target": {"type": "virtual", "image":"system-images;android-30;google_apis;x86_64"},
+  "emulator_latest": {"type": "virtual", "image":"system-images;android-32;google_apis;x86_64"},
   "emulator_32bit": {"type": "virtual", "image":"system-images;android-30;google_apis;x86"},
   "ios_min": {"type": "real", "model":"iphone8", "version":"12.4"},
   "ios_target": {"type": "real", "model":"iphone8", "version":"13.6"},
diff --git a/scripts/gha/test_simulator.py b/scripts/gha/test_simulator.py
index 39a080ab0b..fe1d076b2f 100644
--- a/scripts/gha/test_simulator.py
+++ b/scripts/gha/test_simulator.py
@@ -745,7 +745,7 @@ def _run_android_test(testapp_dir, package_name, app_path, helper_project, max_a
     _uninstall_android_app(package_name)
 
     result = test_validation.validate_results(log, test_validation.CPP)
-    if result.complete and (FLAGS.test_type != "uitest" or result.fails == 0):
+    if result.complete and result.fails == 0:
       break
 
     _save_recorded_android_video(video_name, testapp_dir)