diff --git a/nova/cells/rpc_driver.py b/nova/cells/rpc_driver.py
index 7a26e3f14b44..3f45af6e32f8 100644
--- a/nova/cells/rpc_driver.py
+++ b/nova/cells/rpc_driver.py
@@ -121,7 +121,8 @@ class InterCellRPCAPI(object):
         """
         transport_url = next_hop.db_info['transport_url']
         if transport_url not in self.transports:
-            transport = messaging.get_transport(nova.conf.CONF, transport_url)
+            transport = messaging.get_rpc_transport(
+                nova.conf.CONF, transport_url)
             self.transports[transport_url] = transport
         else:
             transport = self.transports[transport_url]
diff --git a/nova/rpc.py b/nova/rpc.py
index f69502528427..6d5e4136c7e0 100644
--- a/nova/rpc.py
+++ b/nova/rpc.py
@@ -230,9 +230,9 @@ def if_notifications_enabled(f):
 
 def create_transport(url):
     exmods = get_allowed_exmods()
-    return messaging.get_transport(CONF,
-                                   url=url,
-                                   allowed_remote_exmods=exmods)
+    return messaging.get_rpc_transport(CONF,
+                                       url=url,
+                                       allowed_remote_exmods=exmods)
 
 
 class LegacyValidatingNotifier(object):
diff --git a/nova/tests/fixtures.py b/nova/tests/fixtures.py
index 279368662d36..dd375293b7a7 100644
--- a/nova/tests/fixtures.py
+++ b/nova/tests/fixtures.py
@@ -671,7 +671,7 @@ class RPCFixture(fixtures.Fixture):
         # one of the many transports we're multplexing here.
         if url not in self._buses:
             exmods = rpc.get_allowed_exmods()
-            self._buses[url] = messaging.get_transport(
+            self._buses[url] = messaging.get_rpc_transport(
                 CONF,
                 url=url,
                 allowed_remote_exmods=exmods)
diff --git a/nova/tests/unit/cells/test_cells_rpc_driver.py b/nova/tests/unit/cells/test_cells_rpc_driver.py
index 3b8c253d2eb3..1055b9478d9f 100644
--- a/nova/tests/unit/cells/test_cells_rpc_driver.py
+++ b/nova/tests/unit/cells/test_cells_rpc_driver.py
@@ -87,7 +87,8 @@ class CellsRPCDriverTestCase(test.NoDBTestCase):
         next_hop.db_info['transport_url'] = transport_url
 
         # first call to _get_transport creates a oslo.messaging.Transport obj
-        with mock.patch.object(oslo_messaging, 'get_transport') as get_trans:
+        with mock.patch.object(oslo_messaging,
+                               'get_rpc_transport') as get_trans:
             transport = rpcapi._get_transport(next_hop)
             get_trans.assert_called_once_with(rpc_driver.CONF, transport_url)
             self.assertIn(transport_url, rpcapi.transports)
diff --git a/nova/tests/unit/test_notifier.py b/nova/tests/unit/test_notifier.py
index 743e05bb22a0..95366cdf2853 100644
--- a/nova/tests/unit/test_notifier.py
+++ b/nova/tests/unit/test_notifier.py
@@ -21,7 +21,7 @@ from nova import test
 
 class TestNotifier(test.NoDBTestCase):
 
-    @mock.patch('oslo_messaging.get_transport')
+    @mock.patch('oslo_messaging.get_rpc_transport')
     @mock.patch('oslo_messaging.get_notification_transport')
     @mock.patch('oslo_messaging.Notifier')
     def test_notification_format_affects_notification_driver(self,
diff --git a/nova/tests/unit/test_rpc.py b/nova/tests/unit/test_rpc.py
index ebf3c99a1ab4..3fd8d383a48e 100644
--- a/nova/tests/unit/test_rpc.py
+++ b/nova/tests/unit/test_rpc.py
@@ -304,7 +304,7 @@ class TestRPC(testtools.TestCase):
         self.assertEqual('notifier', notifier)
 
     @mock.patch.object(rpc, 'get_allowed_exmods')
-    @mock.patch.object(messaging, 'get_transport')
+    @mock.patch.object(messaging, 'get_rpc_transport')
     def test_create_transport(self, mock_transport, mock_exmods):
         exmods = mock_exmods.return_value
         transport = rpc.create_transport(mock.sentinel.url)