diff --git a/ceilometer/tests/integration/hooks/post_test_hook.sh b/ceilometer/tests/integration/hooks/post_test_hook.sh
index 182806a..fbc69a7 100755
--- a/ceilometer/tests/integration/hooks/post_test_hook.sh
+++ b/ceilometer/tests/integration/hooks/post_test_hook.sh
@@ -59,7 +59,7 @@
 if [ $EXIT_CODE -ne 0 ] ; then
     set +x
     echo "* Heat stack:"
-    heat stack-show integration_test
+    openstack stack show integration_test
     echo "* Alarm list:"
     ceilometer alarm-list
     echo "* Nova instance list:"
diff --git a/ceilometer/tests/tempest/service/client.py b/ceilometer/tests/tempest/service/client.py
index 9b0d34b..a322ad1 100644
--- a/ceilometer/tests/tempest/service/client.py
+++ b/ceilometer/tests/tempest/service/client.py
@@ -24,7 +24,8 @@
 from tempest.lib.services.compute.servers_client import ServersClient
 from tempest import manager
 from tempest.services.image.v1.json.images_client import ImagesClient
-from tempest.services.image.v2.json.images_client import ImagesClientV2
+from tempest.services.image.v2.json.images_client import \
+    ImagesClient as ImagesClientV2
 from tempest.services.object_storage.container_client import ContainerClient
 from tempest.services.object_storage.object_client import ObjectClient