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/unit_tests/test_aodh_handlers.py b/unit_tests/test_aodh_handlers.py
index c356503..deba24b 100644
--- a/unit_tests/test_aodh_handlers.py
+++ b/unit_tests/test_aodh_handlers.py
@@ -14,8 +14,9 @@
 
 import unittest
 
-import mock
 import charms_openstack.test_utils as test_utils
+from unittest import mock
+
 import reactive.aodh_handlers as handlers
 
 
diff --git a/unit_tests/test_lib_charm_openstack_aodh.py b/unit_tests/test_lib_charm_openstack_aodh.py
index 4ee95fd..fb4d6d9 100644
--- a/unit_tests/test_lib_charm_openstack_aodh.py
+++ b/unit_tests/test_lib_charm_openstack_aodh.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.openstack.aodh as aodh