diff --git a/.zuul.yaml b/.zuul.yaml
index b3037e9..0eed196 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 bb1307f..208032f 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -28,11 +28,6 @@ oslo.utils<=3.41.0;python_version<'3.6'
 requests>=2.18.4
 charms.reactive
 
-# 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'
-
 nose>=1.3.7
 coverage>=3.6
 git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
diff --git a/unit_tests/test_nova_cell_controller_handlers.py b/unit_tests/test_nova_cell_controller_handlers.py
index 04c2f3e..56e02b2 100644
--- a/unit_tests/test_nova_cell_controller_handlers.py
+++ b/unit_tests/test_nova_cell_controller_handlers.py
@@ -15,7 +15,7 @@
 from __future__ import absolute_import
 from __future__ import print_function
 
-import mock
+from unittest import mock
 
 import reactive.nova_cell_controller_handlers as handlers