diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
index 139de3125..8d60662dd 100644
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml
@@ -10,7 +10,7 @@ runs:
       uses: actions/setup-java@v4
       with:
         distribution: "temurin"
-        java-version: "17"
+        java-version: "21"
 
     - name: Set up Python 3
       uses: actions/setup-python@v5
diff --git a/scripts/avd_test.sh b/scripts/avd_test.sh
index c1c1e5f2b..931767632 100755
--- a/scripts/avd_test.sh
+++ b/scripts/avd_test.sh
@@ -206,7 +206,7 @@ fi
 
 yes | "$sdk" --licenses > /dev/null
 curl -L $lsposed_url -o out/lsposed.zip
-"$sdk" --channel=3 tools platform-tools emulator
+"$sdk" --channel=3 platform-tools emulator
 
 if [ -n "$1" ]; then
   run_test $1 $2