diff --git a/zunclient/tests/unit/common/test_httpclient.py b/zunclient/tests/unit/common/test_httpclient.py
index b8615e1c..68016484 100644
--- a/zunclient/tests/unit/common/test_httpclient.py
+++ b/zunclient/tests/unit/common/test_httpclient.py
@@ -13,10 +13,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
-import six
+from unittest import mock
 
 from oslo_serialization import jsonutils
+import six
 
 from zunclient import api_versions
 from zunclient.common.apiclient import exceptions
diff --git a/zunclient/tests/unit/osc/test_plugin.py b/zunclient/tests/unit/osc/test_plugin.py
index c164ba50..3efc64cf 100644
--- a/zunclient/tests/unit/osc/test_plugin.py
+++ b/zunclient/tests/unit/osc/test_plugin.py
@@ -10,7 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from zunclient import api_versions
 from zunclient.osc import plugin
diff --git a/zunclient/tests/unit/test_api_versions.py b/zunclient/tests/unit/test_api_versions.py
index 52cbaedf..73e40354 100644
--- a/zunclient/tests/unit/test_api_versions.py
+++ b/zunclient/tests/unit/test_api_versions.py
@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from zunclient import api_versions
 from zunclient import exceptions
diff --git a/zunclient/tests/unit/test_client.py b/zunclient/tests/unit/test_client.py
index ac46e548..9f68bbcf 100644
--- a/zunclient/tests/unit/test_client.py
+++ b/zunclient/tests/unit/test_client.py
@@ -12,7 +12,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import mock
+from unittest import mock
+
 import testtools
 
 from zunclient import api_versions
diff --git a/zunclient/tests/unit/test_shell.py b/zunclient/tests/unit/test_shell.py
index 2f37a92a..1cd6d0f0 100644
--- a/zunclient/tests/unit/test_shell.py
+++ b/zunclient/tests/unit/test_shell.py
@@ -14,10 +14,10 @@
 
 import re
 import sys
+from unittest import mock
 
 import fixtures
 from keystoneauth1 import fixture
-import mock
 import six
 from testtools import matchers
 
diff --git a/zunclient/tests/unit/test_websocketclient.py b/zunclient/tests/unit/test_websocketclient.py
index e1320db7..59d86219 100644
--- a/zunclient/tests/unit/test_websocketclient.py
+++ b/zunclient/tests/unit/test_websocketclient.py
@@ -13,7 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
+
 import testtools
 
 from zunclient.common.websocketclient import websocketclient
diff --git a/zunclient/tests/unit/v1/shell_test_base.py b/zunclient/tests/unit/v1/shell_test_base.py
index 321828fc..c51a7a10 100644
--- a/zunclient/tests/unit/v1/shell_test_base.py
+++ b/zunclient/tests/unit/v1/shell_test_base.py
@@ -13,8 +13,8 @@
 #    under the License.
 
 import re
+from unittest import mock
 
-import mock
 from testtools import matchers
 
 from zunclient import api_versions
diff --git a/zunclient/tests/unit/v1/test_availability_zones_shell.py b/zunclient/tests/unit/v1/test_availability_zones_shell.py
index 1b0c6529..c852be86 100644
--- a/zunclient/tests/unit/v1/test_availability_zones_shell.py
+++ b/zunclient/tests/unit/v1/test_availability_zones_shell.py
@@ -10,7 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from zunclient.tests.unit.v1 import shell_test_base
 
diff --git a/zunclient/tests/unit/v1/test_client.py b/zunclient/tests/unit/v1/test_client.py
index 12e25d8c..bbe4c5c9 100644
--- a/zunclient/tests/unit/v1/test_client.py
+++ b/zunclient/tests/unit/v1/test_client.py
@@ -12,7 +12,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
+
 import testtools
 
 from zunclient.v1 import client
diff --git a/zunclient/tests/unit/v1/test_containers_shell.py b/zunclient/tests/unit/v1/test_containers_shell.py
index 946b113b..c35274b7 100644
--- a/zunclient/tests/unit/v1/test_containers_shell.py
+++ b/zunclient/tests/unit/v1/test_containers_shell.py
@@ -10,7 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from zunclient.common.apiclient import exceptions as apiexec
 from zunclient.common import utils as zun_utils
diff --git a/zunclient/tests/unit/v1/test_images_shell.py b/zunclient/tests/unit/v1/test_images_shell.py
index 4a404047..b6f2b165 100644
--- a/zunclient/tests/unit/v1/test_images_shell.py
+++ b/zunclient/tests/unit/v1/test_images_shell.py
@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from zunclient.tests.unit.v1 import shell_test_base
 
diff --git a/zunclient/tests/unit/v1/test_services_shell.py b/zunclient/tests/unit/v1/test_services_shell.py
index 3b0e78d2..baeb65b1 100644
--- a/zunclient/tests/unit/v1/test_services_shell.py
+++ b/zunclient/tests/unit/v1/test_services_shell.py
@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from zunclient.tests.unit.v1 import shell_test_base
 
diff --git a/zunclient/tests/unit/v1/test_versions_shell.py b/zunclient/tests/unit/v1/test_versions_shell.py
index 3160f1db..5a58b4f8 100644
--- a/zunclient/tests/unit/v1/test_versions_shell.py
+++ b/zunclient/tests/unit/v1/test_versions_shell.py
@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from zunclient.tests.unit.v1 import shell_test_base