diff --git a/scripts/avd_test.sh b/scripts/avd_test.sh
index 4f7a079d9..37a569333 100755
--- a/scripts/avd_test.sh
+++ b/scripts/avd_test.sh
@@ -3,7 +3,10 @@
 set -xe
 . scripts/test_common.sh
 
-emu_args_base="-no-window -no-audio -no-boot-anim -gpu swiftshader_indirect -read-only -no-snapshot -cores $core_count"
+emu_port=5682
+export ANDROID_SERIAL="emulator-$emu_port"
+
+emu_args_base="-no-window -no-audio -no-boot-anim -gpu swiftshader_indirect -read-only -no-snapshot -port $emu_port -cores $core_count"
 emu_pid=
 
 atd_min_api=30
diff --git a/scripts/test_common.sh b/scripts/test_common.sh
index 61c065210..e005c0935 100644
--- a/scripts/test_common.sh
+++ b/scripts/test_common.sh
@@ -12,7 +12,7 @@ emu="$ANDROID_HOME/emulator/emulator"
 sdk="$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager"
 avd="$ANDROID_HOME/cmdline-tools/latest/bin/avdmanager"
 
-boot_timeout=600
+boot_timeout=100
 
 core_count=$(nproc)
 if [ $core_count -gt 8 ]; then