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/test_barbican_vault_handlers.py b/unit_tests/test_barbican_vault_handlers.py
index 944fff4..2bd19c0 100644
--- a/unit_tests/test_barbican_vault_handlers.py
+++ b/unit_tests/test_barbican_vault_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.barbican_vault_handlers as handlers
 
diff --git a/unit_tests/test_lib_charm_openstack_barbican_vault.py b/unit_tests/test_lib_charm_openstack_barbican_vault.py
index 8eee2d9..9415ef9 100644
--- a/unit_tests/test_lib_charm_openstack_barbican_vault.py
+++ b/unit_tests/test_lib_charm_openstack_barbican_vault.py
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # 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_vault_utils.py b/unit_tests/test_vault_utils.py
index 2aacb2b..b6a06e3 100644
--- a/unit_tests/test_vault_utils.py
+++ b/unit_tests/test_vault_utils.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 charm.vault_utils as vault_utils