diff --git a/optional-requirements.txt b/optional-requirements.txt
deleted file mode 100644
index e169a4a78b..0000000000
--- a/optional-requirements.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# Purpose of optional-requirements is simple - list requirements which cannot
-# be placed in main requirements.txt .
-#
-# Reasons:
-#  - package doesn't support the same Python versions as Rally package
-#    supports (see classifiers from setup.cfg)
-#  - package doesn't have releases
-# If these rules do not relate to your package, feel free to propose it as main
-# requirement to Rally (requirements.txt file).
diff --git a/test-requirements.txt b/test-requirements.txt
index f117e5cb29..7081aa12b9 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -13,7 +13,6 @@ pytest-html>=1.10.0                                    # Mozilla Public License
 pytest-xdist                                           # MIT
 
 ddt                                                    # MIT
-mock                                                   # OSI Approved :: BSD License
 python-dateutil                                        # Dual License
 testtools                                              # UNKNOWN
 
@@ -24,3 +23,4 @@ testresources                                          # UNKNOWN
 
 # needed for functional job
 stestr                                                 # Apache Software License
+mock 
\ No newline at end of file
diff --git a/tests/functional/test_cli_task.py b/tests/functional/test_cli_task.py
index 2c3cf95da8..b118cc8688 100644
--- a/tests/functional/test_cli_task.py
+++ b/tests/functional/test_cli_task.py
@@ -18,9 +18,9 @@ import os
 import re
 import threading
 import time
+from unittest import mock
 
 import jsonschema
-import mock
 import testtools
 
 from rally import api
diff --git a/tests/functional/test_cli_verify.py b/tests/functional/test_cli_verify.py
index 0e84c40981..17615087a0 100644
--- a/tests/functional/test_cli_verify.py
+++ b/tests/functional/test_cli_verify.py
@@ -14,12 +14,13 @@
 #    under the License.
 
 import re
-import unittest
+
+import testtools
 
 from tests.functional import utils
 
 
-class VerifyTestCase(unittest.TestCase):
+class VerifyTestCase(testtools.TestCase):
 
     def test_list_plugins(self):
         rally = utils.Rally(plugin_path="tests/functional/extra")
diff --git a/tests/unit/cli/commands/test_db.py b/tests/unit/cli/commands/test_db.py
index 149968e154..308b845505 100644
--- a/tests/unit/cli/commands/test_db.py
+++ b/tests/unit/cli/commands/test_db.py
@@ -13,8 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-
-import mock
+from unittest import mock
 
 from rally.cli.commands import db
 from tests.unit import fakes
diff --git a/tests/unit/cli/commands/test_deployment.py b/tests/unit/cli/commands/test_deployment.py
index e19ef79559..cfcd5a45b5 100755
--- a/tests/unit/cli/commands/test_deployment.py
+++ b/tests/unit/cli/commands/test_deployment.py
@@ -16,8 +16,7 @@
 import collections
 import io
 import os
-
-import mock
+from unittest import mock
 
 from rally.cli import cliutils
 from rally.cli.commands import deployment
diff --git a/tests/unit/cli/commands/test_env.py b/tests/unit/cli/commands/test_env.py
index 14409d6263..c2c48da5f9 100644
--- a/tests/unit/cli/commands/test_env.py
+++ b/tests/unit/cli/commands/test_env.py
@@ -16,10 +16,9 @@
 import collections
 import datetime as dt
 import json
+from unittest import mock
 import uuid
 
-import mock
-
 from rally.cli.commands import env
 from rally.env import env_mgr
 from rally import exceptions
diff --git a/tests/unit/cli/commands/test_plugin.py b/tests/unit/cli/commands/test_plugin.py
index 52e1252d84..8f1c49c179 100644
--- a/tests/unit/cli/commands/test_plugin.py
+++ b/tests/unit/cli/commands/test_plugin.py
@@ -14,9 +14,9 @@
 #    under the License.
 
 import io
+from unittest import mock
 
 import ddt
-import mock
 
 from rally.cli import cliutils
 from rally.cli.commands import plugin as plugin_cmd
diff --git a/tests/unit/cli/commands/test_task.py b/tests/unit/cli/commands/test_task.py
index 18109a1a68..e9df76e6d4 100644
--- a/tests/unit/cli/commands/test_task.py
+++ b/tests/unit/cli/commands/test_task.py
@@ -18,9 +18,9 @@ import io
 import json
 import os.path
 import sys
+from unittest import mock
 
 import ddt
-import mock
 
 import rally
 from rally import api
diff --git a/tests/unit/cli/commands/test_verify.py b/tests/unit/cli/commands/test_verify.py
index dd63b39f10..6d5cc25e90 100644
--- a/tests/unit/cli/commands/test_verify.py
+++ b/tests/unit/cli/commands/test_verify.py
@@ -15,8 +15,7 @@
 
 import io
 import tempfile
-
-import mock
+from unittest import mock
 
 from rally.cli import cliutils
 from rally.cli.commands import verify
diff --git a/tests/unit/cli/test_cliutils.py b/tests/unit/cli/test_cliutils.py
index 0d5e6a28ca..837de2dba4 100644
--- a/tests/unit/cli/test_cliutils.py
+++ b/tests/unit/cli/test_cliutils.py
@@ -14,9 +14,9 @@
 #    under the License.
 
 import io
+from unittest import mock
 
 import ddt
-import mock
 import sqlalchemy.exc
 
 from rally.cli import cliutils
diff --git a/tests/unit/cli/test_envutils.py b/tests/unit/cli/test_envutils.py
index 5fef28cb91..c79c4b649a 100644
--- a/tests/unit/cli/test_envutils.py
+++ b/tests/unit/cli/test_envutils.py
@@ -13,10 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import io
 import os
-
-import mock
-from six import moves
+from unittest import mock
 
 from rally.cli import envutils
 from rally import exceptions
@@ -34,7 +33,7 @@ class EnvUtilsTestCase(test.TestCase):
             pass
 
         with mock.patch("sys.stdout",
-                        new_callable=moves.StringIO) as mock_stdout:
+                        new_callable=io.StringIO) as mock_stdout:
             test_function()
             self.assertEqual("Missing argument: --test_missing_arg\n",
                              mock_stdout.getvalue())
diff --git a/tests/unit/common/db/test_api.py b/tests/unit/common/db/test_api.py
index 5143bfd353..498395979c 100644
--- a/tests/unit/common/db/test_api.py
+++ b/tests/unit/common/db/test_api.py
@@ -16,9 +16,7 @@
 """Tests for db.api layer."""
 
 import datetime as dt
-
-import mock
-from six import moves
+from unittest import mock
 
 from rally.common import db
 from rally import consts
@@ -122,12 +120,12 @@ class TasksTestCase(test.DBTestCase):
 
     def test_task_list(self):
         INIT = consts.TaskStatus.INIT
-        task_init = sorted(self._create_task()["uuid"] for i in moves.range(3))
+        task_init = sorted(self._create_task()["uuid"] for i in range(3))
         FINISHED = consts.TaskStatus.FINISHED
         task_finished = sorted(self._create_task(
             {"status": FINISHED,
              "env_uuid": self.env["uuid"]}
-        )["uuid"] for i in moves.range(3))
+        )["uuid"] for i in range(3))
 
         task_all = sorted(task_init + task_finished)
 
diff --git a/tests/unit/common/db/test_migrations.py b/tests/unit/common/db/test_migrations.py
index e0eab396fa..db36e3f35a 100644
--- a/tests/unit/common/db/test_migrations.py
+++ b/tests/unit/common/db/test_migrations.py
@@ -22,11 +22,11 @@ import iso8601
 import json
 import pickle
 import pprint
+from unittest import mock
 import uuid
 
 import alembic
 import jsonschema
-import mock
 from oslo_db.sqlalchemy import test_migrations
 from oslo_db.sqlalchemy import utils as db_utils
 import sqlalchemy as sa
diff --git a/tests/unit/common/db/test_types.py b/tests/unit/common/db/test_types.py
index 800e0b0122..040e64f0ad 100644
--- a/tests/unit/common/db/test_types.py
+++ b/tests/unit/common/db/test_types.py
@@ -14,7 +14,8 @@
 
 """Tests for custom sqlalchemy types"""
 
-import mock
+from unittest import mock
+
 import sqlalchemy as sa
 
 from rally.common.db import sa_types
diff --git a/tests/unit/common/io/test_junit.py b/tests/unit/common/io/test_junit.py
index 2ab6dcf14f..e63389334b 100644
--- a/tests/unit/common/io/test_junit.py
+++ b/tests/unit/common/io/test_junit.py
@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from rally.common.io import junit
 from tests.unit import test
diff --git a/tests/unit/common/io/test_subunit_v2.py b/tests/unit/common/io/test_subunit_v2.py
index 22a0927bb3..dedb051cca 100644
--- a/tests/unit/common/io/test_subunit_v2.py
+++ b/tests/unit/common/io/test_subunit_v2.py
@@ -12,8 +12,7 @@
 #    under the License.
 
 import os
-
-import mock
+from unittest import mock
 
 from rally.common.io import subunit_v2
 from tests.unit import test
diff --git a/tests/unit/common/objects/test_deploy.py b/tests/unit/common/objects/test_deploy.py
index 0f30d92c35..b146cc7d61 100644
--- a/tests/unit/common/objects/test_deploy.py
+++ b/tests/unit/common/objects/test_deploy.py
@@ -16,7 +16,7 @@
 """Tests for db.deploy layer."""
 
 import datetime as dt
-import mock
+from unittest import mock
 
 from rally.common import objects
 from rally import consts
diff --git a/tests/unit/common/objects/test_task.py b/tests/unit/common/objects/test_task.py
index 1f0ba32e44..a2f14534c8 100644
--- a/tests/unit/common/objects/test_task.py
+++ b/tests/unit/common/objects/test_task.py
@@ -17,9 +17,9 @@
 
 import collections
 import datetime as dt
+from unittest import mock
 
 import ddt
-import mock
 
 from rally.common import objects
 from rally import consts
diff --git a/tests/unit/common/objects/test_verification.py b/tests/unit/common/objects/test_verification.py
index ee7f8b8cd6..03c8d96de8 100644
--- a/tests/unit/common/objects/test_verification.py
+++ b/tests/unit/common/objects/test_verification.py
@@ -15,8 +15,7 @@
 
 import copy
 import datetime as dt
-
-import mock
+from unittest import mock
 
 from rally.common import objects
 from rally import consts
diff --git a/tests/unit/common/objects/test_verifier.py b/tests/unit/common/objects/test_verifier.py
index b4215f88ed..2d9c8a2a30 100644
--- a/tests/unit/common/objects/test_verifier.py
+++ b/tests/unit/common/objects/test_verifier.py
@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from rally.common import objects
 from rally import exceptions
diff --git a/tests/unit/common/plugin/test_discover.py b/tests/unit/common/plugin/test_discover.py
index 6a4aece5c8..5df04ecf1b 100644
--- a/tests/unit/common/plugin/test_discover.py
+++ b/tests/unit/common/plugin/test_discover.py
@@ -13,10 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
 import uuid
 
-import mock
-
 from rally.common.plugin import discover
 from tests.unit import test
 
diff --git a/tests/unit/common/test_broker.py b/tests/unit/common/test_broker.py
index e6c9d304d9..9b85677a32 100644
--- a/tests/unit/common/test_broker.py
+++ b/tests/unit/common/test_broker.py
@@ -14,8 +14,7 @@
 #    under the License.
 
 import collections
-
-import mock
+from unittest import mock
 
 from rally.common import broker
 from tests.unit import test
diff --git a/tests/unit/common/test_fileutils.py b/tests/unit/common/test_fileutils.py
index f9c84bbbd7..0394e48ae5 100644
--- a/tests/unit/common/test_fileutils.py
+++ b/tests/unit/common/test_fileutils.py
@@ -14,8 +14,7 @@
 #    under the License.
 
 import os
-
-import mock
+from unittest import mock
 
 from rally.common import fileutils
 from tests.unit import test
diff --git a/tests/unit/common/test_logging.py b/tests/unit/common/test_logging.py
index 48b0b6ab54..c0ae424b28 100644
--- a/tests/unit/common/test_logging.py
+++ b/tests/unit/common/test_logging.py
@@ -14,8 +14,7 @@
 #    under the License.
 
 import logging   # noqa
-
-import mock
+from unittest import mock
 
 from rally.common import logging as rally_logging
 from tests.unit import test
@@ -93,7 +92,7 @@ class RallyContaxtAdapterTestCase(test.TestCase):
 
         foo()
         # the number of the line which calls logging_method
-        lineno = 92
+        lineno = 91
         self.assertEqual((__file__, lineno, "logging_method()"), self.caller)
 
     @mock.patch("rally.common.logging.getLogger")
@@ -110,7 +109,7 @@ class RallyContaxtAdapterTestCase(test.TestCase):
         foo(1)
 
         # the number of the line which calls foo
-        lineno = 110
+        lineno = 109
         mock_get_logger.assert_called_once_with("%s:%s" % (__file__, lineno))
         logger = mock_get_logger.return_value
         self.assertEqual(1, logger.warning.call_count)
@@ -129,7 +128,7 @@ class RallyContaxtAdapterTestCase(test.TestCase):
         radapter.exception(Exception("!2!"))
 
         # the number of the line which calls foo
-        lineno = 129
+        lineno = 128
         mock_get_logger.assert_called_once_with("%s:%s" % (__file__, lineno))
 
         logger = mock_get_logger.return_value
@@ -146,7 +145,7 @@ class RallyContaxtAdapterTestCase(test.TestCase):
         radapter.error("foo", "bar")
 
         # the number of the line which calls foo
-        lineno = 146
+        lineno = 145
         mock_get_logger.assert_called_once_with("%s:%s" % (__file__, lineno))
 
         logger = mock_get_logger.return_value
diff --git a/tests/unit/common/test_opts.py b/tests/unit/common/test_opts.py
index 551923a61a..2008ac1f53 100644
--- a/tests/unit/common/test_opts.py
+++ b/tests/unit/common/test_opts.py
@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from rally.common import opts
 from tests.unit import test
diff --git a/tests/unit/common/test_utils.py b/tests/unit/common/test_utils.py
index 3de6a583d4..ce980adacc 100644
--- a/tests/unit/common/test_utils.py
+++ b/tests/unit/common/test_utils.py
@@ -19,9 +19,9 @@ import string
 import sys
 import threading
 import time
+from unittest import mock
 
 import ddt
-import mock
 import testtools
 
 from rally.common import utils
diff --git a/tests/unit/common/test_version.py b/tests/unit/common/test_version.py
index e368f3fefb..63e20ce94f 100644
--- a/tests/unit/common/test_version.py
+++ b/tests/unit/common/test_version.py
@@ -11,7 +11,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from rally.common import version
 from tests.unit import test
diff --git a/tests/unit/doc/utils.py b/tests/unit/doc/utils.py
index c2c33eb91f..845ee71d1d 100644
--- a/tests/unit/doc/utils.py
+++ b/tests/unit/doc/utils.py
@@ -17,7 +17,7 @@ from docutils.parsers import rst
 from docutils import utils
 import sys
 
-import mock
+from unittest import mock
 
 
 @mock.patch.object(sys, "stderr")
diff --git a/tests/unit/env/test_env_mgr.py b/tests/unit/env/test_env_mgr.py
index 2c652e7f9b..f4bad21eb4 100644
--- a/tests/unit/env/test_env_mgr.py
+++ b/tests/unit/env/test_env_mgr.py
@@ -15,8 +15,7 @@
 import copy
 import datetime as dt
 import os
-
-import mock
+from unittest import mock
 
 from rally.env import env_mgr
 from rally.env import platform
diff --git a/tests/unit/fakes.py b/tests/unit/fakes.py
index 645141e549..1aeeef94c8 100644
--- a/tests/unit/fakes.py
+++ b/tests/unit/fakes.py
@@ -15,8 +15,7 @@
 
 import itertools
 import multiprocessing
-
-import mock
+from unittest import mock
 
 from rally import api
 from rally.common import utils as rally_utils
diff --git a/tests/unit/plugins/common/contexts/test_dummy.py b/tests/unit/plugins/common/contexts/test_dummy.py
index 4c19def0c9..923d893465 100644
--- a/tests/unit/plugins/common/contexts/test_dummy.py
+++ b/tests/unit/plugins/common/contexts/test_dummy.py
@@ -12,7 +12,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-
 from rally import exceptions
 from rally.plugins.common.contexts import dummy
 from tests.unit import test
diff --git a/tests/unit/plugins/common/exporters/elastic/test_client.py b/tests/unit/plugins/common/exporters/elastic/test_client.py
index 9e1eb474cc..11881bd35e 100644
--- a/tests/unit/plugins/common/exporters/elastic/test_client.py
+++ b/tests/unit/plugins/common/exporters/elastic/test_client.py
@@ -13,8 +13,7 @@
 #    under the License.
 
 import copy
-
-import mock
+from unittest import mock
 
 from rally import exceptions
 from rally.plugins.common.exporters.elastic import client
diff --git a/tests/unit/plugins/common/exporters/elastic/test_exporter.py b/tests/unit/plugins/common/exporters/elastic/test_exporter.py
index b895a0635c..62cfc6e263 100644
--- a/tests/unit/plugins/common/exporters/elastic/test_exporter.py
+++ b/tests/unit/plugins/common/exporters/elastic/test_exporter.py
@@ -13,10 +13,10 @@
 #    under the License.
 
 import copy
+import json
+from unittest import mock
 
 import ddt
-import json
-import mock
 
 from rally import exceptions
 from rally.plugins.common.exporters.elastic import exporter as elastic
diff --git a/tests/unit/plugins/common/exporters/test_html.py b/tests/unit/plugins/common/exporters/test_html.py
index 1bb6781fde..0870937e02 100644
--- a/tests/unit/plugins/common/exporters/test_html.py
+++ b/tests/unit/plugins/common/exporters/test_html.py
@@ -13,8 +13,7 @@
 #    under the License.
 
 import os
-
-import mock
+from unittest import mock
 
 from rally.plugins.common.exporters import html
 from tests.unit import test
diff --git a/tests/unit/plugins/common/exporters/test_json_exporter.py b/tests/unit/plugins/common/exporters/test_json_exporter.py
index 4255c1069f..756372aea4 100644
--- a/tests/unit/plugins/common/exporters/test_json_exporter.py
+++ b/tests/unit/plugins/common/exporters/test_json_exporter.py
@@ -14,8 +14,7 @@
 
 import collections
 import datetime as dt
-
-import mock
+from unittest import mock
 
 from rally.common import version as rally_version
 from rally.plugins.common.exporters import json_exporter
diff --git a/tests/unit/plugins/common/exporters/test_junit.py b/tests/unit/plugins/common/exporters/test_junit.py
index 642ea9b44a..1cca1525db 100644
--- a/tests/unit/plugins/common/exporters/test_junit.py
+++ b/tests/unit/plugins/common/exporters/test_junit.py
@@ -14,8 +14,7 @@
 
 import datetime as dt
 import os
-
-import mock
+from unittest import mock
 
 from rally.plugins.common.exporters import junit
 from tests.unit import test
diff --git a/tests/unit/plugins/common/exporters/test_trends.py b/tests/unit/plugins/common/exporters/test_trends.py
index cd7c65e996..fa9dd1fe4a 100644
--- a/tests/unit/plugins/common/exporters/test_trends.py
+++ b/tests/unit/plugins/common/exporters/test_trends.py
@@ -13,8 +13,7 @@
 #    under the License.
 
 import os
-
-import mock
+from unittest import mock
 
 from rally.plugins.common.exporters import trends
 from tests.unit import test
diff --git a/tests/unit/plugins/common/hook/test_sys_call.py b/tests/unit/plugins/common/hook/test_sys_call.py
index 0c4600dfe5..4a2428fb9f 100644
--- a/tests/unit/plugins/common/hook/test_sys_call.py
+++ b/tests/unit/plugins/common/hook/test_sys_call.py
@@ -14,9 +14,9 @@
 #    under the License.
 
 import subprocess
+from unittest import mock
 
 import ddt
-import mock
 
 from rally import consts
 from rally.plugins.common.hook import sys_call
diff --git a/tests/unit/plugins/common/hook/triggers/test_event.py b/tests/unit/plugins/common/hook/triggers/test_event.py
index a3fdaaa54a..73f6b252e0 100644
--- a/tests/unit/plugins/common/hook/triggers/test_event.py
+++ b/tests/unit/plugins/common/hook/triggers/test_event.py
@@ -13,8 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
+
 import ddt
-import mock
 
 from rally.plugins.common.hook.triggers import event
 from rally.task import hook
diff --git a/tests/unit/plugins/common/hook/triggers/test_periodic.py b/tests/unit/plugins/common/hook/triggers/test_periodic.py
index dc69db57b4..bd257e1cce 100644
--- a/tests/unit/plugins/common/hook/triggers/test_periodic.py
+++ b/tests/unit/plugins/common/hook/triggers/test_periodic.py
@@ -13,8 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
+
 import ddt
-import mock
 
 from rally.plugins.common.hook.triggers import periodic
 from rally.task import hook
diff --git a/tests/unit/plugins/common/runners/test_constant.py b/tests/unit/plugins/common/runners/test_constant.py
index 64a799dee2..b339bf820b 100644
--- a/tests/unit/plugins/common/runners/test_constant.py
+++ b/tests/unit/plugins/common/runners/test_constant.py
@@ -13,8 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
+
 import ddt
-import mock
 
 from rally.plugins.common.runners import constant
 from rally.task import runner
diff --git a/tests/unit/plugins/common/runners/test_rps.py b/tests/unit/plugins/common/runners/test_rps.py
index 066a0b1a98..841954597b 100644
--- a/tests/unit/plugins/common/runners/test_rps.py
+++ b/tests/unit/plugins/common/runners/test_rps.py
@@ -13,8 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
+
 import ddt
-import mock
 
 from rally.plugins.common.runners import rps
 from rally.task import runner
diff --git a/tests/unit/plugins/common/runners/test_serial.py b/tests/unit/plugins/common/runners/test_serial.py
index 7742fc67e6..fe6f671126 100644
--- a/tests/unit/plugins/common/runners/test_serial.py
+++ b/tests/unit/plugins/common/runners/test_serial.py
@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from rally.plugins.common.runners import serial
 from tests.unit import fakes
diff --git a/tests/unit/plugins/common/scenarios/dummy/test_dummy.py b/tests/unit/plugins/common/scenarios/dummy/test_dummy.py
index 33851d6f70..dd1373e8a7 100644
--- a/tests/unit/plugins/common/scenarios/dummy/test_dummy.py
+++ b/tests/unit/plugins/common/scenarios/dummy/test_dummy.py
@@ -10,9 +10,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
 
 import ddt
-import mock
 
 from rally.plugins.common.scenarios.dummy import dummy
 from tests.unit import test
diff --git a/tests/unit/plugins/common/scenarios/requests/test_http_requests.py b/tests/unit/plugins/common/scenarios/requests/test_http_requests.py
index b0ef7ced40..00567edb48 100644
--- a/tests/unit/plugins/common/scenarios/requests/test_http_requests.py
+++ b/tests/unit/plugins/common/scenarios/requests/test_http_requests.py
@@ -10,8 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-
-import mock
+from unittest import mock
 
 from rally.plugins.common.scenarios.requests import http_requests
 from tests.unit import test
diff --git a/tests/unit/plugins/common/scenarios/requests/test_utils.py b/tests/unit/plugins/common/scenarios/requests/test_utils.py
index dcff6c92d8..9fee92d980 100644
--- a/tests/unit/plugins/common/scenarios/requests/test_utils.py
+++ b/tests/unit/plugins/common/scenarios/requests/test_utils.py
@@ -10,8 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-
-import mock
+from unittest import mock
 
 from rally.plugins.common.scenarios.requests import utils
 from tests.unit import test
diff --git a/tests/unit/plugins/common/test_types.py b/tests/unit/plugins/common/test_types.py
index 15ba517c61..3c969c8634 100644
--- a/tests/unit/plugins/common/test_types.py
+++ b/tests/unit/plugins/common/test_types.py
@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from rally import exceptions
 from rally.plugins.common import types
diff --git a/tests/unit/plugins/common/test_validators.py b/tests/unit/plugins/common/test_validators.py
index 3662a81f85..9de9bf476e 100644
--- a/tests/unit/plugins/common/test_validators.py
+++ b/tests/unit/plugins/common/test_validators.py
@@ -12,11 +12,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import ddt
-import mock
 import os
 import shutil
 import tempfile
+from unittest import mock
+
+import ddt
 
 import rally
 from rally.common.plugin import plugin
diff --git a/tests/unit/plugins/common/verification/test_reporters.py b/tests/unit/plugins/common/verification/test_reporters.py
index 8152e7823c..76e61c17cf 100644
--- a/tests/unit/plugins/common/verification/test_reporters.py
+++ b/tests/unit/plugins/common/verification/test_reporters.py
@@ -15,9 +15,9 @@
 import collections
 import datetime as dt
 import os
+from unittest import mock
 
 import ddt
-import mock
 
 from rally.common import utils
 from rally.plugins.common.verification import reporters
diff --git a/tests/unit/plugins/common/verification/test_testr.py b/tests/unit/plugins/common/verification/test_testr.py
index 76ea191fe4..c7b4a165ae 100644
--- a/tests/unit/plugins/common/verification/test_testr.py
+++ b/tests/unit/plugins/common/verification/test_testr.py
@@ -13,8 +13,7 @@
 
 import os
 import subprocess
-
-import mock
+from unittest import mock
 
 from rally import exceptions
 from rally.plugins.common.verification import testr
diff --git a/tests/unit/task/processing/test_charts.py b/tests/unit/task/processing/test_charts.py
index c150849894..6273c5a1da 100644
--- a/tests/unit/task/processing/test_charts.py
+++ b/tests/unit/task/processing/test_charts.py
@@ -14,9 +14,9 @@
 #    under the License.
 
 import collections
+from unittest import mock
 
 import ddt
-import mock
 
 from rally.common.plugin import plugin
 from rally.task.processing import charts
diff --git a/tests/unit/task/processing/test_plot.py b/tests/unit/task/processing/test_plot.py
index a1c04d2254..f7f549b6a2 100644
--- a/tests/unit/task/processing/test_plot.py
+++ b/tests/unit/task/processing/test_plot.py
@@ -15,9 +15,9 @@
 
 import collections
 import json
+from unittest import mock
 
 import ddt
-import mock
 
 from rally.task.processing import plot
 from tests.unit import test
diff --git a/tests/unit/task/test_atomic.py b/tests/unit/task/test_atomic.py
index 62ab7b0526..9606e3877d 100644
--- a/tests/unit/task/test_atomic.py
+++ b/tests/unit/task/test_atomic.py
@@ -14,8 +14,7 @@
 #    under the License.
 
 import collections
-
-import mock
+from unittest import mock
 
 from rally.task import atomic
 from tests.unit import test
diff --git a/tests/unit/task/test_context.py b/tests/unit/task/test_context.py
index 2591bb5be7..d9dc6c3825 100644
--- a/tests/unit/task/test_context.py
+++ b/tests/unit/task/test_context.py
@@ -13,8 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
+
 import ddt
-import mock
 
 from rally import exceptions
 from rally.task import context
diff --git a/tests/unit/task/test_engine.py b/tests/unit/task/test_engine.py
index 738b38777d..6e469412f2 100644
--- a/tests/unit/task/test_engine.py
+++ b/tests/unit/task/test_engine.py
@@ -17,8 +17,7 @@
 
 import collections
 import threading
-
-import mock
+from unittest import mock
 
 from rally.common import objects
 from rally import consts
diff --git a/tests/unit/task/test_exporter.py b/tests/unit/task/test_exporter.py
index 473285133b..dffeba084e 100644
--- a/tests/unit/task/test_exporter.py
+++ b/tests/unit/task/test_exporter.py
@@ -12,8 +12,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
+
 import jsonschema
-import mock
 
 from rally.task import exporter
 from tests.unit import test
diff --git a/tests/unit/task/test_hook.py b/tests/unit/task/test_hook.py
index d798f91898..95330fef63 100644
--- a/tests/unit/task/test_hook.py
+++ b/tests/unit/task/test_hook.py
@@ -15,8 +15,9 @@
 
 """Tests for HookExecutor and Hook classes."""
 
+from unittest import mock
+
 import ddt
-import mock
 
 from rally import consts
 from rally.task import hook
diff --git a/tests/unit/task/test_runner.py b/tests/unit/task/test_runner.py
index 90dcf2ab5e..d0a3c432de 100644
--- a/tests/unit/task/test_runner.py
+++ b/tests/unit/task/test_runner.py
@@ -15,9 +15,9 @@
 
 import collections
 import multiprocessing
+from unittest import mock
 
 import ddt
-import mock
 
 from rally.plugins.common.runners import serial
 from rally.task import runner
diff --git a/tests/unit/task/test_scenario.py b/tests/unit/task/test_scenario.py
index d9a9d4504f..c672b3bee4 100644
--- a/tests/unit/task/test_scenario.py
+++ b/tests/unit/task/test_scenario.py
@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from rally import exceptions
 from rally.task import context
diff --git a/tests/unit/task/test_services.py b/tests/unit/task/test_services.py
index da9f1dbb97..f873ef4382 100644
--- a/tests/unit/task/test_services.py
+++ b/tests/unit/task/test_services.py
@@ -11,7 +11,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from rally import exceptions
 from rally.task import service
diff --git a/tests/unit/task/test_sla.py b/tests/unit/task/test_sla.py
index 8374b34d27..176b10373f 100644
--- a/tests/unit/task/test_sla.py
+++ b/tests/unit/task/test_sla.py
@@ -13,8 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
+
 import ddt
-import mock
 
 from rally.common.plugin import plugin
 from rally.task import sla
diff --git a/tests/unit/task/test_task_cfg.py b/tests/unit/task/test_task_cfg.py
index 3a9dc66e34..176bef4114 100644
--- a/tests/unit/task/test_task_cfg.py
+++ b/tests/unit/task/test_task_cfg.py
@@ -13,8 +13,7 @@
 #    under the License.
 
 import collections
-
-import mock
+from unittest import mock
 
 from rally import exceptions
 from rally.task import task_cfg
diff --git a/tests/unit/task/test_types.py b/tests/unit/task/test_types.py
index 994e801dd6..c728ff16d4 100644
--- a/tests/unit/task/test_types.py
+++ b/tests/unit/task/test_types.py
@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from rally.common.plugin import plugin
 from rally.task import scenario
diff --git a/tests/unit/task/test_utils.py b/tests/unit/task/test_utils.py
index adf29e5188..e19673f922 100644
--- a/tests/unit/task/test_utils.py
+++ b/tests/unit/task/test_utils.py
@@ -15,11 +15,11 @@
 
 import collections
 import datetime as dt
+from unittest import mock
 import uuid
 
 import ddt
 from jsonschema import exceptions as schema_exceptions
-import mock
 
 from rally import exceptions
 from rally.task import utils
diff --git a/tests/unit/test.py b/tests/unit/test.py
index ac2ae7318c..8cd5159fe2 100644
--- a/tests/unit/test.py
+++ b/tests/unit/test.py
@@ -16,9 +16,9 @@
 import fixtures
 from fixtures._fixtures.tempdir import TempDir
 import os
+from unittest import mock
 import uuid
 
-import mock
 import testtools
 
 from rally.common import cfg
diff --git a/tests/unit/test_api.py b/tests/unit/test_api.py
index c70e7d38ae..204a78c714 100644
--- a/tests/unit/test_api.py
+++ b/tests/unit/test_api.py
@@ -17,9 +17,9 @@
 
 import copy
 import os
+from unittest import mock
 
 import ddt
-import mock
 
 from rally import api
 from rally.common import cfg
diff --git a/tests/unit/test_exceptions.py b/tests/unit/test_exceptions.py
index 76a9047887..3aa8728b81 100644
--- a/tests/unit/test_exceptions.py
+++ b/tests/unit/test_exceptions.py
@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from rally import exceptions
 from tests.unit import test
diff --git a/tests/unit/test_pytest_launcher.py b/tests/unit/test_pytest_launcher.py
index 2d007fbeb4..85c6ff7a45 100644
--- a/tests/unit/test_pytest_launcher.py
+++ b/tests/unit/test_pytest_launcher.py
@@ -13,8 +13,7 @@
 #    under the License.
 
 import os
-
-import mock
+from unittest import mock
 
 from tests.ci import pytest_launcher
 from tests.unit import test
diff --git a/tests/unit/test_test_mock.py b/tests/unit/test_test_mock.py
index 94417163f2..e8b81e081d 100644
--- a/tests/unit/test_test_mock.py
+++ b/tests/unit/test_test_mock.py
@@ -12,8 +12,7 @@
 
 import ast
 import sys
-
-import mock
+from unittest import mock
 
 from tests.unit import test
 from tests.unit import test_mock
diff --git a/tests/unit/utils/test_encodeutils.py b/tests/unit/utils/test_encodeutils.py
index 5730be8086..fcb3e1c823 100644
--- a/tests/unit/utils/test_encodeutils.py
+++ b/tests/unit/utils/test_encodeutils.py
@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from rally.utils import encodeutils
 from tests.unit import test
diff --git a/tests/unit/utils/test_sshutils.py b/tests/unit/utils/test_sshutils.py
index 174f5a61af..c9f5bdaeb0 100644
--- a/tests/unit/utils/test_sshutils.py
+++ b/tests/unit/utils/test_sshutils.py
@@ -16,9 +16,9 @@
 import io
 import os
 import socket
+from unittest import mock
 
 import ddt
-import mock
 import paramiko
 
 from rally import exceptions
diff --git a/tests/unit/utils/test_strutils.py b/tests/unit/utils/test_strutils.py
index c62a3494ab..2e6e95321a 100644
--- a/tests/unit/utils/test_strutils.py
+++ b/tests/unit/utils/test_strutils.py
@@ -12,10 +12,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
 import uuid
 
 import ddt
-import mock
 
 from rally.utils import strutils
 from tests.unit import test
diff --git a/tests/unit/verification/test_context.py b/tests/unit/verification/test_context.py
index bdba10859c..1494035f04 100644
--- a/tests/unit/verification/test_context.py
+++ b/tests/unit/verification/test_context.py
@@ -10,7 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from rally.verification import context
 from tests.unit import test
diff --git a/tests/unit/verification/test_manager.py b/tests/unit/verification/test_manager.py
index 0c8fd2eb6a..dc6d38f7a8 100644
--- a/tests/unit/verification/test_manager.py
+++ b/tests/unit/verification/test_manager.py
@@ -12,8 +12,7 @@
 
 import os
 import sys
-
-import mock
+from unittest import mock
 
 from rally import exceptions
 from rally.verification import manager
diff --git a/tests/unit/verification/test_reporter.py b/tests/unit/verification/test_reporter.py
index df1558a612..9bf021725e 100644
--- a/tests/unit/verification/test_reporter.py
+++ b/tests/unit/verification/test_reporter.py
@@ -12,8 +12,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
+
 import jsonschema
-import mock
 
 from rally.verification import reporter
 from tests.unit import test
diff --git a/tests/unit/verification/test_utils.py b/tests/unit/verification/test_utils.py
index 936f32e6c6..1b10edda1d 100644
--- a/tests/unit/verification/test_utils.py
+++ b/tests/unit/verification/test_utils.py
@@ -14,8 +14,7 @@
 
 import configparser
 import subprocess
-
-import mock
+from unittest import mock
 
 from rally.verification import utils
 from tests.unit import test