diff --git a/tests/test-openstack.sh b/tests/test-openstack.sh
index f9d218773f..51fb115d79 100755
--- a/tests/test-openstack.sh
+++ b/tests/test-openstack.sh
@@ -10,6 +10,10 @@ export PYTHONUNBUFFERED=1
 function test_smoke {
     openstack --debug compute service list
     openstack --debug network agent list
+    openstack --debug orchestration service list
+    if [[ $ACTION =~ "ceph" ]] || [[ $ACTION == "cinder-lvm" ]]; then
+        openstack --debug volume service list
+    fi
 }
 
 function test_instance_boot {
diff --git a/tools/setup_gate.sh b/tools/setup_gate.sh
index 7f7d994906..9e5a8a1dde 100755
--- a/tools/setup_gate.sh
+++ b/tools/setup_gate.sh
@@ -13,6 +13,7 @@ function setup_openstack_clients {
     virtualenv ~/openstackclient-venv
     ~/openstackclient-venv/bin/pip install -U pip
     ~/openstackclient-venv/bin/pip install python-openstackclient
+    ~/openstackclient-venv/bin/pip install python-heatclient
     if [[ $ACTION == zun ]]; then
         ~/openstackclient-venv/bin/pip install python-zunclient
     fi