diff --git a/muranoagent/tests/unit/executors/test_chef.py b/muranoagent/tests/unit/executors/test_chef.py
index 4254c016..ca2c42c6 100644
--- a/muranoagent/tests/unit/executors/test_chef.py
+++ b/muranoagent/tests/unit/executors/test_chef.py
@@ -12,9 +12,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
+
 import fixtures
 import json
-import mock
 from mock import ANY
 import os
 
diff --git a/muranoagent/tests/unit/executors/test_puppet.py b/muranoagent/tests/unit/executors/test_puppet.py
index d05dbac5..91b283fc 100644
--- a/muranoagent/tests/unit/executors/test_puppet.py
+++ b/muranoagent/tests/unit/executors/test_puppet.py
@@ -12,8 +12,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
+
 import fixtures
-import mock
 
 from muranoagent import bunch
 from muranoagent import exceptions as ex
diff --git a/muranoagent/tests/unit/test_app.py b/muranoagent/tests/unit/test_app.py
index ea9ed65b..a2da5fa0 100644
--- a/muranoagent/tests/unit/test_app.py
+++ b/muranoagent/tests/unit/test_app.py
@@ -12,8 +12,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from unittest import mock
+
 import fixtures
-import mock
 import ssl as ssl_module
 
 from muranoagent import app
diff --git a/muranoagent/tests/unit/test_files_manager.py b/muranoagent/tests/unit/test_files_manager.py
index 73ddc948..e42a4cca 100644
--- a/muranoagent/tests/unit/test_files_manager.py
+++ b/muranoagent/tests/unit/test_files_manager.py
@@ -12,8 +12,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import os.path
+from unittest import mock
 
 from muranoagent import bunch
 from muranoagent.common import config as cfg
diff --git a/muranoagent/tests/unit/test_script_runner.py b/muranoagent/tests/unit/test_script_runner.py
index 11093bba..cecac86c 100644
--- a/muranoagent/tests/unit/test_script_runner.py
+++ b/muranoagent/tests/unit/test_script_runner.py
@@ -13,7 +13,7 @@
 #    under the License.
 
 import git
-import mock
+from unittest import mock
 
 from muranoagent import bunch
 from muranoagent.common import config as cfg
diff --git a/test-requirements.txt b/test-requirements.txt
index 298f4f30..9b2528c1 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -4,7 +4,6 @@
 hacking>=3.0,<3.1.0 # Apache-2.0
 unittest2>=1.1.0 # BSD
 coverage>=4.5.1 # Apache-2.0
-mock>=2.0.0 # BSD
 testtools>=2.3.0 # MIT
 stestr>=2.0.0 # Apache-2.0
 oslotest>=3.3.0 # Apache-2.0