diff --git a/kayobe/tests/unit/cli/test_commands.py b/kayobe/tests/unit/cli/test_commands.py
index 1242b17c9ecb49b7bf4710112ff1d023bfb63390..7a252050927dfe69b10c136257bb110e5750476c 100644
--- a/kayobe/tests/unit/cli/test_commands.py
+++ b/kayobe/tests/unit/cli/test_commands.py
@@ -13,10 +13,10 @@
 # under the License.
 
 import unittest
+from unittest import mock
 
 import cliff.app
 import cliff.commandmanager
-import mock
 
 from kayobe import ansible
 from kayobe.cli import commands
diff --git a/kayobe/tests/unit/test_ansible.py b/kayobe/tests/unit/test_ansible.py
index bb5540ca62f4b163de84fdded6c2d0805888b40b..bf60f04b5a0c2ed1c5ffa07d18446c74d8969312 100644
--- a/kayobe/tests/unit/test_ansible.py
+++ b/kayobe/tests/unit/test_ansible.py
@@ -19,8 +19,7 @@ import shutil
 import subprocess
 import tempfile
 import unittest
-
-import mock
+from unittest import mock
 
 from kayobe import ansible
 from kayobe import exception
diff --git a/kayobe/tests/unit/test_kolla_ansible.py b/kayobe/tests/unit/test_kolla_ansible.py
index ddc7174549d8127e5ad0985d4b2e55233218727d..f9f63101276da4274af10815027242eb974acd5f 100644
--- a/kayobe/tests/unit/test_kolla_ansible.py
+++ b/kayobe/tests/unit/test_kolla_ansible.py
@@ -16,8 +16,7 @@ import argparse
 import os
 import subprocess
 import unittest
-
-import mock
+from unittest import mock
 
 from kayobe import kolla_ansible
 from kayobe import utils
diff --git a/kayobe/tests/unit/test_utils.py b/kayobe/tests/unit/test_utils.py
index 02659987de56da5697a954b3a915b73d23264374..5767782147a30a955afebbd8d0345122e59d154a 100644
--- a/kayobe/tests/unit/test_utils.py
+++ b/kayobe/tests/unit/test_utils.py
@@ -15,8 +15,8 @@
 import os
 import subprocess
 import unittest
+from unittest import mock
 
-import mock
 import yaml
 
 from kayobe import utils
diff --git a/kayobe/tests/unit/test_vault.py b/kayobe/tests/unit/test_vault.py
index d4c8fd21e25931b95d43efda8318f728125f4896..a6d3fa778dc1b8d7b3bdd470711b5876f8eba27e 100644
--- a/kayobe/tests/unit/test_vault.py
+++ b/kayobe/tests/unit/test_vault.py
@@ -15,8 +15,7 @@
 import argparse
 import os
 import unittest
-
-import mock
+from unittest import mock
 
 from kayobe import utils
 from kayobe import vault
diff --git a/tools/sphinx8 b/tools/sphinx8
index 2813fd8cb6d7e05426793e57036d7689dd557b29..d67ed027799c10c9c3d1939446661fdc3f07a609 100755
--- a/tools/sphinx8
+++ b/tools/sphinx8
@@ -11,9 +11,9 @@ directives when any of the directives modules are imported.
 """
 
 import sys
+from unittest import mock
 
 import doc8.main
-import mock
 import sphinx.directives
 import sphinx.directives.code
 import sphinx.directives.patches