diff --git a/utils/run-tests.sh b/utils/run-tests.sh
index 124fe42829..ccd3d236c2 100755
--- a/utils/run-tests.sh
+++ b/utils/run-tests.sh
@@ -3,7 +3,7 @@
 SCRIPTDIR="$(readlink -f "$(dirname "$0")")"
 TOPDIR="$(readlink -f "${SCRIPTDIR}/..")"
 
-test_env="/tmp/ansible-freeipa-tests"
+# test_env="/tmp/ansible-freeipa-tests"
 
 # shellcheck source=utils/shfun
 . "${SCRIPTDIR}/shfun"
@@ -138,7 +138,7 @@ log info "Installing dependencies from 'requirements-tests.txt'"
 pip install --upgrade -r "${TOPDIR}/requirements-tests.txt"
 
 # shellcheck disable=SC2119
-[ -z "SKIP_ANSIBLE" ] && install_ansible
+[ -z "${SKIP_ANSIBLE}" ] && install_ansible
 
 # Ansible configuration
 export ANSIBLE_ROLES_PATH="${TOPDIR}/roles"
diff --git a/utils/setup_test_container.sh b/utils/setup_test_container.sh
index 20081fd8a7..3c32432960 100755
--- a/utils/setup_test_container.sh
+++ b/utils/setup_test_container.sh
@@ -71,7 +71,9 @@ scenario="${1}"
 shift
 
 make_inventory "${scenario}" "${engine:-podman}" "${ansible_interpreter:-"/usr/bin/python3"}"
+# shellcheck disable=SC2154
 log info "Inventory path: [${inventory}]"
+# shellcheck disable=SC2154
 log debug "$(cat "${inventory}")"
 prepare_container "${scenario}" "${IMAGE_TAG}"
 start_container "${scenario}"
diff --git a/utils/shfun b/utils/shfun
index 1e2b4ec891..448d784d29 100644
--- a/utils/shfun
+++ b/utils/shfun
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -eu
 # This file is meant to be source'd by bash scripts
 
 # shellcheck disable=SC2034