diff --git a/run_tests.sh b/run_tests.sh
index 4bc89a3dd..ecb41b697 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -24,8 +24,10 @@ export HIERA_CONFIG=${HIERA_CONFIG:-${SCRIPT_DIR}/hiera/hiera.yaml}
 export MANAGE_HIERA=${MANAGE_HIERA:-true}
 export PUPPET_ARGS="${PUPPET_ARGS} --detailed-exitcodes --color=false --test --trace --hiera_config ${HIERA_CONFIG} --logdest ${WORKSPACE}/puppet.log"
 export DISTRO=$(lsb_release -c -s)
-# Tempest pin due to issue described in https://review.openstack.org/#/c/412511/
-export TEMPEST_VERSION=${TEMPEST_VERSION:-'382a2065f3364a36c110bfcc6275a0f8f6894773'}
+# If openstack/tempest is broken on master, we can pin the repository to a specific commit
+# by using the following line:
+# export TEMPEST_VERSION=${TEMPEST_VERSION:-'382a2065f3364a36c110bfcc6275a0f8f6894773'}
+export TEMPEST_VERSION=${TEMPEST_VERSION:-'origin/master'}
 
 # NOTE(pabelanger): Setup facter to know about AFS mirror.
 if [ -f /etc/nodepool/provider ]; then