diff --git a/.zuul.yaml b/.zuul.yaml
index b3037e94..0eed1965 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,5 +1,4 @@
 - project:
     templates:
-      - python35-charm-jobs
       - openstack-python3-ussuri-jobs
       - openstack-cover-jobs
diff --git a/test-requirements.txt b/test-requirements.txt
index f853625d..0aabe171 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -13,11 +13,6 @@ setuptools<50.0.0  # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb
 
 requests>=2.18.4
 
-# Newer mock seems to have some syntax which is newer than python3.5 (e.g.
-# f'{something}'
-mock>=1.2,<4.0.0; python_version < '3.6'
-mock>=1.2; python_version >= '3.6'
-
 stestr>=2.2.0
 
 # Dependency of stestr. Workaround for
diff --git a/unit_tests/__init__.py b/unit_tests/__init__.py
index 474f81dd..2bd02ad2 100644
--- a/unit_tests/__init__.py
+++ b/unit_tests/__init__.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import sys
-import mock
+from unittest import mock
 
 # python-apt is not installed as part of test-requirements but is imported by
 # some charmhelpers modules so create a fake import.
diff --git a/unit_tests/test_actions.py b/unit_tests/test_actions.py
index f5689316..7f2d9319 100644
--- a/unit_tests/test_actions.py
+++ b/unit_tests/test_actions.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 
 mock.patch('charmhelpers.core.hookenv.status_set').start()
 with mock.patch('charmhelpers.core.hookenv.config') as config:
diff --git a/unit_tests/test_actions_openstack_upgrade.py b/unit_tests/test_actions_openstack_upgrade.py
index 054bc8d9..62aefe84 100644
--- a/unit_tests/test_actions_openstack_upgrade.py
+++ b/unit_tests/test_actions_openstack_upgrade.py
@@ -14,7 +14,7 @@
 
 import os
 
-from mock import patch
+from unittest.mock import patch
 
 os.environ['JUJU_UNIT_NAME'] = 'neutron-api'
 
diff --git a/unit_tests/test_neutron_api_context.py b/unit_tests/test_neutron_api_context.py
index c8657d3c..455a6e13 100644
--- a/unit_tests/test_neutron_api_context.py
+++ b/unit_tests/test_neutron_api_context.py
@@ -14,7 +14,7 @@
 
 import json
 
-from mock import MagicMock, patch
+from unittest.mock import MagicMock, patch
 
 import neutron_api_context as context
 import charmhelpers
diff --git a/unit_tests/test_neutron_api_hooks.py b/unit_tests/test_neutron_api_hooks.py
index ffd4b674..683bb23a 100644
--- a/unit_tests/test_neutron_api_hooks.py
+++ b/unit_tests/test_neutron_api_hooks.py
@@ -15,7 +15,7 @@
 import json
 import sys
 
-from mock import MagicMock, patch, call
+from unittest.mock import MagicMock, patch, call
 from test_utils import CharmTestCase
 
 # python-apt is not installed as part of test-requirements but is imported by
diff --git a/unit_tests/test_neutron_api_utils.py b/unit_tests/test_neutron_api_utils.py
index c5801690..26b68a51 100644
--- a/unit_tests/test_neutron_api_utils.py
+++ b/unit_tests/test_neutron_api_utils.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from mock import MagicMock, patch, call
+from unittest.mock import MagicMock, patch, call
 from collections import OrderedDict
 from copy import deepcopy
 
diff --git a/unit_tests/test_utils.py b/unit_tests/test_utils.py
index 19e5d877..f9846144 100644
--- a/unit_tests/test_utils.py
+++ b/unit_tests/test_utils.py
@@ -20,7 +20,7 @@ import unittest
 import yaml
 
 from contextlib import contextmanager
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
 
 patch('charmhelpers.contrib.openstack.utils.set_os_workload_status').start()
 patch('charmhelpers.core.hookenv.status_set').start()