diff --git a/tests/test_images.sh b/tests/test_images.sh
index c8d9fe5f9f..56e9f76228 100755
--- a/tests/test_images.sh
+++ b/tests/test_images.sh
@@ -4,7 +4,10 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-set -euo pipefail
+set -o errexit
+set -o nounset
+set -o pipefail
+[ -n "${DEBUG:-}" ] && set -o xtrace
 
 readonly script_dir="$(dirname $(readlink -f $0))"
 readonly script_name=${0##*/}