diff --git a/test/vhost/common/common.sh b/test/vhost/common/common.sh
index 27761ae67..a50f8e2e2 100644
--- a/test/vhost/common/common.sh
+++ b/test/vhost/common/common.sh
@@ -449,7 +449,8 @@ function vm_kill_all()
 function vm_shutdown_all()
 {
 	local shell_restore_x="$( [[ "$-" =~ x ]] && echo 'set -x' )"
-	set +x
+	# XXX: temporally disable to debug shutdown issue
+	# set +x
 
 	local vms=$(vm_list_all)
 	local vm
@@ -459,9 +460,9 @@ function vm_shutdown_all()
 	done
 
 	notice "Waiting for VMs to shutdown..."
-	timeo=15
+	local timeo=15
 	while [[ $timeo -gt 0 ]]; do
-		all_vms_down=1
+		local all_vms_down=1
 		for vm in $vms; do
 			if [[ -r $VM_BASE_DIR/$vm/qemu.pid ]] && pkill -0 -F "$VM_BASE_DIR/$vm/qemu.pid"; then
 				all_vms_down=0
diff --git a/test/vhost/migration/migration-tc1.sh b/test/vhost/migration/migration-tc1.sh
index c69c5b77b..a86301522 100644
--- a/test/vhost/migration/migration-tc1.sh
+++ b/test/vhost/migration/migration-tc1.sh
@@ -39,6 +39,8 @@ function migration_tc1_configure_vhost()
 function migration_tc1_error_handler()
 {
 	trap - SIGINT ERR EXIT
+	warning "Migration TC1 ERROR HANDLER"
+	print_backtrace
 	set -x
 
 	vm_kill_all