diff --git a/zaza/openstack/charm_tests/ceph/tests.py b/zaza/openstack/charm_tests/ceph/tests.py
index d693276..f882c67 100644
--- a/zaza/openstack/charm_tests/ceph/tests.py
+++ b/zaza/openstack/charm_tests/ceph/tests.py
@@ -1799,7 +1799,7 @@ class CephMonKeyRotationTests(test_utils.BaseCharmTest):
         self.assertTrue(entity_filter(first[0]))
 
     def _get_rgw_client(self, unit):
-        ret = self._get_all_keys(unit, 'client.rgw')
+        ret = self._get_all_keys(unit, lambda x: x.startswith('client.rgw'))
         if not ret:
             return None
         return next(iter(ret))[0]