diff --git a/tests/test_arch.py b/tests/test_arch.py
index 5112caea..fae515db 100644
--- a/tests/test_arch.py
+++ b/tests/test_arch.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 import unittest
 
 from pungi.arch import (
diff --git a/tests/test_arguments.py b/tests/test_arguments.py
index 20bf17ed..42baacf4 100644
--- a/tests/test_arguments.py
+++ b/tests/test_arguments.py
@@ -1,4 +1,4 @@
-import mock
+from unittest import mock
 
 try:
     import unittest2 as unittest
diff --git a/tests/test_checks.py b/tests/test_checks.py
index 9d53b119..6ff46bdf 100644
--- a/tests/test_checks.py
+++ b/tests/test_checks.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 
 try:
     import unittest2 as unittest
diff --git a/tests/test_compose.py b/tests/test_compose.py
index 44748520..7048b79f 100644
--- a/tests/test_compose.py
+++ b/tests/test_compose.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import logging
-import mock
+from unittest import mock
 
 try:
     import unittest2 as unittest
diff --git a/tests/test_config.py b/tests/test_config.py
index 3bc03328..8911a927 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -7,7 +7,7 @@ except ImportError:
     import unittest
 
 import six
-import mock
+from unittest import mock
 
 from pungi import checks
 from tests.helpers import load_config, PKGSET_REPOS
diff --git a/tests/test_config_validate_script.py b/tests/test_config_validate_script.py
index 4f9c64bf..0933b441 100644
--- a/tests/test_config_validate_script.py
+++ b/tests/test_config_validate_script.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 
-import mock
+from unittest import mock
 import os
 import six
 
diff --git a/tests/test_createiso_phase.py b/tests/test_createiso_phase.py
index f71a45c0..bc0a2baa 100644
--- a/tests/test_createiso_phase.py
+++ b/tests/test_createiso_phase.py
@@ -2,7 +2,7 @@
 
 
 import logging
-import mock
+from unittest import mock
 import six
 
 import os
diff --git a/tests/test_createiso_script.py b/tests/test_createiso_script.py
index 0db439cb..c16bc55a 100644
--- a/tests/test_createiso_script.py
+++ b/tests/test_createiso_script.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 
 import os
 from six.moves import StringIO
diff --git a/tests/test_createrepophase.py b/tests/test_createrepophase.py
index aecff998..3c2f2efa 100644
--- a/tests/test_createrepophase.py
+++ b/tests/test_createrepophase.py
@@ -8,7 +8,7 @@ except ImportError:
 import glob
 import os
 
-import mock
+from unittest import mock
 import six
 
 from pungi.module_util import Modulemd
diff --git a/tests/test_extra_files_phase.py b/tests/test_extra_files_phase.py
index 21dc3feb..1b85be04 100644
--- a/tests/test_extra_files_phase.py
+++ b/tests/test_extra_files_phase.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 import os
 
 from productmd.extra_files import ExtraFiles
diff --git a/tests/test_gather_method_deps.py b/tests/test_gather_method_deps.py
index 77b30bcd..a231681d 100644
--- a/tests/test_gather_method_deps.py
+++ b/tests/test_gather_method_deps.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 
 from pungi.phases.gather.methods import method_deps as deps
 from tests import helpers
diff --git a/tests/test_gather_method_hybrid.py b/tests/test_gather_method_hybrid.py
index b053f229..711df27d 100644
--- a/tests/test_gather_method_hybrid.py
+++ b/tests/test_gather_method_hybrid.py
@@ -2,7 +2,7 @@
 
 from collections import namedtuple
 import copy
-import mock
+from unittest import mock
 import os
 
 import six
diff --git a/tests/test_gather_method_nodeps.py b/tests/test_gather_method_nodeps.py
index b337fe96..02eafab1 100644
--- a/tests/test_gather_method_nodeps.py
+++ b/tests/test_gather_method_nodeps.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 import os
 
 import six
diff --git a/tests/test_gather_phase.py b/tests/test_gather_phase.py
index a5d59730..7ed167dd 100644
--- a/tests/test_gather_phase.py
+++ b/tests/test_gather_phase.py
@@ -4,7 +4,7 @@ import copy
 import json
 import os
 
-import mock
+from unittest import mock
 
 try:
     import unittest2 as unittest
diff --git a/tests/test_gather_source_module.py b/tests/test_gather_source_module.py
index 7b87400a..a3482c3c 100644
--- a/tests/test_gather_source_module.py
+++ b/tests/test_gather_source_module.py
@@ -5,7 +5,7 @@ try:
 except ImportError:
     import unittest
 
-import mock
+from unittest import mock
 import six
 
 from pungi.phases.gather.sources.source_module import GatherSourceModule
diff --git a/tests/test_image_container_phase.py b/tests/test_image_container_phase.py
index 2bb99c7b..c78c9561 100644
--- a/tests/test_image_container_phase.py
+++ b/tests/test_image_container_phase.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 
 import os
 
diff --git a/tests/test_imagebuildphase.py b/tests/test_imagebuildphase.py
index c0f5ac7d..a618a377 100644
--- a/tests/test_imagebuildphase.py
+++ b/tests/test_imagebuildphase.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 
 import six
 
diff --git a/tests/test_imagechecksumphase.py b/tests/test_imagechecksumphase.py
index fd8a44cb..26930989 100644
--- a/tests/test_imagechecksumphase.py
+++ b/tests/test_imagechecksumphase.py
@@ -4,7 +4,7 @@ try:
     import unittest2 as unittest
 except ImportError:
     import unittest
-import mock
+from unittest import mock
 
 import os
 import tempfile
diff --git a/tests/test_initphase.py b/tests/test_initphase.py
index 2ddb82ca..32989208 100644
--- a/tests/test_initphase.py
+++ b/tests/test_initphase.py
@@ -5,7 +5,7 @@ try:
     import unittest2 as unittest
 except ImportError:
     import unittest
-import mock
+from unittest import mock
 
 import six
 
diff --git a/tests/test_iso_wrapper.py b/tests/test_iso_wrapper.py
index 5be0e32e..cfb45900 100644
--- a/tests/test_iso_wrapper.py
+++ b/tests/test_iso_wrapper.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import itertools
-import mock
+from unittest import mock
 import os
 import six
 
diff --git a/tests/test_koji_wrapper.py b/tests/test_koji_wrapper.py
index 4b943596..0d219113 100644
--- a/tests/test_koji_wrapper.py
+++ b/tests/test_koji_wrapper.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import json
-import mock
+from unittest import mock
 
 try:
     import unittest2 as unittest
diff --git a/tests/test_linker.py b/tests/test_linker.py
index e81ca2f2..93f1d4fe 100644
--- a/tests/test_linker.py
+++ b/tests/test_linker.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 
-import mock
+from unittest import mock
 import errno
 import os
 import stat
diff --git a/tests/test_liveimagesphase.py b/tests/test_liveimagesphase.py
index d459c9b9..8321a53e 100644
--- a/tests/test_liveimagesphase.py
+++ b/tests/test_liveimagesphase.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 
-import mock
+from unittest import mock
 
 import six
 
diff --git a/tests/test_livemediaphase.py b/tests/test_livemediaphase.py
index 7a406716..9dfe76b4 100644
--- a/tests/test_livemediaphase.py
+++ b/tests/test_livemediaphase.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 
 import os
 
diff --git a/tests/test_media_split.py b/tests/test_media_split.py
index f286f658..eba600df 100644
--- a/tests/test_media_split.py
+++ b/tests/test_media_split.py
@@ -4,7 +4,7 @@ try:
     import unittest2 as unittest
 except ImportError:
     import unittest
-import mock
+from unittest import mock
 
 from pungi import media_split
 
diff --git a/tests/test_metadata.py b/tests/test_metadata.py
index a5fa10a2..8aa86df3 100644
--- a/tests/test_metadata.py
+++ b/tests/test_metadata.py
@@ -1,4 +1,4 @@
-import mock
+from unittest import mock
 import os
 
 import six
diff --git a/tests/test_notifier.py b/tests/test_notifier.py
index 914d6314..8e7d598e 100644
--- a/tests/test_notifier.py
+++ b/tests/test_notifier.py
@@ -2,7 +2,7 @@
 
 from datetime import datetime
 import json
-import mock
+from unittest import mock
 
 try:
     import unittest2 as unittest
diff --git a/tests/test_orchestrator.py b/tests/test_orchestrator.py
index b26fcc67..05c640c1 100644
--- a/tests/test_orchestrator.py
+++ b/tests/test_orchestrator.py
@@ -9,7 +9,7 @@ import shutil
 import subprocess
 from textwrap import dedent
 
-import mock
+from unittest import mock
 import six
 from six.moves import configparser
 
diff --git a/tests/test_osbs_phase.py b/tests/test_osbs_phase.py
index 9a45dfea..a44a15a6 100644
--- a/tests/test_osbs_phase.py
+++ b/tests/test_osbs_phase.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 import json
 
 import copy
diff --git a/tests/test_osbuild_phase.py b/tests/test_osbuild_phase.py
index c53f7529..54c50292 100644
--- a/tests/test_osbuild_phase.py
+++ b/tests/test_osbuild_phase.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 
 import os
 
diff --git a/tests/test_ostree_installer_phase.py b/tests/test_ostree_installer_phase.py
index de705754..58dc4dac 100644
--- a/tests/test_ostree_installer_phase.py
+++ b/tests/test_ostree_installer_phase.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 
 import os
 
diff --git a/tests/test_ostree_phase.py b/tests/test_ostree_phase.py
index 40c99076..289d2715 100644
--- a/tests/test_ostree_phase.py
+++ b/tests/test_ostree_phase.py
@@ -2,7 +2,7 @@
 
 
 import json
-import mock
+from unittest import mock
 
 import os
 
diff --git a/tests/test_ostree_script.py b/tests/test_ostree_script.py
index b6710e57..2a051886 100644
--- a/tests/test_ostree_script.py
+++ b/tests/test_ostree_script.py
@@ -4,7 +4,7 @@
 import json
 import os
 
-import mock
+from unittest import mock
 import six
 import yaml
 
diff --git a/tests/test_ostree_utils.py b/tests/test_ostree_utils.py
index 76541017..1fe03608 100644
--- a/tests/test_ostree_utils.py
+++ b/tests/test_ostree_utils.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 
 import os
 
diff --git a/tests/test_patch_iso.py b/tests/test_patch_iso.py
index 9fe8d7b4..381313ac 100644
--- a/tests/test_patch_iso.py
+++ b/tests/test_patch_iso.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 import os
 
 try:
diff --git a/tests/test_phase_base.py b/tests/test_phase_base.py
index 5a45df39..15a7f2d9 100644
--- a/tests/test_phase_base.py
+++ b/tests/test_phase_base.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 
 try:
     import unittest2 as unittest
diff --git a/tests/test_pkgset_common.py b/tests/test_pkgset_common.py
index 9209e408..2fce72ff 100755
--- a/tests/test_pkgset_common.py
+++ b/tests/test_pkgset_common.py
@@ -2,7 +2,7 @@
 
 import os
 
-import mock
+from unittest import mock
 import six
 
 from pungi.module_util import Modulemd
diff --git a/tests/test_pkgset_pkgsets.py b/tests/test_pkgset_pkgsets.py
index 75d3f474..8d029ce1 100644
--- a/tests/test_pkgset_pkgsets.py
+++ b/tests/test_pkgset_pkgsets.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 import ddt
-import mock
+from unittest import mock
 import os
 import six
 
diff --git a/tests/test_repoclosure_phase.py b/tests/test_repoclosure_phase.py
index 81e4bb5b..bea7040e 100644
--- a/tests/test_repoclosure_phase.py
+++ b/tests/test_repoclosure_phase.py
@@ -6,7 +6,7 @@ try:
 except ImportError:
     import unittest
 
-import mock
+from unittest import mock
 import six
 
 import pungi.phases.repoclosure as repoclosure_phase
diff --git a/tests/test_runroot.py b/tests/test_runroot.py
index 4b3f0488..410a0fcf 100644
--- a/tests/test_runroot.py
+++ b/tests/test_runroot.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 import os
 
 from pungi.runroot import Runroot
diff --git a/tests/test_scm.py b/tests/test_scm.py
index f6307967..bf0c4347 100644
--- a/tests/test_scm.py
+++ b/tests/test_scm.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 
 try:
     import unittest2 as unittest
diff --git a/tests/test_test_phase.py b/tests/test_test_phase.py
index 1b6f1ad1..81d9e582 100644
--- a/tests/test_test_phase.py
+++ b/tests/test_test_phase.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 import os
 
 import pungi.phases.test as test_phase
diff --git a/tests/test_unified_isos.py b/tests/test_unified_isos.py
index 4047e5d5..82bd4865 100755
--- a/tests/test_unified_isos.py
+++ b/tests/test_unified_isos.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import mock
+from unittest import mock
 import os
 import shutil
 import six
diff --git a/tests/test_util.py b/tests/test_util.py
index 181c91d8..033f251e 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import argparse
-import mock
+from unittest import mock
 import os
 
 try: