diff --git a/.zuul.yaml b/.zuul.yaml
index 7051aee..fd189e2 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,3 +1,3 @@
 - project:
     templates:
-      - python35-charm-jobs
+      - openstack-python3-ussuri-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_lib_charm_openstack_masakari.py b/unit_tests/test_lib_charm_openstack_masakari.py
index 7f2ffd8..23b1c87 100644
--- a/unit_tests/test_lib_charm_openstack_masakari.py
+++ b/unit_tests/test_lib_charm_openstack_masakari.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
 
 import charmhelpers
 
diff --git a/unit_tests/test_masakari_handlers.py b/unit_tests/test_masakari_handlers.py
index 81aa315..780390d 100644
--- a/unit_tests/test_masakari_handlers.py
+++ b/unit_tests/test_masakari_handlers.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
 
 import reactive.masakari_handlers as handlers