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/osci.yaml b/osci.yaml
index 1eb9e622..7d82c4c8 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -1,6 +1,6 @@
 - project:
     templates:
-      - charm-unit-jobs
+      - charm-yoga-unit-jobs
     check:
       jobs:
       - charm-build
@@ -54,10 +54,9 @@
     parent: func-target
     dependencies: &lint-jobs
         - osci-lint
-        - tox-py35
         - tox-py36
-        - tox-py37
         - tox-py38
+        - tox-py39
         - charm-build
     vars:
       tox_extra_args: bionic-train-ha-ovn
diff --git a/test-requirements.txt b/test-requirements.txt
index bb1307f5..208032f0 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 ac6cfbab..af2c9772 100644
--- a/unit_tests/__init__.py
+++ b/unit_tests/__init__.py
@@ -21,7 +21,7 @@ sys.path.append('src/lib')
 import charms_openstack.test_mocks  # noqa
 charms_openstack.test_mocks.mock_charmhelpers()
 
-import mock
+from unittest import mock
 
 
 class _fake_decorator(object):
diff --git a/unit_tests/test_lib_charm_openstack_api_crud.py b/unit_tests/test_lib_charm_openstack_api_crud.py
index 58c54025..a740cdf1 100644
--- a/unit_tests/test_lib_charm_openstack_api_crud.py
+++ b/unit_tests/test_lib_charm_openstack_api_crud.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import contextlib
-import mock
+from unittest import mock
 import subprocess
 
 import charms_openstack.test_utils as test_utils
diff --git a/unit_tests/test_lib_charm_openstack_octavia.py b/unit_tests/test_lib_charm_openstack_octavia.py
index acd976a0..8775bdeb 100644
--- a/unit_tests/test_lib_charm_openstack_octavia.py
+++ b/unit_tests/test_lib_charm_openstack_octavia.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_octavia_handlers.py b/unit_tests/test_octavia_handlers.py
index f7de9f53..25f657e8 100644
--- a/unit_tests/test_octavia_handlers.py
+++ b/unit_tests/test_octavia_handlers.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import json
-import mock
+from unittest import mock
 
 import charm.openstack.octavia as octavia
 import reactive.octavia_handlers as handlers