diff --git a/test/unit/api_helper_test.py b/test/unit/api_helper_test.py
index 2d264fe31e5..4ce858f701f 100644
--- a/test/unit/api_helper_test.py
+++ b/test/unit/api_helper_test.py
@@ -1,5 +1,5 @@
 from pytest import raises
-from mock import patch
+from unittest.mock import patch
 from kiwi.api_helper import (
     obsolete,
     decommissioned
diff --git a/test/unit/archive/cpio_test.py b/test/unit/archive/cpio_test.py
index 05b5e6d562f..c8219cd7b0c 100644
--- a/test/unit/archive/cpio_test.py
+++ b/test/unit/archive/cpio_test.py
@@ -1,4 +1,4 @@
-from mock import patch
+from unittest.mock import patch
 
 from kiwi.archive.cpio import ArchiveCpio
 
diff --git a/test/unit/archive/tar_test.py b/test/unit/archive/tar_test.py
index f7812b44ef5..5e2c110ee51 100644
--- a/test/unit/archive/tar_test.py
+++ b/test/unit/archive/tar_test.py
@@ -1,8 +1,8 @@
-from mock import (
+from unittest.mock import (
     patch, call
 )
 from pytest import raises
-import mock
+import unittest.mock as mock
 
 from kiwi.archive.tar import ArchiveTar
 
diff --git a/test/unit/boot/image/base_test.py b/test/unit/boot/image/base_test.py
index 375b3b51ce6..9990b5672a4 100644
--- a/test/unit/boot/image/base_test.py
+++ b/test/unit/boot/image/base_test.py
@@ -1,6 +1,6 @@
 import io
 from collections import namedtuple
-from mock import (
+from unittest.mock import (
     patch, Mock, MagicMock
 )
 from pytest import raises
diff --git a/test/unit/boot/image/builtin_kiwi_test.py b/test/unit/boot/image/builtin_kiwi_test.py
index 0f124081196..705544ba82e 100644
--- a/test/unit/boot/image/builtin_kiwi_test.py
+++ b/test/unit/boot/image/builtin_kiwi_test.py
@@ -1,5 +1,5 @@
 import sys
-from mock import (
+from unittest.mock import (
     patch, call, Mock
 )
 from pytest import raises
diff --git a/test/unit/boot/image/dracut_test.py b/test/unit/boot/image/dracut_test.py
index 0ba6e082403..16dec193dd4 100644
--- a/test/unit/boot/image/dracut_test.py
+++ b/test/unit/boot/image/dracut_test.py
@@ -1,4 +1,4 @@
-from mock import (
+from unittest.mock import (
     patch, call, Mock
 )
 from collections import namedtuple
diff --git a/test/unit/boot/image/init_test.py b/test/unit/boot/image/init_test.py
index 51578a3004c..fa08b4cdee0 100644
--- a/test/unit/boot/image/init_test.py
+++ b/test/unit/boot/image/init_test.py
@@ -1,4 +1,4 @@
-from mock import (
+from unittest.mock import (
     Mock, patch
 )
 from pytest import raises
diff --git a/test/unit/bootloader/config/base_test.py b/test/unit/bootloader/config/base_test.py
index 0fd70370fab..4d69e62b2c4 100644
--- a/test/unit/bootloader/config/base_test.py
+++ b/test/unit/bootloader/config/base_test.py
@@ -1,5 +1,5 @@
 import logging
-from mock import (
+from unittest.mock import (
     patch, call, Mock, MagicMock
 )
 from pytest import (
diff --git a/test/unit/bootloader/config/bootloader_spec_base_test.py b/test/unit/bootloader/config/bootloader_spec_base_test.py
index 358882393c9..2223f297dfa 100644
--- a/test/unit/bootloader/config/bootloader_spec_base_test.py
+++ b/test/unit/bootloader/config/bootloader_spec_base_test.py
@@ -1,4 +1,4 @@
-from mock import (
+from unittest.mock import (
     patch, Mock
 )
 from pytest import (
diff --git a/test/unit/bootloader/config/custom_test.py b/test/unit/bootloader/config/custom_test.py
index 817157b0521..77acdb1d287 100644
--- a/test/unit/bootloader/config/custom_test.py
+++ b/test/unit/bootloader/config/custom_test.py
@@ -16,7 +16,7 @@
 # along with kiwi.  If not, see <http://www.gnu.org/licenses/>
 #
 from pytest import raises
-from mock import Mock
+from unittest.mock import Mock
 
 from kiwi.bootloader.config.custom import BootLoaderConfigCustom
 
diff --git a/test/unit/bootloader/config/grub2_test.py b/test/unit/bootloader/config/grub2_test.py
index 10b2a1e1876..dec3c5ff373 100644
--- a/test/unit/bootloader/config/grub2_test.py
+++ b/test/unit/bootloader/config/grub2_test.py
@@ -2,7 +2,7 @@
 import os
 import logging
 from collections import namedtuple
-from mock import (
+from unittest.mock import (
     patch, call, MagicMock, Mock
 )
 from pytest import (
diff --git a/test/unit/bootloader/config/init_test.py b/test/unit/bootloader/config/init_test.py
index 1b4bdb3fdcf..58b8637111e 100644
--- a/test/unit/bootloader/config/init_test.py
+++ b/test/unit/bootloader/config/init_test.py
@@ -1,4 +1,4 @@
-from mock import (
+from unittest.mock import (
     patch, Mock
 )
 from pytest import raises
diff --git a/test/unit/bootloader/config/systemd_boot_test.py b/test/unit/bootloader/config/systemd_boot_test.py
index 465efcf9df0..fea0247ed2c 100644
--- a/test/unit/bootloader/config/systemd_boot_test.py
+++ b/test/unit/bootloader/config/systemd_boot_test.py
@@ -1,6 +1,6 @@
 import io
 from pytest import raises
-from mock import (
+from unittest.mock import (
     Mock, patch, call, MagicMock
 )
 from kiwi.bootloader.config.systemd_boot import BootLoaderSystemdBoot
diff --git a/test/unit/bootloader/install/base_test.py b/test/unit/bootloader/install/base_test.py
index ed97b6b6e90..626181ca314 100644
--- a/test/unit/bootloader/install/base_test.py
+++ b/test/unit/bootloader/install/base_test.py
@@ -1,4 +1,4 @@
-from mock import Mock
+from unittest.mock import Mock
 from pytest import raises
 
 from kiwi.bootloader.install.base import BootLoaderInstallBase
diff --git a/test/unit/bootloader/install/grub2_test.py b/test/unit/bootloader/install/grub2_test.py
index e709de515ec..bef3992fae6 100644
--- a/test/unit/bootloader/install/grub2_test.py
+++ b/test/unit/bootloader/install/grub2_test.py
@@ -1,9 +1,9 @@
 import io
-from mock import (
+from unittest.mock import (
     patch, call, MagicMock
 )
 from pytest import raises
-import mock
+import unittest.mock as mock
 
 from kiwi.bootloader.install.grub2 import BootLoaderInstallGrub2
 from kiwi.defaults import Defaults
diff --git a/test/unit/bootloader/install/init_test.py b/test/unit/bootloader/install/init_test.py
index 55842c5e4e6..0b727dee57f 100644
--- a/test/unit/bootloader/install/init_test.py
+++ b/test/unit/bootloader/install/init_test.py
@@ -1,4 +1,4 @@
-from mock import (
+from unittest.mock import (
     patch, Mock
 )
 from pytest import raises
diff --git a/test/unit/bootloader/install/systemd_boot_test.py b/test/unit/bootloader/install/systemd_boot_test.py
index be9ae1aeba4..61845667fa0 100644
--- a/test/unit/bootloader/install/systemd_boot_test.py
+++ b/test/unit/bootloader/install/systemd_boot_test.py
@@ -1,4 +1,4 @@
-from mock import Mock
+from unittest.mock import Mock
 from pytest import raises
 
 from kiwi.bootloader.install.systemd_boot import BootLoaderInstallSystemdBoot
diff --git a/test/unit/builder/archive_test.py b/test/unit/builder/archive_test.py
index 70ab5f8ce62..19ae672e084 100644
--- a/test/unit/builder/archive_test.py
+++ b/test/unit/builder/archive_test.py
@@ -1,7 +1,7 @@
-from mock import patch
+from unittest.mock import patch
 from pytest import raises
 import sys
-import mock
+import unittest.mock as mock
 import kiwi
 
 from ..test_helper import argv_kiwi_tests
diff --git a/test/unit/builder/container_test.py b/test/unit/builder/container_test.py
index cc31dfeb4db..c93c2470b6c 100644
--- a/test/unit/builder/container_test.py
+++ b/test/unit/builder/container_test.py
@@ -1,8 +1,8 @@
-from mock import (
+from unittest.mock import (
     patch, call, mock_open
 )
 from pytest import raises
-import mock
+import unittest.mock as mock
 import kiwi
 
 from kiwi.defaults import Defaults
diff --git a/test/unit/builder/disk_test.py b/test/unit/builder/disk_test.py
index 0fa4867b32e..773d0e6ee42 100644
--- a/test/unit/builder/disk_test.py
+++ b/test/unit/builder/disk_test.py
@@ -1,6 +1,6 @@
 import logging
 import sys
-from mock import (
+from unittest.mock import (
     call, patch, mock_open, Mock, MagicMock, ANY
 )
 from pytest import (
diff --git a/test/unit/builder/filesystem_test.py b/test/unit/builder/filesystem_test.py
index dd4391d73f3..9a668141981 100644
--- a/test/unit/builder/filesystem_test.py
+++ b/test/unit/builder/filesystem_test.py
@@ -1,5 +1,5 @@
 import sys
-from mock import (
+from unittest.mock import (
     patch, Mock
 )
 from pytest import raises
diff --git a/test/unit/builder/init_test.py b/test/unit/builder/init_test.py
index bfced06814e..c70450d6928 100644
--- a/test/unit/builder/init_test.py
+++ b/test/unit/builder/init_test.py
@@ -1,4 +1,4 @@
-from mock import (
+from unittest.mock import (
     patch, Mock
 )
 from pytest import raises
diff --git a/test/unit/builder/install_test.py b/test/unit/builder/install_test.py
index 69b5e50a709..1d66a8b937a 100644
--- a/test/unit/builder/install_test.py
+++ b/test/unit/builder/install_test.py
@@ -1,8 +1,8 @@
-from mock import (
+from unittest.mock import (
     MagicMock, patch, call, mock_open, ANY, Mock
 )
 from pytest import raises
-import mock
+import unittest.mock as mock
 import kiwi.builder.install
 
 from collections import namedtuple
diff --git a/test/unit/builder/kis_test.py b/test/unit/builder/kis_test.py
index f61541f7016..28a164fc180 100644
--- a/test/unit/builder/kis_test.py
+++ b/test/unit/builder/kis_test.py
@@ -1,6 +1,6 @@
 import logging
 from collections import namedtuple
-from mock import (
+from unittest.mock import (
     patch, Mock, MagicMock, mock_open
 )
 from pytest import (
diff --git a/test/unit/builder/live_test.py b/test/unit/builder/live_test.py
index 2004ff93393..9582a99b1f7 100644
--- a/test/unit/builder/live_test.py
+++ b/test/unit/builder/live_test.py
@@ -1,4 +1,4 @@
-from mock import (
+from unittest.mock import (
     MagicMock, patch, call, Mock
 )
 from pytest import raises, mark
diff --git a/test/unit/cli_test.py b/test/unit/cli_test.py
index 58e606fb743..b915d6ed46d 100644
--- a/test/unit/cli_test.py
+++ b/test/unit/cli_test.py
@@ -1,6 +1,6 @@
 import sys
 import logging
-from mock import patch
+from unittest.mock import patch
 from pytest import (
     raises, fixture
 )
diff --git a/test/unit/command_process_test.py b/test/unit/command_process_test.py
index 9902776edfc..364363cc93c 100644
--- a/test/unit/command_process_test.py
+++ b/test/unit/command_process_test.py
@@ -1,6 +1,6 @@
-import mock
+import unittest.mock as mock
 import logging
-from mock import patch
+from unittest.mock import patch
 from pytest import (
     raises, fixture
 )
diff --git a/test/unit/command_test.py b/test/unit/command_test.py
index 3fab722f314..5b485c164d7 100644
--- a/test/unit/command_test.py
+++ b/test/unit/command_test.py
@@ -1,7 +1,7 @@
-from mock import patch
+from unittest.mock import patch
 from collections import namedtuple
 from pytest import raises
-import mock
+import unittest.mock as mock
 import os
 
 from kiwi.command import Command
diff --git a/test/unit/container/appx_test.py b/test/unit/container/appx_test.py
index 356ccc5fb1f..cf79ee0aeb3 100644
--- a/test/unit/container/appx_test.py
+++ b/test/unit/container/appx_test.py
@@ -1,6 +1,6 @@
 import io
 from pytest import raises
-from mock import (
+from unittest.mock import (
     patch, Mock, MagicMock, call
 )
 
diff --git a/test/unit/container/init_test.py b/test/unit/container/init_test.py
index 04eebbc89db..0ad4acec99a 100644
--- a/test/unit/container/init_test.py
+++ b/test/unit/container/init_test.py
@@ -1,4 +1,4 @@
-from mock import patch
+from unittest.mock import patch
 from pytest import raises
 
 from kiwi.container import ContainerImage
diff --git a/test/unit/container/oci_test.py b/test/unit/container/oci_test.py
index 6c0aeb063ff..5fc4ad47f54 100644
--- a/test/unit/container/oci_test.py
+++ b/test/unit/container/oci_test.py
@@ -1,6 +1,6 @@
 import logging
 from pytest import fixture
-from mock import (
+from unittest.mock import (
     patch, mock_open, Mock
 )
 
diff --git a/test/unit/container/setup/appx_test.py b/test/unit/container/setup/appx_test.py
index 354d17de000..e6872f612e2 100644
--- a/test/unit/container/setup/appx_test.py
+++ b/test/unit/container/setup/appx_test.py
@@ -1,6 +1,6 @@
 import io
 from pytest import raises
-from mock import (
+from unittest.mock import (
     patch, MagicMock
 )
 
diff --git a/test/unit/container/setup/base_test.py b/test/unit/container/setup/base_test.py
index d1741c9dbba..c6864fdf07f 100644
--- a/test/unit/container/setup/base_test.py
+++ b/test/unit/container/setup/base_test.py
@@ -1,4 +1,4 @@
-from mock import (
+from unittest.mock import (
     patch, call, mock_open
 )
 from pytest import raises
diff --git a/test/unit/container/setup/docker_test.py b/test/unit/container/setup/docker_test.py
index 71f4e43140a..17bbc059361 100644
--- a/test/unit/container/setup/docker_test.py
+++ b/test/unit/container/setup/docker_test.py
@@ -1,4 +1,4 @@
-from mock import patch
+from unittest.mock import patch
 
 from kiwi.container.setup.docker import ContainerSetupDocker
 
diff --git a/test/unit/container/setup/init_test.py b/test/unit/container/setup/init_test.py
index a57caca6d13..38d9871e0a1 100644
--- a/test/unit/container/setup/init_test.py
+++ b/test/unit/container/setup/init_test.py
@@ -1,4 +1,4 @@
-from mock import patch
+from unittest.mock import patch
 from pytest import raises
 
 from kiwi.container.setup import ContainerSetup
diff --git a/test/unit/container/setup/oci_test.py b/test/unit/container/setup/oci_test.py
index 59a1496a29b..48dc49b173f 100644
--- a/test/unit/container/setup/oci_test.py
+++ b/test/unit/container/setup/oci_test.py
@@ -1,6 +1,6 @@
-from mock import patch
-from mock import call
-import mock
+from unittest.mock import patch
+from unittest.mock import call
+import unittest.mock as mock
 
 from kiwi.container.setup.oci import ContainerSetupOCI
 
diff --git a/test/unit/defaults_test.py b/test/unit/defaults_test.py
index 7777c030808..79e7fa49068 100644
--- a/test/unit/defaults_test.py
+++ b/test/unit/defaults_test.py
@@ -1,8 +1,8 @@
 import logging
-from mock import patch
+from unittest.mock import patch
 
 import sys
-from mock import MagicMock
+from unittest.mock import MagicMock
 from pytest import fixture
 
 from .test_helper import argv_kiwi_tests
diff --git a/test/unit/filesystem/base_test.py b/test/unit/filesystem/base_test.py
index 3f1698a8ea6..70a05b899f6 100644
--- a/test/unit/filesystem/base_test.py
+++ b/test/unit/filesystem/base_test.py
@@ -1,5 +1,5 @@
 import logging
-from mock import (
+from unittest.mock import (
     patch, Mock
 )
 from pytest import (
diff --git a/test/unit/filesystem/btrfs_test.py b/test/unit/filesystem/btrfs_test.py
index 2bbbc0f8065..2adcc7dc5ae 100644
--- a/test/unit/filesystem/btrfs_test.py
+++ b/test/unit/filesystem/btrfs_test.py
@@ -1,6 +1,6 @@
-from mock import patch
+from unittest.mock import patch
 
-import mock
+import unittest.mock as mock
 
 from kiwi.filesystem.btrfs import FileSystemBtrfs
 
diff --git a/test/unit/filesystem/ext2_test.py b/test/unit/filesystem/ext2_test.py
index c1430aa0d1b..a24157a67df 100644
--- a/test/unit/filesystem/ext2_test.py
+++ b/test/unit/filesystem/ext2_test.py
@@ -1,8 +1,8 @@
-from mock import (
+from unittest.mock import (
     patch, call
 )
 
-import mock
+import unittest.mock as mock
 
 from kiwi.filesystem.ext2 import FileSystemExt2
 
diff --git a/test/unit/filesystem/ext3_test.py b/test/unit/filesystem/ext3_test.py
index 9a86296390b..b9e637467a6 100644
--- a/test/unit/filesystem/ext3_test.py
+++ b/test/unit/filesystem/ext3_test.py
@@ -1,8 +1,8 @@
-from mock import (
+from unittest.mock import (
     patch, call
 )
 
-import mock
+import unittest.mock as mock
 
 from kiwi.filesystem.ext3 import FileSystemExt3
 
diff --git a/test/unit/filesystem/ext4_test.py b/test/unit/filesystem/ext4_test.py
index 3f801a46d5a..0c0e1b90819 100644
--- a/test/unit/filesystem/ext4_test.py
+++ b/test/unit/filesystem/ext4_test.py
@@ -1,8 +1,8 @@
-from mock import (
+from unittest.mock import (
     patch, call
 )
 
-import mock
+import unittest.mock as mock
 
 from kiwi.filesystem.ext4 import FileSystemExt4
 
diff --git a/test/unit/filesystem/fat16_test.py b/test/unit/filesystem/fat16_test.py
index 24fff3cf5ae..1f16330a1a4 100644
--- a/test/unit/filesystem/fat16_test.py
+++ b/test/unit/filesystem/fat16_test.py
@@ -1,6 +1,6 @@
-from mock import patch
+from unittest.mock import patch
 
-import mock
+import unittest.mock as mock
 
 from kiwi.filesystem.fat16 import FileSystemFat16
 
diff --git a/test/unit/filesystem/fat32_test.py b/test/unit/filesystem/fat32_test.py
index 9de526ceb05..216d98ac1f1 100644
--- a/test/unit/filesystem/fat32_test.py
+++ b/test/unit/filesystem/fat32_test.py
@@ -1,6 +1,6 @@
-from mock import patch
+from unittest.mock import patch
 
-import mock
+import unittest.mock as mock
 
 from kiwi.filesystem.fat32 import FileSystemFat32
 
diff --git a/test/unit/filesystem/init_test.py b/test/unit/filesystem/init_test.py
index 460fd91dda8..56aceb3f749 100644
--- a/test/unit/filesystem/init_test.py
+++ b/test/unit/filesystem/init_test.py
@@ -1,6 +1,6 @@
-from mock import patch
+from unittest.mock import patch
 from pytest import raises
-from mock import Mock
+from unittest.mock import Mock
 
 from kiwi.filesystem import FileSystem
 
diff --git a/test/unit/filesystem/isofs_test.py b/test/unit/filesystem/isofs_test.py
index 2b549a09f5a..6eef15435a2 100644
--- a/test/unit/filesystem/isofs_test.py
+++ b/test/unit/filesystem/isofs_test.py
@@ -1,7 +1,7 @@
 import logging
 from pytest import fixture
-from mock import patch
-import mock
+from unittest.mock import patch
+import unittest.mock as mock
 
 from kiwi.filesystem.isofs import FileSystemIsoFs
 
diff --git a/test/unit/filesystem/setup_test.py b/test/unit/filesystem/setup_test.py
index e79486fcd6f..c0f7cd726df 100644
--- a/test/unit/filesystem/setup_test.py
+++ b/test/unit/filesystem/setup_test.py
@@ -1,7 +1,7 @@
 import logging
-from mock import patch
+from unittest.mock import patch
 from pytest import fixture
-import mock
+import unittest.mock as mock
 
 from kiwi.filesystem.setup import FileSystemSetup
 
diff --git a/test/unit/filesystem/squashfs_test.py b/test/unit/filesystem/squashfs_test.py
index f74ba98c19c..9d383569c1d 100644
--- a/test/unit/filesystem/squashfs_test.py
+++ b/test/unit/filesystem/squashfs_test.py
@@ -1,6 +1,6 @@
-from mock import patch
+from unittest.mock import patch
 
-import mock
+import unittest.mock as mock
 
 from kiwi.defaults import Defaults
 from kiwi.filesystem.squashfs import FileSystemSquashFs
diff --git a/test/unit/filesystem/swap_test.py b/test/unit/filesystem/swap_test.py
index 1698e184128..1f157dcaf94 100644
--- a/test/unit/filesystem/swap_test.py
+++ b/test/unit/filesystem/swap_test.py
@@ -1,6 +1,6 @@
-from mock import patch
+from unittest.mock import patch
 
-import mock
+import unittest.mock as mock
 
 from kiwi.filesystem.swap import FileSystemSwap
 
diff --git a/test/unit/filesystem/xfs_test.py b/test/unit/filesystem/xfs_test.py
index 17db0d46b2a..da31453234e 100644
--- a/test/unit/filesystem/xfs_test.py
+++ b/test/unit/filesystem/xfs_test.py
@@ -1,8 +1,8 @@
-from mock import (
+from unittest.mock import (
     patch, call
 )
 
-import mock
+import unittest.mock as mock
 
 from kiwi.filesystem.xfs import FileSystemXfs
 
diff --git a/test/unit/firmware_test.py b/test/unit/firmware_test.py
index 7b7e932aadd..ffa40de7ea0 100644
--- a/test/unit/firmware_test.py
+++ b/test/unit/firmware_test.py
@@ -1,5 +1,5 @@
 from pytest import raises
-import mock
+import unittest.mock as mock
 
 from kiwi.firmware import FirmWare
 from kiwi.defaults import Defaults
diff --git a/test/unit/help_test.py b/test/unit/help_test.py
index 632ad1dac3c..f59f51a5435 100644
--- a/test/unit/help_test.py
+++ b/test/unit/help_test.py
@@ -1,4 +1,4 @@
-from mock import patch
+from unittest.mock import patch
 from pytest import raises
 
 from kiwi.help import Help
diff --git a/test/unit/iso_tools/base_test.py b/test/unit/iso_tools/base_test.py
index f81a2452cc6..9795781edc8 100644
--- a/test/unit/iso_tools/base_test.py
+++ b/test/unit/iso_tools/base_test.py
@@ -1,4 +1,4 @@
-from mock import (
+from unittest.mock import (
     patch, Mock, call
 )
 from pytest import raises
diff --git a/test/unit/iso_tools/init_test.py b/test/unit/iso_tools/init_test.py
index e7e818ea1a0..993505ef37a 100644
--- a/test/unit/iso_tools/init_test.py
+++ b/test/unit/iso_tools/init_test.py
@@ -1,6 +1,6 @@
 from pytest import raises
-from mock import patch
-import mock
+from unittest.mock import patch
+import unittest.mock as mock
 
 from kiwi.iso_tools import IsoTools
 from kiwi.exceptions import KiwiIsoToolError
diff --git a/test/unit/iso_tools/iso_test.py b/test/unit/iso_tools/iso_test.py
index eeda7fcc7e0..d3119dbed67 100644
--- a/test/unit/iso_tools/iso_test.py
+++ b/test/unit/iso_tools/iso_test.py
@@ -1,4 +1,4 @@
-from mock import patch
+from unittest.mock import patch
 
 from kiwi.defaults import Defaults
 from kiwi.iso_tools.iso import Iso
diff --git a/test/unit/iso_tools/xorriso_test.py b/test/unit/iso_tools/xorriso_test.py
index 9c55d448e50..eb923034971 100644
--- a/test/unit/iso_tools/xorriso_test.py
+++ b/test/unit/iso_tools/xorriso_test.py
@@ -1,5 +1,5 @@
 import logging
-from mock import patch
+from unittest.mock import patch
 from pytest import (
     raises, fixture
 )
diff --git a/test/unit/kiwi_compat_test.py b/test/unit/kiwi_compat_test.py
index 72ddf0f8fac..988831961a1 100644
--- a/test/unit/kiwi_compat_test.py
+++ b/test/unit/kiwi_compat_test.py
@@ -1,6 +1,6 @@
 import sys
 
-from mock import patch
+from unittest.mock import patch
 
 from .test_helper import argv_kiwi_tests
 
diff --git a/test/unit/logger_color_formatter_test.py b/test/unit/logger_color_formatter_test.py
index 0fa245e4fac..14f30b7b01c 100644
--- a/test/unit/logger_color_formatter_test.py
+++ b/test/unit/logger_color_formatter_test.py
@@ -1,4 +1,4 @@
-from mock import patch
+from unittest.mock import patch
 from collections import namedtuple
 
 from kiwi.logger_color_formatter import ColorFormatter
diff --git a/test/unit/logger_socket_test.py b/test/unit/logger_socket_test.py
index 0087b4be102..f63a7d96868 100644
--- a/test/unit/logger_socket_test.py
+++ b/test/unit/logger_socket_test.py
@@ -1,4 +1,4 @@
-from mock import Mock
+from unittest.mock import Mock
 from kiwi.logger_socket import PlainTextSocketHandler
 
 
diff --git a/test/unit/logger_test.py b/test/unit/logger_test.py
index b6091b98eb0..d363d29dbbd 100644
--- a/test/unit/logger_test.py
+++ b/test/unit/logger_test.py
@@ -1,5 +1,5 @@
 import sys
-from mock import (
+from unittest.mock import (
     patch, call
 )
 from pytest import raises
diff --git a/test/unit/markup/any_test.py b/test/unit/markup/any_test.py
index f040de090d5..95d96369c2c 100644
--- a/test/unit/markup/any_test.py
+++ b/test/unit/markup/any_test.py
@@ -1,4 +1,4 @@
-from mock import patch
+from unittest.mock import patch
 from pytest import raises
 
 from kiwi.markup.any import MarkupAny
diff --git a/test/unit/markup/base_test.py b/test/unit/markup/base_test.py
index 638cb265465..e63e3f94550 100644
--- a/test/unit/markup/base_test.py
+++ b/test/unit/markup/base_test.py
@@ -1,5 +1,5 @@
 from lxml import etree
-from mock import patch
+from unittest.mock import patch
 from pytest import raises
 
 from kiwi.markup.base import MarkupBase
diff --git a/test/unit/markup/markup_test.py b/test/unit/markup/markup_test.py
index 7dec35a6c5c..31012ab08db 100644
--- a/test/unit/markup/markup_test.py
+++ b/test/unit/markup/markup_test.py
@@ -1,4 +1,4 @@
-from mock import patch
+from unittest.mock import patch
 
 from kiwi.markup import Markup
 
diff --git a/test/unit/mount_manager_test.py b/test/unit/mount_manager_test.py
index c3eb28b4a72..8e1a8faf064 100644
--- a/test/unit/mount_manager_test.py
+++ b/test/unit/mount_manager_test.py
@@ -3,7 +3,7 @@
 from pytest import (
     fixture, raises
 )
-from mock import (
+from unittest.mock import (
     patch, call, Mock
 )
 from kiwi.exceptions import KiwiCommandError, KiwiUmountBusyError
diff --git a/test/unit/oci_tools/base_test.py b/test/unit/oci_tools/base_test.py
index f59043212f7..a9438ed33fc 100644
--- a/test/unit/oci_tools/base_test.py
+++ b/test/unit/oci_tools/base_test.py
@@ -1,5 +1,5 @@
 from pytest import raises
-from mock import patch
+from unittest.mock import patch
 
 from kiwi.oci_tools.base import OCIBase
 
diff --git a/test/unit/oci_tools/buildah_test.py b/test/unit/oci_tools/buildah_test.py
index 564171a7792..00cf41156ea 100644
--- a/test/unit/oci_tools/buildah_test.py
+++ b/test/unit/oci_tools/buildah_test.py
@@ -1,5 +1,5 @@
 import logging
-from mock import (
+from unittest.mock import (
     Mock, patch, call
 )
 from pytest import (
diff --git a/test/unit/oci_tools/init_test.py b/test/unit/oci_tools/init_test.py
index fd5908150e2..6d500b1248f 100644
--- a/test/unit/oci_tools/init_test.py
+++ b/test/unit/oci_tools/init_test.py
@@ -1,5 +1,5 @@
 from pytest import raises
-from mock import (
+from unittest.mock import (
     patch, Mock
 )
 
diff --git a/test/unit/oci_tools/umoci_test.py b/test/unit/oci_tools/umoci_test.py
index 198706dc283..d4fd49e2d78 100644
--- a/test/unit/oci_tools/umoci_test.py
+++ b/test/unit/oci_tools/umoci_test.py
@@ -1,4 +1,4 @@
-from mock import (
+from unittest.mock import (
     Mock, patch, call
 )
 
diff --git a/test/unit/package_manager/apt_test.py b/test/unit/package_manager/apt_test.py
index c4d6be2bfa8..ad95343bfd5 100644
--- a/test/unit/package_manager/apt_test.py
+++ b/test/unit/package_manager/apt_test.py
@@ -1,5 +1,5 @@
 import logging
-from mock import (
+from unittest.mock import (
     patch, call, Mock
 )
 from pytest import (
diff --git a/test/unit/package_manager/base_test.py b/test/unit/package_manager/base_test.py
index 6bd07f6846f..850fe525f4e 100644
--- a/test/unit/package_manager/base_test.py
+++ b/test/unit/package_manager/base_test.py
@@ -1,4 +1,4 @@
-import mock
+import unittest.mock as mock
 from pytest import raises
 
 from kiwi.package_manager.base import PackageManagerBase
diff --git a/test/unit/package_manager/dnf4_test.py b/test/unit/package_manager/dnf4_test.py
index f0a5798bceb..c5564c03577 100644
--- a/test/unit/package_manager/dnf4_test.py
+++ b/test/unit/package_manager/dnf4_test.py
@@ -1,8 +1,8 @@
-from mock import (
+from unittest.mock import (
     patch, call
 )
 from pytest import raises
-import mock
+import unittest.mock as mock
 
 from kiwi.package_manager.dnf4 import PackageManagerDnf4
 
diff --git a/test/unit/package_manager/dnf5_test.py b/test/unit/package_manager/dnf5_test.py
index a62d55c6956..673b198fd8e 100644
--- a/test/unit/package_manager/dnf5_test.py
+++ b/test/unit/package_manager/dnf5_test.py
@@ -1,8 +1,8 @@
-from mock import (
+from unittest.mock import (
     patch, call
 )
 from pytest import raises
-import mock
+import unittest.mock as mock
 
 from kiwi.package_manager.dnf5 import PackageManagerDnf5
 
diff --git a/test/unit/package_manager/init_test.py b/test/unit/package_manager/init_test.py
index f8f642ec7cc..da2e26597f2 100644
--- a/test/unit/package_manager/init_test.py
+++ b/test/unit/package_manager/init_test.py
@@ -1,4 +1,4 @@
-from mock import (
+from unittest.mock import (
     patch, Mock
 )
 from pytest import raises
diff --git a/test/unit/package_manager/microdnf_test.py b/test/unit/package_manager/microdnf_test.py
index b79420fd81f..435a7d9307c 100644
--- a/test/unit/package_manager/microdnf_test.py
+++ b/test/unit/package_manager/microdnf_test.py
@@ -1,8 +1,8 @@
-from mock import (
+from unittest.mock import (
     patch, call
 )
 from pytest import raises
-import mock
+import unittest.mock as mock
 
 from kiwi.package_manager.microdnf import PackageManagerMicroDnf
 
diff --git a/test/unit/package_manager/pacman_test.py b/test/unit/package_manager/pacman_test.py
index 63ed42b9ae5..1875f7ab5b9 100644
--- a/test/unit/package_manager/pacman_test.py
+++ b/test/unit/package_manager/pacman_test.py
@@ -1,8 +1,8 @@
-from mock import patch, call
+from unittest.mock import patch, call
 from pytest import (
     raises, fixture
 )
-import mock
+import unittest.mock as mock
 
 from kiwi.package_manager.pacman import PackageManagerPacman
 
diff --git a/test/unit/package_manager/zypper_test.py b/test/unit/package_manager/zypper_test.py
index 1a8f2ff3175..66f9ee6ba4f 100644
--- a/test/unit/package_manager/zypper_test.py
+++ b/test/unit/package_manager/zypper_test.py
@@ -1,6 +1,6 @@
-from mock import patch
+from unittest.mock import patch
 from pytest import raises
-import mock
+import unittest.mock as mock
 
 from kiwi.path import Path
 from kiwi.package_manager.zypper import PackageManagerZypper
diff --git a/test/unit/partitioner/base_test.py b/test/unit/partitioner/base_test.py
index 42ee377c91f..f07b836b2c8 100644
--- a/test/unit/partitioner/base_test.py
+++ b/test/unit/partitioner/base_test.py
@@ -1,4 +1,4 @@
-from mock import Mock
+from unittest.mock import Mock
 from pytest import raises
 
 from kiwi.partitioner.base import PartitionerBase
diff --git a/test/unit/partitioner/dasd_test.py b/test/unit/partitioner/dasd_test.py
index 745573fe54f..9342291ad81 100644
--- a/test/unit/partitioner/dasd_test.py
+++ b/test/unit/partitioner/dasd_test.py
@@ -1,10 +1,10 @@
 import logging
 from pytest import fixture
-from mock import (
+from unittest.mock import (
     patch, mock_open
 )
 
-import mock
+import unittest.mock as mock
 
 from kiwi.partitioner.dasd import PartitionerDasd
 
diff --git a/test/unit/partitioner/gpt_test.py b/test/unit/partitioner/gpt_test.py
index 723d04c18eb..af6acabef3b 100644
--- a/test/unit/partitioner/gpt_test.py
+++ b/test/unit/partitioner/gpt_test.py
@@ -1,5 +1,5 @@
 import logging
-from mock import (
+from unittest.mock import (
     patch, call, Mock
 )
 from pytest import (
diff --git a/test/unit/partitioner/init_test.py b/test/unit/partitioner/init_test.py
index 07f482d09c1..9a4b2133c22 100644
--- a/test/unit/partitioner/init_test.py
+++ b/test/unit/partitioner/init_test.py
@@ -1,5 +1,5 @@
 import logging
-from mock import (
+from unittest.mock import (
     patch, Mock
 )
 from pytest import (
diff --git a/test/unit/partitioner/msdos_test.py b/test/unit/partitioner/msdos_test.py
index d0f7cf52ba1..ada47684619 100644
--- a/test/unit/partitioner/msdos_test.py
+++ b/test/unit/partitioner/msdos_test.py
@@ -1,5 +1,5 @@
 import logging
-from mock import (
+from unittest.mock import (
     patch, call, mock_open, Mock
 )
 from pytest import (
diff --git a/test/unit/path_test.py b/test/unit/path_test.py
index 1ba3c8d6f1b..dbd04bddb3b 100644
--- a/test/unit/path_test.py
+++ b/test/unit/path_test.py
@@ -1,5 +1,5 @@
 import logging
-from mock import patch, call
+from unittest.mock import patch, call
 from pytest import (
     raises, fixture
 )
diff --git a/test/unit/privileges_test.py b/test/unit/privileges_test.py
index 15b777fed7e..3f2c1f93b2e 100644
--- a/test/unit/privileges_test.py
+++ b/test/unit/privileges_test.py
@@ -1,4 +1,4 @@
-from mock import patch
+from unittest.mock import patch
 from pytest import raises
 
 from kiwi.privileges import Privileges
diff --git a/test/unit/repository/apt_test.py b/test/unit/repository/apt_test.py
index 4f81823e736..053344922b1 100644
--- a/test/unit/repository/apt_test.py
+++ b/test/unit/repository/apt_test.py
@@ -1,8 +1,8 @@
-from mock import (
+from unittest.mock import (
     patch, call, MagicMock
 )
 import io
-import mock
+import unittest.mock as mock
 
 from kiwi.repository.apt import RepositoryApt
 
diff --git a/test/unit/repository/base_test.py b/test/unit/repository/base_test.py
index 5924c255dde..6bf3316e81e 100644
--- a/test/unit/repository/base_test.py
+++ b/test/unit/repository/base_test.py
@@ -1,4 +1,4 @@
-import mock
+import unittest.mock as mock
 from pytest import raises
 
 from kiwi.repository.base import RepositoryBase
diff --git a/test/unit/repository/dnf4_test.py b/test/unit/repository/dnf4_test.py
index ecc0674a191..64f3113f773 100644
--- a/test/unit/repository/dnf4_test.py
+++ b/test/unit/repository/dnf4_test.py
@@ -1,8 +1,8 @@
 from pytest import fixture
-from mock import (
+from unittest.mock import (
     patch, call, mock_open
 )
-import mock
+import unittest.mock as mock
 
 from kiwi.repository.dnf4 import RepositoryDnf4
 
diff --git a/test/unit/repository/dnf5_test.py b/test/unit/repository/dnf5_test.py
index 263ff4a9cc4..ec4720f6849 100644
--- a/test/unit/repository/dnf5_test.py
+++ b/test/unit/repository/dnf5_test.py
@@ -1,8 +1,8 @@
 from pytest import fixture
-from mock import (
+from unittest.mock import (
     patch, call, mock_open
 )
-import mock
+import unittest.mock as mock
 
 from kiwi.repository.dnf5 import RepositoryDnf5
 
diff --git a/test/unit/repository/init_test.py b/test/unit/repository/init_test.py
index e14f1fe1781..af4cecbdb59 100644
--- a/test/unit/repository/init_test.py
+++ b/test/unit/repository/init_test.py
@@ -1,6 +1,6 @@
-from mock import patch
+from unittest.mock import patch
 from pytest import raises
-import mock
+import unittest.mock as mock
 
 from kiwi.repository import Repository
 from kiwi.exceptions import KiwiRepositorySetupError
diff --git a/test/unit/repository/pacman_test.py b/test/unit/repository/pacman_test.py
index 30486cb3d2a..05bd5bff4a0 100644
--- a/test/unit/repository/pacman_test.py
+++ b/test/unit/repository/pacman_test.py
@@ -1,5 +1,5 @@
 
-from mock import (
+from unittest.mock import (
     patch, Mock, call, mock_open
 )
 
diff --git a/test/unit/repository/zypper_test.py b/test/unit/repository/zypper_test.py
index 105b2248808..70274d3df5f 100644
--- a/test/unit/repository/zypper_test.py
+++ b/test/unit/repository/zypper_test.py
@@ -1,9 +1,9 @@
 from pytest import raises
-from mock import (
+from unittest.mock import (
     patch, call, MagicMock
 )
 import io
-import mock
+import unittest.mock as mock
 import os
 
 from kiwi.defaults import Defaults
diff --git a/test/unit/runtime_checker_test.py b/test/unit/runtime_checker_test.py
index 547c667f364..4865c831e1b 100644
--- a/test/unit/runtime_checker_test.py
+++ b/test/unit/runtime_checker_test.py
@@ -1,6 +1,6 @@
 import sys
 import logging
-from mock import (
+from unittest.mock import (
     patch, Mock
 )
 from pytest import (
diff --git a/test/unit/runtime_config_test.py b/test/unit/runtime_config_test.py
index 6f7d213d8e8..8de4a5345aa 100644
--- a/test/unit/runtime_config_test.py
+++ b/test/unit/runtime_config_test.py
@@ -1,5 +1,5 @@
 import logging
-from mock import patch
+from unittest.mock import patch
 from pytest import (
     raises, fixture
 )
diff --git a/test/unit/shell_test.py b/test/unit/shell_test.py
index e219299cfd2..983afe0fe51 100644
--- a/test/unit/shell_test.py
+++ b/test/unit/shell_test.py
@@ -1,4 +1,4 @@
-from mock import patch
+from unittest.mock import patch
 
 from kiwi.system.shell import Shell
 
diff --git a/test/unit/solver/repository/base_test.py b/test/unit/solver/repository/base_test.py
index dff2739c2e7..f2358c8c025 100644
--- a/test/unit/solver/repository/base_test.py
+++ b/test/unit/solver/repository/base_test.py
@@ -1,10 +1,10 @@
 import io
-from mock import (
+from unittest.mock import (
     patch, call, mock_open, MagicMock, Mock
 )
 from pytest import raises
 import os
-import mock
+import unittest.mock as mock
 
 from lxml import etree
 
diff --git a/test/unit/solver/repository/deb_test.py b/test/unit/solver/repository/deb_test.py
index ef3a0681d26..df435366190 100644
--- a/test/unit/solver/repository/deb_test.py
+++ b/test/unit/solver/repository/deb_test.py
@@ -1,4 +1,4 @@
-from mock import (
+from unittest.mock import (
     patch, Mock
 )
 from kiwi.solver.repository.deb import SolverRepositoryDeb
diff --git a/test/unit/solver/repository/init_test.py b/test/unit/solver/repository/init_test.py
index 5c4f474a64d..a231879c2e5 100644
--- a/test/unit/solver/repository/init_test.py
+++ b/test/unit/solver/repository/init_test.py
@@ -1,4 +1,4 @@
-from mock import (
+from unittest.mock import (
     patch, Mock
 )
 from pytest import raises
diff --git a/test/unit/solver/repository/rpm_dir_test.py b/test/unit/solver/repository/rpm_dir_test.py
index f0f1de7a49a..e2b6c158f6c 100644
--- a/test/unit/solver/repository/rpm_dir_test.py
+++ b/test/unit/solver/repository/rpm_dir_test.py
@@ -1,4 +1,4 @@
-from mock import (
+from unittest.mock import (
     patch, Mock
 )
 from pytest import raises
diff --git a/test/unit/solver/repository/rpm_md_test.py b/test/unit/solver/repository/rpm_md_test.py
index 18e71ba8dbe..6a8f46f1e13 100644
--- a/test/unit/solver/repository/rpm_md_test.py
+++ b/test/unit/solver/repository/rpm_md_test.py
@@ -1,6 +1,6 @@
-from mock import patch, call
+from unittest.mock import patch, call
 
-import mock
+import unittest.mock as mock
 
 from lxml import etree
 
diff --git a/test/unit/solver/repository/suse_test.py b/test/unit/solver/repository/suse_test.py
index 45c4bf0076f..2051f05f1dc 100644
--- a/test/unit/solver/repository/suse_test.py
+++ b/test/unit/solver/repository/suse_test.py
@@ -1,6 +1,6 @@
-from mock import patch
+from unittest.mock import patch
 
-import mock
+import unittest.mock as mock
 
 from lxml import etree
 
diff --git a/test/unit/solver/sat_test.py b/test/unit/solver/sat_test.py
index 07f332315e4..7f156b878d4 100644
--- a/test/unit/solver/sat_test.py
+++ b/test/unit/solver/sat_test.py
@@ -1,5 +1,6 @@
 import logging
-from mock import (
+import importlib
+from unittest.mock import (
     patch, Mock, MagicMock
 )
 from pytest import (
@@ -21,7 +22,7 @@ class TestSat:
     def inject_fixtures(self, caplog):
         self._caplog = caplog
 
-    @patch('importlib.import_module')
+    @patch.object(importlib, 'import_module')
     def setup(self, mock_import_module):
         self.sat = Sat()
         self.solver = MagicMock()
@@ -44,11 +45,11 @@ def setup(self, mock_import_module):
         self.sat.pool.setarch.assert_called_once_with()
         self.sat.pool.setarch.reset_mock()
 
-    @patch('importlib.import_module')
+    @patch.object(importlib, 'import_module')
     def setup_method(self, cls, mock_import_module):
         self.setup()
 
-    @patch('importlib.import_module')
+    @patch.object(importlib, 'import_module')
     def test_setup_no_sat_plugin(self, mock_import_module):
         mock_import_module.side_effect = Exception
         with raises(KiwiSatSolverPluginError):
diff --git a/test/unit/storage/clone_device_test.py b/test/unit/storage/clone_device_test.py
index d863997886a..a52b2359679 100644
--- a/test/unit/storage/clone_device_test.py
+++ b/test/unit/storage/clone_device_test.py
@@ -1,5 +1,5 @@
 import io
-from mock import (
+from unittest.mock import (
     patch, call, MagicMock, Mock
 )
 from pytest import raises
diff --git a/test/unit/storage/device_provider_test.py b/test/unit/storage/device_provider_test.py
index 06aa11d90e4..91f31a404b7 100644
--- a/test/unit/storage/device_provider_test.py
+++ b/test/unit/storage/device_provider_test.py
@@ -1,4 +1,4 @@
-from mock import (
+from unittest.mock import (
     patch, Mock
 )
 from pytest import raises
diff --git a/test/unit/storage/disk_test.py b/test/unit/storage/disk_test.py
index d0e71524bdb..2ee4704dfe1 100644
--- a/test/unit/storage/disk_test.py
+++ b/test/unit/storage/disk_test.py
@@ -1,12 +1,12 @@
 import logging
-from mock import (
+from unittest.mock import (
     patch, mock_open, call, Mock
 )
 from pytest import (
     fixture, raises
 )
 
-import mock
+import unittest.mock as mock
 
 from kiwi.storage.disk import ptable_entry_type
 from kiwi.storage.disk import Disk
diff --git a/test/unit/storage/integrity_device_test.py b/test/unit/storage/integrity_device_test.py
index 30b42766378..6ec9c8930bd 100644
--- a/test/unit/storage/integrity_device_test.py
+++ b/test/unit/storage/integrity_device_test.py
@@ -4,7 +4,7 @@
 from pytest import (
     raises, fixture
 )
-from mock import (
+from unittest.mock import (
     patch, Mock, call, MagicMock
 )
 
diff --git a/test/unit/storage/loop_device_test.py b/test/unit/storage/loop_device_test.py
index 94e031afbab..bf22929f374 100644
--- a/test/unit/storage/loop_device_test.py
+++ b/test/unit/storage/loop_device_test.py
@@ -1,5 +1,5 @@
 import logging
-from mock import (
+from unittest.mock import (
     patch, call
 )
 from pytest import (
diff --git a/test/unit/storage/luks_device_test.py b/test/unit/storage/luks_device_test.py
index 82742affcc4..b0248f3b753 100644
--- a/test/unit/storage/luks_device_test.py
+++ b/test/unit/storage/luks_device_test.py
@@ -1,6 +1,6 @@
 import logging
 import io
-from mock import (
+from unittest.mock import (
     patch, call, MagicMock, Mock
 )
 from pytest import (
diff --git a/test/unit/storage/mapped_device_test.py b/test/unit/storage/mapped_device_test.py
index b5f4ac090a5..51a55100544 100644
--- a/test/unit/storage/mapped_device_test.py
+++ b/test/unit/storage/mapped_device_test.py
@@ -1,4 +1,4 @@
-from mock import (
+from unittest.mock import (
     patch, Mock
 )
 from pytest import raises
diff --git a/test/unit/storage/raid_device_test.py b/test/unit/storage/raid_device_test.py
index 6045e016f26..af7f2fea257 100644
--- a/test/unit/storage/raid_device_test.py
+++ b/test/unit/storage/raid_device_test.py
@@ -1,5 +1,5 @@
 import logging
-from mock import (
+from unittest.mock import (
     patch, Mock, mock_open
 )
 from pytest import (
diff --git a/test/unit/storage/setup_test.py b/test/unit/storage/setup_test.py
index acfbdb0ef3d..201ed32857a 100644
--- a/test/unit/storage/setup_test.py
+++ b/test/unit/storage/setup_test.py
@@ -1,9 +1,9 @@
 import logging
-from mock import patch
+from unittest.mock import patch
 from pytest import (
     fixture, raises
 )
-import mock
+import unittest.mock as mock
 
 import kiwi
 
diff --git a/test/unit/storage/subformat/base_test.py b/test/unit/storage/subformat/base_test.py
index 81c32b2632c..b68d438b499 100644
--- a/test/unit/storage/subformat/base_test.py
+++ b/test/unit/storage/subformat/base_test.py
@@ -1,4 +1,4 @@
-from mock import (
+from unittest.mock import (
     patch, Mock
 )
 from pytest import raises
diff --git a/test/unit/storage/subformat/gce_test.py b/test/unit/storage/subformat/gce_test.py
index 853f81b7da7..472790516ea 100644
--- a/test/unit/storage/subformat/gce_test.py
+++ b/test/unit/storage/subformat/gce_test.py
@@ -1,7 +1,7 @@
-from mock import (
+from unittest.mock import (
     patch, call, mock_open
 )
-import mock
+import unittest.mock as mock
 import kiwi
 
 from kiwi.defaults import Defaults
diff --git a/test/unit/storage/subformat/init_test.py b/test/unit/storage/subformat/init_test.py
index 388efc12173..385652c76a7 100644
--- a/test/unit/storage/subformat/init_test.py
+++ b/test/unit/storage/subformat/init_test.py
@@ -1,4 +1,4 @@
-from mock import (
+from unittest.mock import (
     patch, Mock
 )
 from pytest import raises
diff --git a/test/unit/storage/subformat/ova_test.py b/test/unit/storage/subformat/ova_test.py
index f54bf9944da..234acafbdf2 100644
--- a/test/unit/storage/subformat/ova_test.py
+++ b/test/unit/storage/subformat/ova_test.py
@@ -1,4 +1,4 @@
-from mock import (
+from unittest.mock import (
     patch, call, Mock
 )
 from pytest import raises
diff --git a/test/unit/storage/subformat/qcow2_test.py b/test/unit/storage/subformat/qcow2_test.py
index 172580fe998..134ff1cd7c6 100644
--- a/test/unit/storage/subformat/qcow2_test.py
+++ b/test/unit/storage/subformat/qcow2_test.py
@@ -1,4 +1,4 @@
-from mock import (
+from unittest.mock import (
     patch, Mock, call
 )
 
diff --git a/test/unit/storage/subformat/vagrant_base_test.py b/test/unit/storage/subformat/vagrant_base_test.py
index ef915076eb2..86924c054e1 100644
--- a/test/unit/storage/subformat/vagrant_base_test.py
+++ b/test/unit/storage/subformat/vagrant_base_test.py
@@ -1,9 +1,9 @@
 import io
 from pytest import raises
-from mock import (
+from unittest.mock import (
     call, patch, mock_open
 )
-from mock import (
+from unittest.mock import (
     Mock, MagicMock
 )
 
diff --git a/test/unit/storage/subformat/vagrant_libvirt_test.py b/test/unit/storage/subformat/vagrant_libvirt_test.py
index ddc5c41b698..89249f179ee 100644
--- a/test/unit/storage/subformat/vagrant_libvirt_test.py
+++ b/test/unit/storage/subformat/vagrant_libvirt_test.py
@@ -1,5 +1,5 @@
 from textwrap import dedent
-from mock import (
+from unittest.mock import (
     patch, Mock, call, mock_open
 )
 
diff --git a/test/unit/storage/subformat/vagrant_virtualbox_test.py b/test/unit/storage/subformat/vagrant_virtualbox_test.py
index 5473bffe8dd..b23d3b645a5 100644
--- a/test/unit/storage/subformat/vagrant_virtualbox_test.py
+++ b/test/unit/storage/subformat/vagrant_virtualbox_test.py
@@ -1,4 +1,4 @@
-from mock import (
+from unittest.mock import (
     call, patch, Mock, MagicMock, mock_open
 )
 import kiwi
diff --git a/test/unit/storage/subformat/vdi_test.py b/test/unit/storage/subformat/vdi_test.py
index a5a24ff22c3..3a2f78c223d 100644
--- a/test/unit/storage/subformat/vdi_test.py
+++ b/test/unit/storage/subformat/vdi_test.py
@@ -1,6 +1,6 @@
-from mock import patch
+from unittest.mock import patch
 
-from mock import Mock
+from unittest.mock import Mock
 import kiwi
 
 from kiwi.defaults import Defaults
diff --git a/test/unit/storage/subformat/vhd_test.py b/test/unit/storage/subformat/vhd_test.py
index 7194f1cb4be..e226c090d9c 100644
--- a/test/unit/storage/subformat/vhd_test.py
+++ b/test/unit/storage/subformat/vhd_test.py
@@ -1,4 +1,4 @@
-from mock import (
+from unittest.mock import (
     patch, Mock
 )
 
diff --git a/test/unit/storage/subformat/vhdfixed_test.py b/test/unit/storage/subformat/vhdfixed_test.py
index cdad5d71b6d..7bf8b7ec8c9 100644
--- a/test/unit/storage/subformat/vhdfixed_test.py
+++ b/test/unit/storage/subformat/vhdfixed_test.py
@@ -1,6 +1,6 @@
 import sys
 from builtins import bytes
-from mock import (
+from unittest.mock import (
     call, patch, Mock, mock_open
 )
 from pytest import raises
diff --git a/test/unit/storage/subformat/vhdx_test.py b/test/unit/storage/subformat/vhdx_test.py
index f1687469ba1..b637d9a655e 100644
--- a/test/unit/storage/subformat/vhdx_test.py
+++ b/test/unit/storage/subformat/vhdx_test.py
@@ -1,4 +1,4 @@
-from mock import (
+from unittest.mock import (
     patch, Mock
 )
 
diff --git a/test/unit/storage/subformat/vmdk_test.py b/test/unit/storage/subformat/vmdk_test.py
index 048caa24e3d..5fa642fc42f 100644
--- a/test/unit/storage/subformat/vmdk_test.py
+++ b/test/unit/storage/subformat/vmdk_test.py
@@ -1,5 +1,5 @@
 import os
-from mock import (
+from unittest.mock import (
     patch, call, Mock, mock_open
 )
 from pytest import raises
diff --git a/test/unit/system/identifier_test.py b/test/unit/system/identifier_test.py
index 9bf24b0c675..cb7b5ef9a2b 100644
--- a/test/unit/system/identifier_test.py
+++ b/test/unit/system/identifier_test.py
@@ -1,4 +1,4 @@
-from mock import (
+from unittest.mock import (
     patch, mock_open
 )
 
diff --git a/test/unit/system/kernel_test.py b/test/unit/system/kernel_test.py
index 835e36cdd63..6e075dc4655 100644
--- a/test/unit/system/kernel_test.py
+++ b/test/unit/system/kernel_test.py
@@ -1,6 +1,6 @@
-import mock
+import unittest.mock as mock
 import os
-from mock import patch
+from unittest.mock import patch
 from pytest import raises
 
 from kiwi.system.kernel import Kernel
diff --git a/test/unit/system/mount_test.py b/test/unit/system/mount_test.py
index 135cb96b1eb..3df3dc1e5ca 100644
--- a/test/unit/system/mount_test.py
+++ b/test/unit/system/mount_test.py
@@ -1,6 +1,6 @@
 import os
 import logging
-from mock import (
+from unittest.mock import (
     patch, MagicMock, Mock, call
 )
 from pytest import fixture
diff --git a/test/unit/system/prepare_test.py b/test/unit/system/prepare_test.py
index 91e074bda3f..94911c001ac 100644
--- a/test/unit/system/prepare_test.py
+++ b/test/unit/system/prepare_test.py
@@ -3,7 +3,7 @@
 from pytest import (
     raises, fixture
 )
-from mock import (
+from unittest.mock import (
     patch, call, Mock, MagicMock, ANY
 )
 
diff --git a/test/unit/system/profile_test.py b/test/unit/system/profile_test.py
index 0e8a31c0af7..b7f9a0d16e9 100644
--- a/test/unit/system/profile_test.py
+++ b/test/unit/system/profile_test.py
@@ -1,5 +1,5 @@
 # vim: set fileencoding=utf-8
-from mock import patch
+from unittest.mock import patch
 
 import os
 
diff --git a/test/unit/system/result_test.py b/test/unit/system/result_test.py
index 56918fd46f0..d7110dd8b07 100644
--- a/test/unit/system/result_test.py
+++ b/test/unit/system/result_test.py
@@ -1,5 +1,5 @@
 import logging
-from mock import (
+from unittest.mock import (
     patch, MagicMock, mock_open, call
 )
 from pytest import (
diff --git a/test/unit/system/root_bind_test.py b/test/unit/system/root_bind_test.py
index b60cedc27c7..9d5fcd0ec19 100644
--- a/test/unit/system/root_bind_test.py
+++ b/test/unit/system/root_bind_test.py
@@ -1,6 +1,6 @@
 import sys
 import logging
-from mock import (
+from unittest.mock import (
     patch, call, Mock
 )
 from pytest import (
diff --git a/test/unit/system/root_import/base_test.py b/test/unit/system/root_import/base_test.py
index dc401f69e13..f7015c48d48 100644
--- a/test/unit/system/root_import/base_test.py
+++ b/test/unit/system/root_import/base_test.py
@@ -1,6 +1,6 @@
 import io
 import os
-from mock import (
+from unittest.mock import (
     patch, call, Mock, MagicMock
 )
 from pytest import raises
diff --git a/test/unit/system/root_import/init_test.py b/test/unit/system/root_import/init_test.py
index 0db76c23df6..7ef36c0afca 100644
--- a/test/unit/system/root_import/init_test.py
+++ b/test/unit/system/root_import/init_test.py
@@ -1,4 +1,4 @@
-from mock import patch
+from unittest.mock import patch
 from pytest import raises
 
 from kiwi.system.root_import import RootImport
diff --git a/test/unit/system/root_import/oci_test.py b/test/unit/system/root_import/oci_test.py
index 45e3f492b56..c761868ef70 100644
--- a/test/unit/system/root_import/oci_test.py
+++ b/test/unit/system/root_import/oci_test.py
@@ -1,5 +1,5 @@
 import logging
-from mock import (
+from unittest.mock import (
     patch, Mock
 )
 from pytest import (
diff --git a/test/unit/system/root_init_test.py b/test/unit/system/root_init_test.py
index 8c9364e47cf..4a733cb6e51 100644
--- a/test/unit/system/root_init_test.py
+++ b/test/unit/system/root_init_test.py
@@ -1,5 +1,5 @@
 import sys
-from mock import (
+from unittest.mock import (
     patch, call, Mock
 )
 from pytest import raises
diff --git a/test/unit/system/setup_test.py b/test/unit/system/setup_test.py
index 2e7e2b71ffc..014525d76f2 100644
--- a/test/unit/system/setup_test.py
+++ b/test/unit/system/setup_test.py
@@ -2,7 +2,7 @@
 import os
 import logging
 import io
-from mock import (
+from unittest.mock import (
     patch, call, Mock, MagicMock, mock_open
 )
 from pytest import (
diff --git a/test/unit/system/size_test.py b/test/unit/system/size_test.py
index fe4ce83df23..d19fc564a36 100644
--- a/test/unit/system/size_test.py
+++ b/test/unit/system/size_test.py
@@ -1,6 +1,6 @@
-from mock import patch
+from unittest.mock import patch
 
-import mock
+import unittest.mock as mock
 
 from kiwi.system.size import SystemSize
 
diff --git a/test/unit/system/uri_test.py b/test/unit/system/uri_test.py
index 4f9fca7759b..2c693f1891f 100644
--- a/test/unit/system/uri_test.py
+++ b/test/unit/system/uri_test.py
@@ -1,12 +1,12 @@
 import logging
 import os
-from mock import (
+from unittest.mock import (
     patch, Mock
 )
 from pytest import (
     raises, fixture
 )
-import mock
+import unittest.mock as mock
 
 from kiwi.system.uri import Uri
 
diff --git a/test/unit/system/users_test.py b/test/unit/system/users_test.py
index 5fc5fb79e89..667384e39bd 100644
--- a/test/unit/system/users_test.py
+++ b/test/unit/system/users_test.py
@@ -1,4 +1,4 @@
-from mock import patch
+from unittest.mock import patch
 
 from kiwi.system.users import Users
 
diff --git a/test/unit/tasks/base_test.py b/test/unit/tasks/base_test.py
index 949084caa7c..acc01859070 100644
--- a/test/unit/tasks/base_test.py
+++ b/test/unit/tasks/base_test.py
@@ -1,5 +1,5 @@
 import sys
-from mock import (
+from unittest.mock import (
     patch, call
 )
 from pytest import (
diff --git a/test/unit/tasks/image_info_test.py b/test/unit/tasks/image_info_test.py
index 514ef267143..6c2004e46fa 100644
--- a/test/unit/tasks/image_info_test.py
+++ b/test/unit/tasks/image_info_test.py
@@ -1,6 +1,6 @@
 import sys
 
-from mock import (
+from unittest.mock import (
     patch, call, Mock, MagicMock
 )
 
diff --git a/test/unit/tasks/image_resize_test.py b/test/unit/tasks/image_resize_test.py
index 52e6aa81c1d..f78296464e7 100644
--- a/test/unit/tasks/image_resize_test.py
+++ b/test/unit/tasks/image_resize_test.py
@@ -1,7 +1,7 @@
 import logging
 import os
 import sys
-from mock import (
+from unittest.mock import (
     Mock, patch
 )
 from pytest import (
diff --git a/test/unit/tasks/result_bundle_test.py b/test/unit/tasks/result_bundle_test.py
index b54a2e4ebd9..7bb2f6caba0 100644
--- a/test/unit/tasks/result_bundle_test.py
+++ b/test/unit/tasks/result_bundle_test.py
@@ -1,7 +1,7 @@
 import os
 import sys
 import logging
-from mock import (
+from unittest.mock import (
     patch, call, Mock, mock_open
 )
 from pytest import (
diff --git a/test/unit/tasks/result_list_test.py b/test/unit/tasks/result_list_test.py
index c3c1bb8f015..6018ea3022e 100644
--- a/test/unit/tasks/result_list_test.py
+++ b/test/unit/tasks/result_list_test.py
@@ -1,8 +1,8 @@
 import sys
-import mock
+import unittest.mock as mock
 import os
 
-from mock import patch
+from unittest.mock import patch
 
 import kiwi
 
diff --git a/test/unit/tasks/system_build_test.py b/test/unit/tasks/system_build_test.py
index 4720b1c5e9a..1d9ff20064d 100644
--- a/test/unit/tasks/system_build_test.py
+++ b/test/unit/tasks/system_build_test.py
@@ -1,9 +1,9 @@
 import logging
 import sys
-import mock
+import unittest.mock as mock
 import os
 from pytest import fixture
-from mock import (
+from unittest.mock import (
     patch, call
 )
 
diff --git a/test/unit/tasks/system_create_test.py b/test/unit/tasks/system_create_test.py
index 4dbb1a9d614..67709448b1d 100644
--- a/test/unit/tasks/system_create_test.py
+++ b/test/unit/tasks/system_create_test.py
@@ -1,5 +1,5 @@
 import sys
-import mock
+import unittest.mock as mock
 import os
 
 import kiwi
diff --git a/test/unit/tasks/system_prepare_test.py b/test/unit/tasks/system_prepare_test.py
index 90d410698da..fb1329bc9fa 100644
--- a/test/unit/tasks/system_prepare_test.py
+++ b/test/unit/tasks/system_prepare_test.py
@@ -1,9 +1,9 @@
 import logging
 import sys
-import mock
+import unittest.mock as mock
 import os
 from pytest import fixture
-from mock import patch, call
+from unittest.mock import patch, call
 
 import kiwi
 
diff --git a/test/unit/tasks/system_update_test.py b/test/unit/tasks/system_update_test.py
index a4afd71b655..8be3383ee96 100644
--- a/test/unit/tasks/system_update_test.py
+++ b/test/unit/tasks/system_update_test.py
@@ -1,5 +1,5 @@
 import sys
-import mock
+import unittest.mock as mock
 
 import kiwi
 
diff --git a/test/unit/utils/block_test.py b/test/unit/utils/block_test.py
index 9042808e370..e93ac1d0cf9 100644
--- a/test/unit/utils/block_test.py
+++ b/test/unit/utils/block_test.py
@@ -1,4 +1,4 @@
-from mock import (
+from unittest.mock import (
     Mock, patch
 )
 
diff --git a/test/unit/utils/checksum_test.py b/test/unit/utils/checksum_test.py
index ca4adb7d620..cc0c42af4c5 100644
--- a/test/unit/utils/checksum_test.py
+++ b/test/unit/utils/checksum_test.py
@@ -1,6 +1,6 @@
 from builtins import bytes
 import encodings.ascii as encoding
-from mock import (
+from unittest.mock import (
     patch, call, Mock, mock_open
 )
 from pytest import raises
diff --git a/test/unit/utils/codec_test.py b/test/unit/utils/codec_test.py
index 05b0842e45b..ad3790193d5 100644
--- a/test/unit/utils/codec_test.py
+++ b/test/unit/utils/codec_test.py
@@ -1,5 +1,5 @@
 import logging
-from mock import patch
+from unittest.mock import patch
 from pytest import (
     raises, fixture
 )
diff --git a/test/unit/utils/command_capabilities_test.py b/test/unit/utils/command_capabilities_test.py
index a05a68a30bb..2a49ad7311f 100644
--- a/test/unit/utils/command_capabilities_test.py
+++ b/test/unit/utils/command_capabilities_test.py
@@ -1,5 +1,5 @@
 import logging
-from mock import (
+from unittest.mock import (
     patch, call
 )
 from pytest import (
diff --git a/test/unit/utils/compress_test.py b/test/unit/utils/compress_test.py
index f3126dceb8b..199e87c52eb 100644
--- a/test/unit/utils/compress_test.py
+++ b/test/unit/utils/compress_test.py
@@ -1,5 +1,5 @@
 import logging
-from mock import (
+from unittest.mock import (
     patch, Mock
 )
 from pytest import (
diff --git a/test/unit/utils/output_test.py b/test/unit/utils/output_test.py
index eec4fd99869..61edd2c2ce9 100644
--- a/test/unit/utils/output_test.py
+++ b/test/unit/utils/output_test.py
@@ -1,9 +1,9 @@
 import logging
 from pytest import fixture
-from mock import patch
+from unittest.mock import patch
 from kiwi.utils.output import DataOutput
 import json
-import mock
+import unittest.mock as mock
 
 
 class TestDataOutput:
diff --git a/test/unit/utils/rpm_database_test.py b/test/unit/utils/rpm_database_test.py
index 8622081f35c..b217f1c4c3e 100644
--- a/test/unit/utils/rpm_database_test.py
+++ b/test/unit/utils/rpm_database_test.py
@@ -1,4 +1,4 @@
-from mock import (
+from unittest.mock import (
     patch, Mock, call
 )
 
diff --git a/test/unit/utils/rpm_test.py b/test/unit/utils/rpm_test.py
index 09a5315b582..66eacca1c4d 100644
--- a/test/unit/utils/rpm_test.py
+++ b/test/unit/utils/rpm_test.py
@@ -1,5 +1,5 @@
 import os
-from mock import (
+from unittest.mock import (
     patch, Mock, call, mock_open
 )
 
diff --git a/test/unit/utils/signature_test.py b/test/unit/utils/signature_test.py
index bd84239deb3..b4e4efdcf37 100644
--- a/test/unit/utils/signature_test.py
+++ b/test/unit/utils/signature_test.py
@@ -1,6 +1,6 @@
 import io
 from pytest import raises
-from mock import (
+from unittest.mock import (
     patch, Mock, MagicMock, call
 )
 
diff --git a/test/unit/utils/sync_test.py b/test/unit/utils/sync_test.py
index 6d0ff580863..8cfff0eb9e7 100644
--- a/test/unit/utils/sync_test.py
+++ b/test/unit/utils/sync_test.py
@@ -3,7 +3,7 @@
 import logging
 from pytest import fixture
 from stat import ST_MODE
-from mock import patch
+from unittest.mock import patch
 
 from kiwi.utils.sync import DataSync
 
diff --git a/test/unit/utils/sysconfig_test.py b/test/unit/utils/sysconfig_test.py
index 876e064f540..d575e69118b 100644
--- a/test/unit/utils/sysconfig_test.py
+++ b/test/unit/utils/sysconfig_test.py
@@ -1,4 +1,4 @@
-from mock import (
+from unittest.mock import (
     call, mock_open, patch
 )
 
diff --git a/test/unit/utils/temporary_test.py b/test/unit/utils/temporary_test.py
index 68fca5acfad..b0a2edb1e80 100644
--- a/test/unit/utils/temporary_test.py
+++ b/test/unit/utils/temporary_test.py
@@ -1,4 +1,4 @@
-from mock import patch
+from unittest.mock import patch
 
 from kiwi.utils.temporary import Temporary
 
diff --git a/test/unit/utils/veritysetup_test.py b/test/unit/utils/veritysetup_test.py
index 49b80f7ebf2..fcbae513eba 100644
--- a/test/unit/utils/veritysetup_test.py
+++ b/test/unit/utils/veritysetup_test.py
@@ -1,7 +1,7 @@
 import io
 from textwrap import dedent
 from pytest import raises
-from mock import (
+from unittest.mock import (
     patch, Mock, MagicMock, call
 )
 
diff --git a/test/unit/volume_manager/base_test.py b/test/unit/volume_manager/base_test.py
index 570cfbb86e2..8eb82c79fd7 100644
--- a/test/unit/volume_manager/base_test.py
+++ b/test/unit/volume_manager/base_test.py
@@ -1,5 +1,5 @@
 from collections import namedtuple
-from mock import (
+from unittest.mock import (
     patch, Mock
 )
 from pytest import raises
diff --git a/test/unit/volume_manager/btrfs_test.py b/test/unit/volume_manager/btrfs_test.py
index 4e3db759b12..699a770905a 100644
--- a/test/unit/volume_manager/btrfs_test.py
+++ b/test/unit/volume_manager/btrfs_test.py
@@ -1,6 +1,6 @@
 import datetime
 import logging
-from mock import (
+from unittest.mock import (
     patch, call, Mock, mock_open
 )
 from pytest import (
diff --git a/test/unit/volume_manager/init_test.py b/test/unit/volume_manager/init_test.py
index 9e55b87ffe7..17ee96dae0b 100644
--- a/test/unit/volume_manager/init_test.py
+++ b/test/unit/volume_manager/init_test.py
@@ -1,4 +1,4 @@
-from mock import (
+from unittest.mock import (
     patch, Mock
 )
 from pytest import raises
diff --git a/test/unit/volume_manager/lvm_test.py b/test/unit/volume_manager/lvm_test.py
index 88a30dd56f8..b58e255f447 100644
--- a/test/unit/volume_manager/lvm_test.py
+++ b/test/unit/volume_manager/lvm_test.py
@@ -1,5 +1,5 @@
 import logging
-from mock import (
+from unittest.mock import (
     patch, call, Mock
 )
 from pytest import (
diff --git a/test/unit/xml_description_test.py b/test/unit/xml_description_test.py
index 18f90925f8a..53d95e401ec 100644
--- a/test/unit/xml_description_test.py
+++ b/test/unit/xml_description_test.py
@@ -1,6 +1,6 @@
 import logging
-from mock import patch
-import mock
+from unittest.mock import patch
+import unittest.mock as mock
 from builtins import bytes
 from lxml import etree
 from pytest import raises
diff --git a/test/unit/xml_state_test.py b/test/unit/xml_state_test.py
index aeb0b2529be..ea5cbb28a68 100644
--- a/test/unit/xml_state_test.py
+++ b/test/unit/xml_state_test.py
@@ -2,7 +2,7 @@
 import io
 import logging
 from collections import namedtuple
-from mock import (
+from unittest.mock import (
     patch, Mock, MagicMock
 )
 from pytest import (