10 files changed, 13 insertions, 11 deletions
diff --git a/heatclient/tests/unit/osc/v1/fakes.py b/heatclient/tests/unit/osc/v1/fakes.py
index 87525bb..dec0c6a 100644
--- a/heatclient/tests/unit/osc/v1/fakes.py
+++ b/heatclient/tests/unit/osc/v1/fakes.py
@@ -13,7 +13,7 @@
 #   under the License.
 #
 
-import mock
+from unittest import mock
 
 from heatclient.tests.unit.osc import utils
 
diff --git a/heatclient/tests/unit/osc/v1/test_build_info.py b/heatclient/tests/unit/osc/v1/test_build_info.py
index c17a42f..40893d2 100644
--- a/heatclient/tests/unit/osc/v1/test_build_info.py
+++ b/heatclient/tests/unit/osc/v1/test_build_info.py
@@ -11,7 +11,7 @@
 #   under the License.
 #
 
-import mock
+from unittest import mock
 
 from heatclient.osc.v1 import build_info as osc_build_info
 from heatclient.tests.unit.osc.v1 import fakes as orchestration_fakes
diff --git a/heatclient/tests/unit/osc/v1/test_event.py b/heatclient/tests/unit/osc/v1/test_event.py
index d7ecb60..5edaf20 100644
--- a/heatclient/tests/unit/osc/v1/test_event.py
+++ b/heatclient/tests/unit/osc/v1/test_event.py
@@ -13,8 +13,8 @@
 #   Copyright 2015 IBM Corp.
 
 import copy
+from unittest import mock
 
-import mock
 import testscenarios
 
 from heatclient import exc
diff --git a/heatclient/tests/unit/osc/v1/test_resource.py b/heatclient/tests/unit/osc/v1/test_resource.py
index 817638c..b932f7e 100644
--- a/heatclient/tests/unit/osc/v1/test_resource.py
+++ b/heatclient/tests/unit/osc/v1/test_resource.py
@@ -12,8 +12,8 @@
 #
 
 import copy
+from unittest import mock
 
-import mock
 from osc_lib import exceptions as exc
 
 from heatclient import exc as heat_exc
diff --git a/heatclient/tests/unit/osc/v1/test_snapshot.py b/heatclient/tests/unit/osc/v1/test_snapshot.py
index 7f69c61..1b99942 100644
--- a/heatclient/tests/unit/osc/v1/test_snapshot.py
+++ b/heatclient/tests/unit/osc/v1/test_snapshot.py
@@ -9,8 +9,9 @@
 #   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 mock
+
+from unittest import mock
+
 from osc_lib import exceptions as exc
 import six
 
diff --git a/heatclient/tests/unit/osc/v1/test_software_config.py b/heatclient/tests/unit/osc/v1/test_software_config.py
index 685a0a9..470de12 100644
--- a/heatclient/tests/unit/osc/v1/test_software_config.py
+++ b/heatclient/tests/unit/osc/v1/test_software_config.py
@@ -11,7 +11,8 @@
 #   under the License.
 #
 
-import mock
+from unittest import mock
+
 from osc_lib import exceptions as exc
 import yaml
 
diff --git a/heatclient/tests/unit/osc/v1/test_software_deployment.py b/heatclient/tests/unit/osc/v1/test_software_deployment.py
index 96ec84c..9edb6a9 100644
--- a/heatclient/tests/unit/osc/v1/test_software_deployment.py
+++ b/heatclient/tests/unit/osc/v1/test_software_deployment.py
@@ -12,8 +12,8 @@
 #
 
 import copy
+from unittest import mock
 
-import mock
 from osc_lib import exceptions as exc
 
 from heatclient import exc as heat_exc
diff --git a/heatclient/tests/unit/osc/v1/test_stack.py b/heatclient/tests/unit/osc/v1/test_stack.py
index d6a51b0..7af48ff 100644
--- a/heatclient/tests/unit/osc/v1/test_stack.py
+++ b/heatclient/tests/unit/osc/v1/test_stack.py
@@ -13,8 +13,8 @@
 
 import copy
 import io
+from unittest import mock
 
-import mock
 from osc_lib import exceptions as exc
 from osc_lib import utils
 import six
diff --git a/heatclient/tests/unit/osc/v1/test_stack_failures.py b/heatclient/tests/unit/osc/v1/test_stack_failures.py
index 1ecfbf5..9cb5650 100644
--- a/heatclient/tests/unit/osc/v1/test_stack_failures.py
+++ b/heatclient/tests/unit/osc/v1/test_stack_failures.py
@@ -14,7 +14,7 @@
 
 import collections
 
-import mock
+from unittest import mock
 
 from heatclient import exc
 from heatclient.osc.v1 import stack_failures
diff --git a/heatclient/tests/unit/osc/v1/test_template.py b/heatclient/tests/unit/osc/v1/test_template.py
index 3a85c99..0694510 100644
--- a/heatclient/tests/unit/osc/v1/test_template.py
+++ b/heatclient/tests/unit/osc/v1/test_template.py
@@ -12,7 +12,7 @@
 #
 #   Copyright 2015 IBM Corp.
 
-import mock
+from unittest import mock
 
 from heatclient import exc
 from heatclient.osc.v1 import template