diff --git a/ceilometer/tests/integration/hooks/post_test_hook.sh b/ceilometer/tests/integration/hooks/post_test_hook.sh
index 252d4bc..7c00d58 100755
--- a/ceilometer/tests/integration/hooks/post_test_hook.sh
+++ b/ceilometer/tests/integration/hooks/post_test_hook.sh
@@ -39,10 +39,10 @@
 fi
 
 openstack catalog list
-export AODH_SERVICE_URL=$(openstack catalog show alarming -c endpoints -f value | awk '/publicURL/{print $2}')
-export GNOCCHI_SERVICE_URL=$(openstack catalog show metric -c endpoints -f value | awk '/publicURL/{print $2}')
-export HEAT_SERVICE_URL=$(openstack catalog show orchestration -c endpoints -f value | awk '/publicURL/{print $2}')
-export NOVA_SERVICE_URL=$(openstack catalog show compute -c endpoints -f value | awk '/publicURL/{print $2}')
+export AODH_SERVICE_URL=$(openstack catalog show alarming -c endpoints -f value | awk '/public/{print $2}')
+export GNOCCHI_SERVICE_URL=$(openstack catalog show metric -c endpoints -f value | awk '/public/{print $2}')
+export HEAT_SERVICE_URL=$(openstack catalog show orchestration -c endpoints -f value | awk '/public/{print $2}')
+export NOVA_SERVICE_URL=$(openstack catalog show compute -c endpoints -f value | awk '/public/{print $2}')
 export GLANCE_IMAGE_NAME=$(openstack image list | awk '/ cirros.*uec /{print $4}')
 export ADMIN_TOKEN=$(openstack token issue -c id -f value)
 
diff --git a/ceilometer/tests/tempest/plugin.py b/ceilometer/tests/tempest/plugin.py
index c3a446c..077a3c2 100644
--- a/ceilometer/tests/tempest/plugin.py
+++ b/ceilometer/tests/tempest/plugin.py
@@ -15,16 +15,18 @@
 
 import os
 
-from ceilometer.tests.tempest import config as tempest_config
 from tempest import config
 from tempest.test_discover import plugins
 
+import ceilometer
+from ceilometer.tests.tempest import config as tempest_config
+
 
 class CeilometerTempestPlugin(plugins.TempestPlugin):
 
     def load_tests(self):
         base_path = os.path.split(os.path.dirname(
-            os.path.abspath(__file__)))[0]
+            os.path.abspath(ceilometer.__file__)))[0]
         test_dir = "ceilometer/tests/tempest"
         full_test_dir = os.path.join(base_path, test_dir)
         return full_test_dir, base_path