diff --git a/manila/hacking/checks.py b/manila/hacking/checks.py
index 1281f10c..cc20137f 100644
--- a/manila/hacking/checks.py
+++ b/manila/hacking/checks.py
@@ -52,9 +52,7 @@ string_translation = re.compile(r"[^_]*_\(\s*('|\")")
 underscore_import_check = re.compile(r"(.)*import _(.)*")
 # We need this for cases where they have created their own _ function.
 custom_underscore_check = re.compile(r"(.)*_\s*=\s*(.)*")
-# TODO(toabctl): Remove the oslo.messaging exception when package
-#                moved away from namespace
-oslo_namespace_imports = re.compile(r"from[\s]*oslo[.](?!messaging)(.*)")
+oslo_namespace_imports = re.compile(r"from[\s]*oslo[.](.*)")
 
 
 class BaseASTChecker(ast.NodeVisitor):
diff --git a/manila/test.py b/manila/test.py
index da85d99c..a33ce02f 100644
--- a/manila/test.py
+++ b/manila/test.py
@@ -27,11 +27,11 @@ import uuid
 
 import fixtures
 import mock
-from oslo.messaging import conffixture as messaging_conffixture
 from oslo_concurrency import lockutils
 from oslo_config import cfg
 from oslo_config import fixture as config_fixture
 from oslo_log import log
+from oslo_messaging import conffixture as messaging_conffixture
 import oslotest.base as base_test
 import six