diff --git a/.github/workflows/ci_emulator_run.yml b/.github/workflows/ci_emulator_run.yml
index 2d39fca..fa1625b 100644
--- a/.github/workflows/ci_emulator_run.yml
+++ b/.github/workflows/ci_emulator_run.yml
@@ -82,11 +82,6 @@ jobs:
       run: |
         vab install 'system-images;android-30;aosp_atd;x86_64'
 
-    - name: Create test AVD
-      run: |
-        # export ANDROID_SDK_ROOT="/usr/local/lib/android/sdk"
-        echo no | $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/avdmanager create avd --force --name vab_emulator_tests --abi aosp_atd/x86_64 --package 'system-images;android-30;aosp_atd;x86_64'
-
     - name: Run `vab test-all`
       run: |
         vab test-all
diff --git a/tests/at-runtime/emulator/emulator_test.vv b/tests/at-runtime/emulator/emulator_test.vv
index d779f22..dfff6a2 100644
--- a/tests/at-runtime/emulator/emulator_test.vv
+++ b/tests/at-runtime/emulator/emulator_test.vv
@@ -75,7 +75,6 @@ fn ensure_env() {
 	assert env.has_emulator() == true, 'These tests requires a working `emulator` installed'
 
 	// TODO: add env.has_system_image('android-XY','type','host-arch')
-	// TODO: add env.install_system_image('android-XY','type','host-arch') and/or `vab install 'system-images;android-30;aosp_atd;x86_64'`
 
 	avdmanager := env.avdmanager()
 	avdmanager_list_res := run([avdmanager, 'list', 'avd', '-c'])