diff --git a/.zuul.yaml b/.zuul.yaml
index 4434ea0..0eed196 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,4 +1,4 @@
 - project:
     templates:
-      - python36-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/__init__.py b/unit_tests/__init__.py
index a532e40..e19fb4f 100644
--- a/unit_tests/__init__.py
+++ b/unit_tests/__init__.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 sys
 
 sys.path.append('src')
diff --git a/unit_tests/test_lib_charm_openstack_glance_retrofitter.py b/unit_tests/test_lib_charm_openstack_glance_retrofitter.py
index 54888af..3ef5906 100644
--- a/unit_tests/test_lib_charm_openstack_glance_retrofitter.py
+++ b/unit_tests/test_lib_charm_openstack_glance_retrofitter.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 charms_openstack.test_utils as test_utils
 
diff --git a/unit_tests/test_lib_charm_openstack_octavia_diskimage_retrofit.py b/unit_tests/test_lib_charm_openstack_octavia_diskimage_retrofit.py
index 604865f..87b2031 100644
--- a/unit_tests/test_lib_charm_openstack_octavia_diskimage_retrofit.py
+++ b/unit_tests/test_lib_charm_openstack_octavia_diskimage_retrofit.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 os
 import subprocess
 
diff --git a/unit_tests/test_reactive_octavia_diskimage_retrofit_handlers.py b/unit_tests/test_reactive_octavia_diskimage_retrofit_handlers.py
index 72b5495..54f0954 100644
--- a/unit_tests/test_reactive_octavia_diskimage_retrofit_handlers.py
+++ b/unit_tests/test_reactive_octavia_diskimage_retrofit_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.octavia_diskimage_retrofit_handlers as handlers