diff --git a/.zuul.yaml b/.zuul.yaml
index 34184f1..fd189e2 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,4 +1,3 @@
 - project:
     templates:
-      - python35-charm-jobs
       - openstack-python3-ussuri-jobs
diff --git a/test-requirements.txt b/test-requirements.txt
index f853625..0d12fc2 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -12,12 +12,6 @@ cffi==1.14.6; python_version < '3.6'  # cffi 1.15.0 drops support for py35.
 setuptools<50.0.0  # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
 
 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/test_ceph.py b/unit_tests/test_ceph.py
index bd8d709..211c61b 100644
--- a/unit_tests/test_ceph.py
+++ b/unit_tests/test_ceph.py
@@ -2,7 +2,7 @@ import collections
 import subprocess
 import unittest
 
-import mock
+from unittest import mock
 
 import ceph
 
diff --git a/unit_tests/test_ceph_hooks.py b/unit_tests/test_ceph_hooks.py
index 63dccdb..2af966a 100644
--- a/unit_tests/test_ceph_hooks.py
+++ b/unit_tests/test_ceph_hooks.py
@@ -1,4 +1,4 @@
-import mock
+from unittest import mock
 import sys
 
 # python-apt is not installed as part of test-requirements but is imported by
diff --git a/unit_tests/test_utils.py b/unit_tests/test_utils.py
index ed0e7a1..372b2d8 100644
--- a/unit_tests/test_utils.py
+++ b/unit_tests/test_utils.py
@@ -4,7 +4,7 @@ import os
 import yaml
 
 from contextlib import contextmanager
-from mock import patch, MagicMock
+from unittest.mock import patch, MagicMock
 
 
 def load_config():