diff --git a/.zuul.yaml b/.zuul.yaml
index fd20909..0eed196 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,4 +1,4 @@
 - project:
     templates:
-      - openstack-python3-charm-jobs
+      - openstack-python3-ussuri-jobs
       - openstack-cover-jobs
diff --git a/test-requirements.txt b/test-requirements.txt
index a6e51e2..3299333 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_action.py b/unit_tests/test_action.py
index ee94c66..317e3fc 100644
--- a/unit_tests/test_action.py
+++ b/unit_tests/test_action.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import json
-import mock
+import unittest.mock as mock
 import subprocess
 import sys
 
diff --git a/unit_tests/test_hacluster_hooks.py b/unit_tests/test_hacluster_hooks.py
index df7490f..ad20327 100644
--- a/unit_tests/test_hacluster_hooks.py
+++ b/unit_tests/test_hacluster_hooks.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 os
 import shutil
 import sys
diff --git a/unit_tests/test_hacluster_utils.py b/unit_tests/test_hacluster_utils.py
index 3e38a4e..0a54c5a 100644
--- a/unit_tests/test_hacluster_utils.py
+++ b/unit_tests/test_hacluster_utils.py
@@ -14,7 +14,7 @@
 
 import contextlib
 import json
-import mock
+from unittest import mock
 import os
 import re
 import shutil
diff --git a/unit_tests/test_pcmk.py b/unit_tests/test_pcmk.py
index fff34c0..a130afd 100644
--- a/unit_tests/test_pcmk.py
+++ b/unit_tests/test_pcmk.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 pcmk
 import os
 import tempfile
diff --git a/unit_tests/test_utils.py b/unit_tests/test_utils.py
index 00a14c7..b461872 100644
--- a/unit_tests/test_utils.py
+++ b/unit_tests/test_utils.py
@@ -20,8 +20,8 @@ import sys
 import yaml
 
 from contextlib import contextmanager
-from mock import patch, MagicMock
 from charmhelpers.core.unitdata import Record
+from unittest.mock import patch, MagicMock
 
 
 def load_config():