diff --git a/test-requirements.txt b/test-requirements.txt
index 07076a2..d012fb8 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,6 +5,7 @@ hacking>=0.12.0,<0.13  # Apache-2.0
 openstackdocstheme>=1.5.0  # Apache-2.0
 sphinx>=1.2.1,!=1.3b1,<1.4  # BSD
 testrepository>=0.0.18  # Apache-2.0/BSD
+python-openstackclient>=3.16.1
 
 # Python 2.7 dependencies
 mock; python_version < '3.0'
diff --git a/tools/func-tests.sh b/tools/func-tests.sh
index d648852..f002d8b 100755
--- a/tools/func-tests.sh
+++ b/tools/func-tests.sh
@@ -157,7 +157,7 @@ fi
 
 if [[ ${GATE_RUN} == 1 ]]; then
     # The Cinder backup service is enabled in the Gate.
-    if [[ $(cinder backup-list --all-tenants | wc -l) -ne 4 ]]; then
+    if [[ $(openstack volume backup list --all-projects | wc -l) -ne 1 ]]; then
         echo "Not all volume backups were cleaned up"
         exit 1
     fi
diff --git a/tools/post_test_hook.sh b/tools/post_test_hook.sh
index 79a7d90..408ed91 100755
--- a/tools/post_test_hook.sh
+++ b/tools/post_test_hook.sh
@@ -15,7 +15,7 @@
 export OSPURGE_DIR="$BASE/new/ospurge"
 
 cd $OSPURGE_DIR
-sudo chown -R jenkins:stack $OSPURGE_DIR
+sudo chown -R stack:stack $OSPURGE_DIR
 
 CLOUDS_YAML=/etc/openstack/clouds.yaml
 
@@ -23,13 +23,13 @@ if [ ! -e ${CLOUDS_YAML} ]; then
     # stable/liberty had clouds.yaml in the home/base directory
     sudo mkdir -p /etc/openstack
     sudo cp $BASE/new/.config/openstack/clouds.yaml ${CLOUDS_YAML}
-    sudo chown -R jenkins:stack /etc/openstack
+    sudo chown -R stack:stack /etc/openstack
 fi
 
 
 echo "Running OSpurge functional test suite"
 set +e
-sudo -E -H -u jenkins tox -e functional
+sudo -E -H -u stack tox -e functional
 EXIT_CODE=$?
 set -e