diff --git a/manila/manager.py b/manila/manager.py
index 766efb1a86..ce8104c3e2 100644
--- a/manila/manager.py
+++ b/manila/manager.py
@@ -140,7 +140,7 @@ class Manager(base.Base):
         https://wiki.openstack.org/wiki/Oslo/Messaging#API_Version_Negotiation
         """
         if not hasattr(self, '_target'):
-            from oslo import messaging
+            import oslo_messaging as messaging
             self._target = messaging.Target(version=self.RPC_API_VERSION)
         return self._target
 
diff --git a/manila/rpc.py b/manila/rpc.py
index 3d61489f3d..5d3d30704d 100644
--- a/manila/rpc.py
+++ b/manila/rpc.py
@@ -26,8 +26,8 @@ __all__ = [
     'TRANSPORT_ALIASES',
 ]
 
-from oslo import messaging
 from oslo_config import cfg
+import oslo_messaging as messaging
 from oslo_serialization import jsonutils
 
 import manila.context
diff --git a/manila/scheduler/rpcapi.py b/manila/scheduler/rpcapi.py
index f983830854..81e3b61283 100644
--- a/manila/scheduler/rpcapi.py
+++ b/manila/scheduler/rpcapi.py
@@ -16,8 +16,8 @@
 Client side of the scheduler manager RPC API.
 """
 
-from oslo import messaging
 from oslo_config import cfg
+import oslo_messaging as messaging
 from oslo_serialization import jsonutils
 
 from manila import rpc
diff --git a/manila/service.py b/manila/service.py
index 8da9c8803e..c1e890f6a5 100644
--- a/manila/service.py
+++ b/manila/service.py
@@ -27,9 +27,9 @@ import time
 
 import eventlet
 import greenlet
-from oslo import messaging
 from oslo_config import cfg
 from oslo_log import log
+import oslo_messaging as messaging
 from oslo_utils import importutils
 
 from manila import context
diff --git a/manila/share/rpcapi.py b/manila/share/rpcapi.py
index adcd8efee7..83afea3f94 100644
--- a/manila/share/rpcapi.py
+++ b/manila/share/rpcapi.py
@@ -16,8 +16,8 @@
 Client side of the share RPC API.
 """
 
-from oslo import messaging
 from oslo_config import cfg
+import oslo_messaging as messaging
 from oslo_serialization import jsonutils
 
 from manila import rpc
diff --git a/manila/tests/fake_notifier.py b/manila/tests/fake_notifier.py
index 78c039bd83..8ce1fadf06 100644
--- a/manila/tests/fake_notifier.py
+++ b/manila/tests/fake_notifier.py
@@ -15,7 +15,7 @@
 import collections
 import functools
 
-from oslo import messaging
+import oslo_messaging as messaging
 from oslo_serialization import jsonutils
 
 from manila import rpc
diff --git a/manila/tests/share/test_api.py b/manila/tests/share/test_api.py
index 483715e1d6..0295749978 100644
--- a/manila/tests/share/test_api.py
+++ b/manila/tests/share/test_api.py
@@ -20,10 +20,6 @@ import uuid
 
 import ddt
 import mock
-# NOTE(vponomaryov): import from oslo.utils.timeutils is workaround for
-# mocking same object but from different namespaces. Remove it when all
-# oslo libs use same namespace for same things.
-from oslo.utils import timeutils as timeutils_old  # noqa
 from oslo_config import cfg
 from oslo_utils import timeutils
 
@@ -182,8 +178,6 @@ class ShareAPITestCase(test.TestCase):
 
         dt_utc = datetime.datetime.utcnow()
         self.mock_object(timeutils, 'utcnow', mock.Mock(return_value=dt_utc))
-        self.mock_object(timeutils_old, 'utcnow',
-                         mock.Mock(return_value=dt_utc))
         self.mock_object(share_api.policy, 'check_policy')
 
     def test_get_all_admin_no_filters(self):
diff --git a/manila/tests/test_test.py b/manila/tests/test_test.py
index 56daab7d78..8e9a4b7129 100644
--- a/manila/tests/test_test.py
+++ b/manila/tests/test_test.py
@@ -16,8 +16,8 @@
 
 """Tests for the testing base code."""
 
-from oslo import messaging
 from oslo_config import cfg
+import oslo_messaging as messaging
 
 from manila import rpc
 from manila import test