diff --git a/tripleo_ansible/tests/modules/test_metalsmith_instances.py b/tripleo_ansible/tests/modules/test_metalsmith_instances.py
index f805c2f3b..c1d7408b8 100644
--- a/tripleo_ansible/tests/modules/test_metalsmith_instances.py
+++ b/tripleo_ansible/tests/modules/test_metalsmith_instances.py
@@ -13,8 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
-
+from unittest import mock
 from tripleo_ansible.ansible_plugins.modules import metalsmith_instances as mi
 from tripleo_ansible.tests import base as tests_base
 
diff --git a/tripleo_ansible/tests/modules/test_tripleo_deploy_artifacts.py b/tripleo_ansible/tests/modules/test_tripleo_deploy_artifacts.py
index 1dd062146..f3ad51c3b 100644
--- a/tripleo_ansible/tests/modules/test_tripleo_deploy_artifacts.py
+++ b/tripleo_ansible/tests/modules/test_tripleo_deploy_artifacts.py
@@ -16,7 +16,7 @@
 from tripleo_ansible.ansible_plugins.modules import tripleo_deploy_artifacts
 from tripleo_ansible.tests import base as tests_base
 
-import mock
+from unittest import mock
 
 
 class TestTripleoDeployArtifacts(tests_base.TestCase):
diff --git a/tripleo_ansible/tests/modules/test_tripleo_diff_exec.py b/tripleo_ansible/tests/modules/test_tripleo_diff_exec.py
index 2a89985d0..9039d886c 100644
--- a/tripleo_ansible/tests/modules/test_tripleo_diff_exec.py
+++ b/tripleo_ansible/tests/modules/test_tripleo_diff_exec.py
@@ -15,8 +15,7 @@
 
 from tripleo_ansible.ansible_plugins.modules import tripleo_diff_exec
 from tripleo_ansible.tests import base as tests_base
-
-import mock
+from unittest import mock
 
 
 class TestTripleoDiffExec(tests_base.TestCase):
diff --git a/tripleo_ansible/tests/modules/test_tripleo_list_overclouds.py b/tripleo_ansible/tests/modules/test_tripleo_list_overclouds.py
index dddcdb8dd..f1af4e17f 100644
--- a/tripleo_ansible/tests/modules/test_tripleo_list_overclouds.py
+++ b/tripleo_ansible/tests/modules/test_tripleo_list_overclouds.py
@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from heatclient import exc as heat_exc
 
diff --git a/tripleo_ansible/tests/modules/test_tripleo_os_net_config_mappings.py b/tripleo_ansible/tests/modules/test_tripleo_os_net_config_mappings.py
index d6a051635..ae651dcf6 100644
--- a/tripleo_ansible/tests/modules/test_tripleo_os_net_config_mappings.py
+++ b/tripleo_ansible/tests/modules/test_tripleo_os_net_config_mappings.py
@@ -16,8 +16,7 @@
 from tripleo_ansible.ansible_plugins.modules import (
     tripleo_os_net_config_mappings)
 from tripleo_ansible.tests import base as tests_base
-
-import mock
+from unittest import mock
 
 
 @mock.patch('tripleo_ansible.ansible_plugins.modules.'
diff --git a/tripleo_ansible/tests/plugins/module_utils/test_baremetal_deploy.py b/tripleo_ansible/tests/plugins/module_utils/test_baremetal_deploy.py
index b75232449..e3274f0c5 100644
--- a/tripleo_ansible/tests/plugins/module_utils/test_baremetal_deploy.py
+++ b/tripleo_ansible/tests/plugins/module_utils/test_baremetal_deploy.py
@@ -14,7 +14,7 @@
 #    under the License.
 
 import metalsmith
-import mock
+from unittest import mock
 from openstack import exceptions as sdk_exc
 
 from tripleo_ansible.tests import base