diff --git a/test.sh b/test.sh
index 54e1380319..72ffa3db14 100755
--- a/test.sh
+++ b/test.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/bin/bash -ex
 
 ROOT=$(readlink -fn $(dirname $0))
 MODULE_PATH="${ROOT}/modules:/etc/puppet/modules"
@@ -43,6 +43,8 @@ sudo mv /tmp/hosts /etc/hosts
 
 sudo mkdir -p /var/run/puppet
 sudo bash -x ./install_modules.sh
+echo "Running apply test on these hosts:"
+find applytest -name 'puppetapplytest*.final' -print0
 find applytest -name 'puppetapplytest*.final' -print0 | \
     xargs -0 -P $(nproc) -n 1 -I filearg \
         sudo puppet apply --modulepath=${MODULE_PATH} --noop --verbose --debug filearg > /dev/null
diff --git a/tools/apply-test.sh b/tools/apply-test.sh
index d5cd92ba12..83b97dad9f 100755
--- a/tools/apply-test.sh
+++ b/tools/apply-test.sh
@@ -26,7 +26,7 @@ clonemap:
 EOF
 
 # Add puppet modules that should be installed to the end of this list
-sudo /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
+sudo -E /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
     git://git.openstack.org \
     openstack-infra/puppet-storyboard
 
@@ -67,6 +67,8 @@ sudo mv /tmp/hosts /etc/hosts
 
 sudo mkdir -p /var/run/puppet
 sudo -E bash -x ./install_modules.sh
+echo "Running apply test on these hosts:"
+find applytest -name 'puppetapplytest*.final' -print0
 find applytest -name 'puppetapplytest*.final' -print0 | \
     xargs -0 -P $(nproc) -n 1 -I filearg \
         sudo puppet apply --modulepath=${MODULE_PATH} --noop --verbose --debug filearg > /dev/null