diff --git a/ceilometer/alarm/service.py b/ceilometer/alarm/service.py
index 328f633bd..eceabf3af 100644
--- a/ceilometer/alarm/service.py
+++ b/ceilometer/alarm/service.py
@@ -170,7 +170,7 @@ class PartitionedAlarmService(AlarmService, os_service.Service):
 
     def stop(self):
         self.rpc_server.stop()
-        super(AlarmNotifierService, self).stop()
+        super(PartitionedAlarmService, self).stop()
 
     def _assigned_alarms(self):
         return self.partition_coordinator.assigned_alarms(self._client)
diff --git a/ceilometer/tests/alarm/test_partitioned_alarm_svc.py b/ceilometer/tests/alarm/test_partitioned_alarm_svc.py
index 7b22d7002..2b2769eae 100644
--- a/ceilometer/tests/alarm/test_partitioned_alarm_svc.py
+++ b/ceilometer/tests/alarm/test_partitioned_alarm_svc.py
@@ -57,7 +57,7 @@ class TestPartitionedAlarmService(test.BaseTestCase):
         self.partitioned.extension_manager = self.extension_mgr
 
     @mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock())
-    def test_start(self):
+    def test_lifecycle(self):
         test_interval = 120
         self.CONF.set_override('evaluation_interval',
                                test_interval,
@@ -84,6 +84,7 @@ class TestPartitionedAlarmService(test.BaseTestCase):
             ]
             actual = self.partitioned.tg.add_timer.call_args_list
             self.assertEqual(expected, actual)
+            self.partitioned.stop()
 
     def test_presence_reporting(self):
         priority = 42