diff --git a/zaza/openstack/charm_tests/aodh/.tests.py.swp b/zaza/openstack/charm_tests/aodh/.tests.py.swp
deleted file mode 100644
index 431d6bc..0000000
Binary files a/zaza/openstack/charm_tests/aodh/.tests.py.swp and /dev/null differ
diff --git a/zaza/openstack/charm_tests/aodh/setup.py b/zaza/openstack/charm_tests/aodh/setup.py
index c83f453..cb02ecb 100644
--- a/zaza/openstack/charm_tests/aodh/setup.py
+++ b/zaza/openstack/charm_tests/aodh/setup.py
@@ -19,4 +19,4 @@ import zaza.openstack.configure.telemetry
 
 def ceilometer_upgrade():
     """Run ceilometer upgrade action."""
-    zaza.openstack.configure.telemetry.ceilometer_upgrade()
+    zaza.openstack.configure.telemetry.ceilometer_upgrade('ceilometer')
diff --git a/zaza/openstack/configure/telemetry.py b/zaza/openstack/configure/telemetry.py
index 54061b1..880395d 100644
--- a/zaza/openstack/configure/telemetry.py
+++ b/zaza/openstack/configure/telemetry.py
@@ -24,7 +24,7 @@ import zaza.model
 
 def ceilometer_upgrade(application_name=None, model_name=None):
     zaza.model.run_action_on_leader(
-        application_name or self.application_name,
+        application_name,
         'ceilometer-upgrade',
         model_name=model_name,
         action_params={})