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/__init__.py b/unit_tests/__init__.py
index ade4a53..44ddef5 100644
--- a/unit_tests/__init__.py
+++ b/unit_tests/__init__.py
@@ -1,6 +1,6 @@
 # unit tests
 
-import mock
+from unittest import mock
 import sys
 
 sys.path.append('src')
diff --git a/unit_tests/test_lib_charm_vault.py b/unit_tests/test_lib_charm_vault.py
index 0e5580f..d927c0f 100644
--- a/unit_tests/test_lib_charm_vault.py
+++ b/unit_tests/test_lib_charm_vault.py
@@ -1,4 +1,4 @@
-import mock
+from unittest import mock
 from unittest.mock import patch
 
 import lib.charm.vault as vault
diff --git a/unit_tests/test_lib_charm_vault_pki.py b/unit_tests/test_lib_charm_vault_pki.py
index 73db5d8..5b06e22 100644
--- a/unit_tests/test_lib_charm_vault_pki.py
+++ b/unit_tests/test_lib_charm_vault_pki.py
@@ -1,4 +1,4 @@
-import mock
+from unittest import mock
 from unittest.mock import patch
 
 import hvac
diff --git a/unit_tests/test_reactive_vault_handlers.py b/unit_tests/test_reactive_vault_handlers.py
index b740948..1945b08 100644
--- a/unit_tests/test_reactive_vault_handlers.py
+++ b/unit_tests/test_reactive_vault_handlers.py
@@ -1,4 +1,4 @@
-import mock
+from unittest import mock
 from unittest.mock import patch, call
 
 import charms.reactive
diff --git a/unit_tests/test_utils.py b/unit_tests/test_utils.py
index 4d654bc..86607ce 100644
--- a/unit_tests/test_utils.py
+++ b/unit_tests/test_utils.py
@@ -1,4 +1,4 @@
-import mock
+from unittest import mock
 import unittest