diff --git a/ceilometer/tests/integration/hooks/post_test_hook.sh b/ceilometer/tests/integration/hooks/post_test_hook.sh
index c16a74d..0b9cb7f 100755
--- a/ceilometer/tests/integration/hooks/post_test_hook.sh
+++ b/ceilometer/tests/integration/hooks/post_test_hook.sh
@@ -36,6 +36,8 @@
     echo "* Message queue status:"
     sudo rabbitmqctl list_queues | grep -e \\.sample -e \\.info
 
+    source $BASE/new/devstack/openrc admin admin
+
     echo "* Heat stack:"
     openstack stack show integration_test
     echo "* Alarm list:"
@@ -43,7 +45,7 @@
     echo "* Event list:"
     ceilometer event-list -q 'event_type=string::compute.instance.create.end'
     echo "* Nova instance list:"
-    openstack server list
+    openstack server list --all-projects
 
     echo "* Gnocchi instance list:"
     gnocchi resource list -t instance
@@ -81,8 +83,10 @@
 sudo chown -R tempest:stack $BASE/new/tempest
 sudo chown -R tempest:stack $BASE/data/tempest
 cd $BASE/new/tempest
+set +e
 sudo -H -u tempest OS_TEST_TIMEOUT=$TEMPEST_OS_TEST_TIMEOUT tox -eall-plugin -- ceilometer.tests.tempest.scenario.test_telemetry_integration --concurrency=$TEMPEST_CONCURRENCY
 EXIT_CODE=$?
+set -e
 export_subunit_data "all-plugin"
 generate_reports_and_maybe_exit $EXIT_CODE