diff --git a/aodh/tests/unit/test_notifier.py b/aodh/tests/unit/test_notifier.py
index 7a8c2cdc2..55dd135f6 100644
--- a/aodh/tests/unit/test_notifier.py
+++ b/aodh/tests/unit/test_notifier.py
@@ -54,12 +54,8 @@ class TestAlarmNotifier(tests_base.BaseTestCase):
             self._fake_generate_request_id))
 
     def test_init_host(self):
-        # If we try to create a real RPC connection, init_host() never
-        # returns. Mock it out so we can establish the service
-        # configuration.
-        with mock.patch.object(self.service.rpc_server, 'start'):
-            self.service.start()
-            self.service.stop()
+        self.service.start()
+        self.service.stop()
 
     def test_notify_alarm(self):
         data = {
diff --git a/requirements.txt b/requirements.txt
index 18362160c..e141c36a4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -18,7 +18,7 @@ oslo.service>=0.1.0 # Apache-2.0
 PasteDeploy>=1.5.0
 pbr<2.0,>=0.11
 pecan>=0.8.0
-oslo.messaging>1.17.1,!=2.6.0,!=2.6.1,!=2.8.0 # Apache-2.0
+oslo.messaging>2.6.1,!=2.8.0 # Apache-2.0
 oslo.middleware!=2.0.0,>=1.2.0 # Apache-2.0
 oslo.serialization>=1.4.0 # Apache-2.0
 oslo.utils>=1.9.0 # Apache-2.0