diff --git a/oslo/messaging/openstack/common/__init__.py b/oslo/messaging/openstack/common/__init__.py
index d1223eaf7..e69de29bb 100644
--- a/oslo/messaging/openstack/common/__init__.py
+++ b/oslo/messaging/openstack/common/__init__.py
@@ -1,17 +0,0 @@
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-import six
-
-
-six.add_move(six.MovedModule('mox', 'mox', 'mox3.mox'))
diff --git a/tests/test_transport.py b/tests/test_transport.py
index 34a72e5b0..6e700e88a 100644
--- a/tests/test_transport.py
+++ b/tests/test_transport.py
@@ -14,8 +14,8 @@
 #    under the License.
 
 import fixtures
-from mox3 import mox
 import six
+from six.moves import mox
 from stevedore import driver
 import testscenarios