diff --git a/translator/hot/tosca/tests/test_tosca_compute.py b/translator/hot/tosca/tests/test_tosca_compute.py
index 09761ecf..661f1204 100644
--- a/translator/hot/tosca/tests/test_tosca_compute.py
+++ b/translator/hot/tosca/tests/test_tosca_compute.py
@@ -10,7 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
+from unittest import mock
 
 from toscaparser.nodetemplate import NodeTemplate
 from toscaparser.tests.base import TestCase
diff --git a/translator/osc/v1/tests/fakes.py b/translator/osc/v1/tests/fakes.py
index 3bab0b76..5cb9f215 100644
--- a/translator/osc/v1/tests/fakes.py
+++ b/translator/osc/v1/tests/fakes.py
@@ -11,8 +11,7 @@
 #   under the License.
 
 import sys
-
-import mock
+from unittest import mock
 
 
 class FakeApp(object):
diff --git a/translator/osc/v1/tests/test_translate.py b/translator/osc/v1/tests/test_translate.py
index 6a5f1157..67bcf9cf 100644
--- a/translator/osc/v1/tests/test_translate.py
+++ b/translator/osc/v1/tests/test_translate.py
@@ -10,8 +10,8 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 
-import mock
 import testtools
+from unittest import mock
 
 try:
     from StringIO import StringIO
diff --git a/translator/tests/test_conf.py b/translator/tests/test_conf.py
index ec5aa48c..0266fad1 100644
--- a/translator/tests/test_conf.py
+++ b/translator/tests/test_conf.py
@@ -10,8 +10,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mock
 import os
+from unittest import mock
 
 from translator.conf.config import ConfigProvider as translatorConfig
 from translator.tests.base import TestCase
diff --git a/translator/tests/test_shell.py b/translator/tests/test_shell.py
index c4570cac..58757e9d 100644
--- a/translator/tests/test_shell.py
+++ b/translator/tests/test_shell.py
@@ -12,10 +12,10 @@
 
 
 import json
-import mock
 import os
 import shutil
 import tempfile
+from unittest import mock
 
 from toscaparser.common import exception
 from toscaparser.utils.gettextutils import _