diff --git a/test/utils/run_tests.sh b/test/utils/run_tests.sh
index 8be9102dc1d..eefb562f20e 100755
--- a/test/utils/run_tests.sh
+++ b/test/utils/run_tests.sh
@@ -1,6 +1,8 @@
-#!/bin/sh -x
+#!/bin/sh
 
 set -e
+set -u
+set -x
 
 if [ "${TARGET}" = "sanity" ]; then
     ./test/code-smell/replace-urlopen.sh .