diff --git a/heatclient/openstack/common/apiclient/base.py b/heatclient/openstack/common/apiclient/base.py
index 0a99ab2a..3e685286 100644
--- a/heatclient/openstack/common/apiclient/base.py
+++ b/heatclient/openstack/common/apiclient/base.py
@@ -286,7 +286,7 @@ class CrudManager(BaseManager):
       {}, {}]}`).
     - `key`: Usually a singular noun by convention (e.g. `entity`); used to
       refer to an individual member of the collection.
-
+    
     """
     collection_key = None
     key = None
@@ -446,7 +446,7 @@ class Resource(object):
 
     This is pretty much just a bag for attributes.
     """
-
+    
     HUMAN_ID = False
     NAME_ATTR = 'name'
 
diff --git a/heatclient/tests/unit/__init__.py b/heatclient/tests/unit/__init__.py
index e69de29b..b1967c8f 100644
--- a/heatclient/tests/unit/__init__.py
+++ b/heatclient/tests/unit/__init__.py
@@ -0,0 +1,5 @@
+import sys
+
+from mox3 import mox
+
+sys.modules['mox'] = mox
diff --git a/heatclient/tests/unit/test_common_http.py b/heatclient/tests/unit/test_common_http.py
index 36365857..9ccc24a3 100644
--- a/heatclient/tests/unit/test_common_http.py
+++ b/heatclient/tests/unit/test_common_http.py
@@ -18,7 +18,7 @@ import socket
 
 from keystoneauth1 import adapter
 import mock
-from mox3 import mox
+import mox
 from oslo_serialization import jsonutils
 import requests
 import six
diff --git a/heatclient/tests/unit/test_events.py b/heatclient/tests/unit/test_events.py
index 584f713c..f6071a5b 100644
--- a/heatclient/tests/unit/test_events.py
+++ b/heatclient/tests/unit/test_events.py
@@ -13,7 +13,7 @@
 #    under the License.
 
 import mock
-from mox3 import mox
+import mox
 import testtools
 
 from heatclient.common import utils
diff --git a/heatclient/tests/unit/test_resources.py b/heatclient/tests/unit/test_resources.py
index d5200e35..b3c5c307 100644
--- a/heatclient/tests/unit/test_resources.py
+++ b/heatclient/tests/unit/test_resources.py
@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from mox3 import mox
+import mox
 from six.moves.urllib import parse
 import testtools
 
diff --git a/heatclient/tests/unit/test_shell.py b/heatclient/tests/unit/test_shell.py
index 7071363d..f88f7fc6 100644
--- a/heatclient/tests/unit/test_shell.py
+++ b/heatclient/tests/unit/test_shell.py
@@ -19,7 +19,7 @@ import uuid
 import fixtures
 from keystoneauth1 import fixture as keystone_fixture
 import mock
-from mox3 import mox
+import mox
 from oslo_serialization import jsonutils
 from oslo_utils import encodeutils
 from oslotest import mockpatch
diff --git a/heatclient/tests/unit/test_template_utils.py b/heatclient/tests/unit/test_template_utils.py
index 6440af24..881470e1 100644
--- a/heatclient/tests/unit/test_template_utils.py
+++ b/heatclient/tests/unit/test_template_utils.py
@@ -15,7 +15,7 @@ import base64
 import json
 import tempfile
 
-from mox3 import mox
+import mox
 import six
 from six.moves.urllib import error
 from six.moves.urllib import request