diff --git a/zaza/openstack/charm_tests/keystone/setup.py b/zaza/openstack/charm_tests/keystone/setup.py
index bec43fe..73264cd 100644
--- a/zaza/openstack/charm_tests/keystone/setup.py
+++ b/zaza/openstack/charm_tests/keystone/setup.py
@@ -43,7 +43,6 @@ def wait_for_cacert(model_name=None):
     logging.info("Waiting for cacert")
     zaza.openstack.utilities.openstack.block_until_ca_exists(
         'keystone',
-        cert_file,
         'CERTIFICATE',
         model_name=model_name)
     zaza.model.block_until_all_units_idle(model_name=model_name)
diff --git a/zaza/openstack/charm_tests/vault/setup.py b/zaza/openstack/charm_tests/vault/setup.py
index ad1d535..25389d5 100644
--- a/zaza/openstack/charm_tests/vault/setup.py
+++ b/zaza/openstack/charm_tests/vault/setup.py
@@ -224,7 +224,6 @@ def validate_ca(cacertificate, application="keystone", port=5000):
     """
     zaza.openstack.utilities.openstack.block_until_ca_exists(
         application,
-        cert_file,
         cacertificate.decode().strip())
     vip = (zaza.model.get_application_config(application)
            .get("vip").get("value"))
diff --git a/zaza/openstack/charm_tests/vault/tests.py b/zaza/openstack/charm_tests/vault/tests.py
index 141a1e6..68130a0 100644
--- a/zaza/openstack/charm_tests/vault/tests.py
+++ b/zaza/openstack/charm_tests/vault/tests.py
@@ -156,7 +156,6 @@ class VaultTest(BaseVaultTest):
         del test_config['target_deploy_status']['vault']
         zaza.openstack.utilities.openstack.block_until_ca_exists(
             'keystone',
-            cert_file,
             cacert.decode().strip())
         zaza.model.wait_for_application_states(
             states=test_config.get('target_deploy_status', {}))