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 f853625..0aabe17 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -13,11 +13,6 @@ setuptools<50.0.0  # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb
 
 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_glance_simplestreams_sync.py b/unit_tests/test_glance_simplestreams_sync.py
index fb0aa28..07d22ee 100644
--- a/unit_tests/test_glance_simplestreams_sync.py
+++ b/unit_tests/test_glance_simplestreams_sync.py
@@ -17,7 +17,7 @@ limitations under the License.
 '''
 
 import files.glance_simplestreams_sync as gss
-import mock
+import unittest.mock as mock
 import unittest
 
 from keystoneclient import exceptions as keystone_exceptions
diff --git a/unit_tests/test_hooks.py b/unit_tests/test_hooks.py
index 5256d97..b0beb77 100644
--- a/unit_tests/test_hooks.py
+++ b/unit_tests/test_hooks.py
@@ -1,5 +1,5 @@
 import base64
-import mock
+from unittest import mock
 import os
 import shutil
 import tempfile
diff --git a/unit_tests/test_utils.py b/unit_tests/test_utils.py
index 9c21f04..d2aac18 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():