diff --git a/zaza/openstack/charm_tests/tempest/utils.py b/zaza/openstack/charm_tests/tempest/utils.py
index eaf2b656f..3ef71c55d 100644
--- a/zaza/openstack/charm_tests/tempest/utils.py
+++ b/zaza/openstack/charm_tests/tempest/utils.py
@@ -28,7 +28,7 @@
 import zaza.model as model
 import zaza.utilities.deployment_env as deployment_env
 import zaza.utilities.juju as zaza_juju_utils
-import zaza.openstack.utilities.juju as juju_utils
+import zaza.utilities.networking
 import zaza.openstack.utilities.openstack as openstack_utils
 import zaza.openstack.charm_tests.glance.setup as glance_setup
 import zaza.openstack.charm_tests.magnum.setup as magnum_setup
@@ -220,7 +220,10 @@ def _add_application_ips(ctxt):
     for ctxt_key, application_name in (('keystone', 'keystone'),
                                        ('dashboard', 'openstack-dashboard'),
                                        ('ncc', 'nova-cloud-controller')):
-        ctxt[ctxt_key] = zaza_juju_utils.get_application_ip(application_name)
+        ip = zaza_juju_utils.get_application_ip(application_name)
+        if ip:
+            ip = zaza.utilities.networking.format_addr(ip)
+        ctxt[ctxt_key] = ip
 
 
 def _add_nova_config(ctxt, keystone_session, missing_fatal=True):