diff --git a/scripts/aosp_helper.sh b/scripts/aosp_helper.sh
index d375953..cfebfca 100755
--- a/scripts/aosp_helper.sh
+++ b/scripts/aosp_helper.sh
@@ -17,7 +17,12 @@
 if [[ "$TASK" == "make" ]]; then
   make "$@"
 elif [[ "$TASK" == "emulator" ]]; then
-  emulator "$@"
+  # Launch emulator in bg and kill it in a trap
+  # otherwise it won't get killed when this parent process is killed
+  emulator "$@" &
+  emulator_pid=$!
+  trap "kill $emulator_pid; exit 1" 2 15
+  while true; do sleep 5; done
 elif [[ "$TASK" == "run-cts" ]]; then
   adb wait-for-device
   adb shell 'while [[ -z $(getprop sys.boot_completed) ]]; do sleep 1; done; input keyevent 82'
diff --git a/tools/test_android_cts.py b/tools/test_android_cts.py
index 56fca2d..e6545fd 100755
--- a/tools/test_android_cts.py
+++ b/tools/test_android_cts.py
@@ -260,6 +260,7 @@
       CTS_TRADEFED, 'run', 'cts'], cwd = AOSP_ROOT)
 
   emulator_proc.terminate()
+  time.sleep(6) # aosp_helper waits to be killed in looping 'sleep 5'
 
   # find the newest test_result.xml
   result_dirs = \