diff -upr HyperKitty-1.3.5.orig/hyperkitty/tests/commands/test_import.py HyperKitty-1.3.5/hyperkitty/tests/commands/test_import.py
--- HyperKitty-1.3.5.orig/hyperkitty/tests/commands/test_import.py	2022-05-26 11:03:59.294617461 +0200
+++ HyperKitty-1.3.5/hyperkitty/tests/commands/test_import.py	2022-05-26 11:03:59.326617643 +0200
@@ -15,7 +15,7 @@ from django.core.management import call_
 from django.db import DEFAULT_DB_ALIAS
 from django.utils.timezone import utc
 
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 
 from hyperkitty.lib.incoming import add_to_list
 from hyperkitty.management.commands.hyperkitty_import import Command
diff -upr HyperKitty-1.3.5.orig/hyperkitty/tests/commands/test_mailman_sync.py HyperKitty-1.3.5/hyperkitty/tests/commands/test_mailman_sync.py
--- HyperKitty-1.3.5.orig/hyperkitty/tests/commands/test_mailman_sync.py	2022-05-26 11:03:59.294617461 +0200
+++ HyperKitty-1.3.5/hyperkitty/tests/commands/test_mailman_sync.py	2022-05-26 11:03:59.326617643 +0200
@@ -22,7 +22,7 @@
 
 from django.core.management import call_command
 
-from mock import patch
+from unittest.mock import patch
 
 from hyperkitty.tests.utils import TestCase
 
diff -upr HyperKitty-1.3.5.orig/hyperkitty/tests/lib/test_incoming.py HyperKitty-1.3.5/hyperkitty/tests/lib/test_incoming.py
--- HyperKitty-1.3.5.orig/hyperkitty/tests/lib/test_incoming.py	2022-05-26 11:03:59.294617461 +0200
+++ HyperKitty-1.3.5/hyperkitty/tests/lib/test_incoming.py	2022-05-26 11:03:59.326617643 +0200
@@ -30,7 +30,7 @@ from django.core.cache import cache
 from django.db import DataError, IntegrityError
 from django.utils import timezone
 
-import mock
+from unittest import mock
 
 from hyperkitty.lib.incoming import DuplicateMessage, add_to_list
 from hyperkitty.lib.utils import get_message_id_hash
diff -upr HyperKitty-1.3.5.orig/hyperkitty/tests/lib/test_mailman.py HyperKitty-1.3.5/hyperkitty/tests/lib/test_mailman.py
--- HyperKitty-1.3.5.orig/hyperkitty/tests/lib/test_mailman.py	2022-05-26 11:03:59.294617461 +0200
+++ HyperKitty-1.3.5/hyperkitty/tests/lib/test_mailman.py	2022-05-26 11:03:59.326617643 +0200
@@ -26,7 +26,7 @@ from django.contrib.auth.models import U
 from django.core.cache import cache
 
 from django_mailman3.tests.utils import FakeMMList, FakeMMPage
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 
 from hyperkitty.lib import mailman
 from hyperkitty.models import MailingList, Sender
diff -upr HyperKitty-1.3.5.orig/hyperkitty/tests/lib/test_posting.py HyperKitty-1.3.5/hyperkitty/tests/lib/test_posting.py
--- HyperKitty-1.3.5.orig/hyperkitty/tests/lib/test_posting.py	2022-05-26 11:03:59.294617461 +0200
+++ HyperKitty-1.3.5/hyperkitty/tests/lib/test_posting.py	2022-05-26 11:03:59.326617643 +0200
@@ -28,7 +28,7 @@ from django.core import mail
 from django.test.client import RequestFactory
 
 from django_mailman3.tests.utils import FakeMMList, FakeMMMember
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 
 from hyperkitty.lib import posting
 from hyperkitty.models import MailingList
diff -upr HyperKitty-1.3.5.orig/hyperkitty/tests/_test_caching.py HyperKitty-1.3.5/hyperkitty/tests/_test_caching.py
--- HyperKitty-1.3.5.orig/hyperkitty/tests/_test_caching.py	2022-05-26 11:03:59.294617461 +0200
+++ HyperKitty-1.3.5/hyperkitty/tests/_test_caching.py	2022-05-26 11:03:59.326617643 +0200
@@ -8,7 +8,7 @@ from urllib.error import HTTPError
 
 from mailman.email.message import Message
 from mailman.interfaces.archiver import ArchivePolicy
-from mock import Mock
+from unittest.mock import Mock
 
 
 #import kittystore.utils
diff -upr HyperKitty-1.3.5.orig/hyperkitty/tests/test_signals.py HyperKitty-1.3.5/hyperkitty/tests/test_signals.py
--- HyperKitty-1.3.5.orig/hyperkitty/tests/test_signals.py	2022-05-26 11:03:59.294617461 +0200
+++ HyperKitty-1.3.5/hyperkitty/tests/test_signals.py	2022-05-26 11:03:59.326617643 +0200
@@ -21,7 +21,7 @@
 #
 
 from django_mailman3.signals import mailinglist_created, mailinglist_modified
-from mock import patch
+from unittest.mock import patch
 
 from hyperkitty.tests.utils import TestCase
 
diff -upr HyperKitty-1.3.5.orig/hyperkitty/tests/test_tasks.py HyperKitty-1.3.5/hyperkitty/tests/test_tasks.py
--- HyperKitty-1.3.5.orig/hyperkitty/tests/test_tasks.py	2022-05-26 11:03:59.294617461 +0200
+++ HyperKitty-1.3.5/hyperkitty/tests/test_tasks.py	2022-05-26 11:03:59.330617665 +0200
@@ -22,7 +22,7 @@
 
 from email.message import EmailMessage
 
-from mock import patch
+from unittest.mock import patch
 
 from hyperkitty import tasks
 from hyperkitty.lib.incoming import add_to_list
diff -upr HyperKitty-1.3.5.orig/hyperkitty/tests/utils.py HyperKitty-1.3.5/hyperkitty/tests/utils.py
--- HyperKitty-1.3.5.orig/hyperkitty/tests/utils.py	2022-05-26 11:03:59.294617461 +0200
+++ HyperKitty-1.3.5/hyperkitty/tests/utils.py	2022-05-26 11:03:59.330617665 +0200
@@ -37,7 +37,7 @@ from django.test import TestCase as Djan
 from django.test import TransactionTestCase
 
 import mailmanclient
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 
 
 def setup_logging(tmpdir):
diff -upr HyperKitty-1.3.5.orig/hyperkitty/tests/views/test_accounts.py HyperKitty-1.3.5/hyperkitty/tests/views/test_accounts.py
--- HyperKitty-1.3.5.orig/hyperkitty/tests/views/test_accounts.py	2022-05-26 11:03:59.294617461 +0200
+++ HyperKitty-1.3.5/hyperkitty/tests/views/test_accounts.py	2022-05-26 11:03:59.330617665 +0200
@@ -31,7 +31,7 @@ from django.contrib.auth.models import U
 
 from allauth.account.models import EmailAddress
 from django_mailman3.tests.utils import FakeMMList, FakeMMMember
-from mock import Mock
+from unittest.mock import Mock
 
 from hyperkitty.lib.incoming import add_to_list
 from hyperkitty.lib.utils import get_message_id_hash
diff -upr HyperKitty-1.3.5.orig/hyperkitty/tests/views/test_archives.py HyperKitty-1.3.5/hyperkitty/tests/views/test_archives.py
--- HyperKitty-1.3.5.orig/hyperkitty/tests/views/test_archives.py	2022-05-26 11:03:59.294617461 +0200
+++ HyperKitty-1.3.5/hyperkitty/tests/views/test_archives.py	2022-05-26 11:03:59.330617665 +0200
@@ -34,7 +34,7 @@ from django.core.cache import cache
 
 from bs4 import BeautifulSoup
 from django_mailman3.tests.utils import FakeMMList, FakeMMMember
-from mock import Mock
+from unittest.mock import Mock
 
 from hyperkitty.lib.incoming import add_to_list
 from hyperkitty.models import (
diff -upr HyperKitty-1.3.5.orig/hyperkitty/tests/views/test_index.py HyperKitty-1.3.5/hyperkitty/tests/views/test_index.py
--- HyperKitty-1.3.5.orig/hyperkitty/tests/views/test_index.py	2022-05-26 11:03:59.294617461 +0200
+++ HyperKitty-1.3.5/hyperkitty/tests/views/test_index.py	2022-05-26 11:03:59.330617665 +0200
@@ -31,7 +31,7 @@ from django.test import override_setting
 
 from django_mailman3.models import MailDomain
 from django_mailman3.tests.utils import FakeMMList, FakeMMMember
-from mock import Mock
+from unittest.mock import Mock
 
 from hyperkitty.lib.incoming import add_to_list
 from hyperkitty.models import ArchivePolicy, MailingList
diff -upr HyperKitty-1.3.5.orig/hyperkitty/tests/views/test_mailman.py HyperKitty-1.3.5/hyperkitty/tests/views/test_mailman.py
--- HyperKitty-1.3.5.orig/hyperkitty/tests/views/test_mailman.py	2022-05-26 11:03:59.294617461 +0200
+++ HyperKitty-1.3.5/hyperkitty/tests/views/test_mailman.py	2022-05-26 11:03:59.330617665 +0200
@@ -27,7 +27,7 @@ from io import BytesIO
 from django.conf import settings
 from django.contrib.sites.models import Site
 
-import mock
+from unittest import mock
 from django_mailman3.models import MailDomain
 
 from hyperkitty.models.email import Email
diff -upr HyperKitty-1.3.5.orig/hyperkitty/tests/views/test_message.py HyperKitty-1.3.5/hyperkitty/tests/views/test_message.py
--- HyperKitty-1.3.5.orig/hyperkitty/tests/views/test_message.py	2022-05-26 11:03:59.294617461 +0200
+++ HyperKitty-1.3.5/hyperkitty/tests/views/test_message.py	2022-05-26 11:03:59.330617665 +0200
@@ -36,7 +36,7 @@ from django.utils import timezone
 from allauth.account.models import EmailAddress
 from django_gravatar.helpers import get_gravatar_url
 from django_mailman3.tests.utils import get_flash_messages
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 
 from hyperkitty.lib.incoming import add_to_list
 from hyperkitty.lib.utils import get_message_id_hash
diff -upr HyperKitty-1.3.5.orig/hyperkitty/tests/views/test_search.py HyperKitty-1.3.5/hyperkitty/tests/views/test_search.py
--- HyperKitty-1.3.5.orig/hyperkitty/tests/views/test_search.py	2022-05-26 11:03:59.294617461 +0200
+++ HyperKitty-1.3.5/hyperkitty/tests/views/test_search.py	2022-05-26 11:03:59.330617665 +0200
@@ -26,7 +26,7 @@ from django.contrib.auth.models import U
 
 from django_mailman3.tests.utils import FakeMMList, FakeMMMember
 from haystack import DEFAULT_ALIAS
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 
 from hyperkitty.lib.incoming import add_to_list
 from hyperkitty.models import ArchivePolicy, MailingList
diff -upr HyperKitty-1.3.5.orig/hyperkitty/tests/views/test_thread.py HyperKitty-1.3.5/hyperkitty/tests/views/test_thread.py
--- HyperKitty-1.3.5.orig/hyperkitty/tests/views/test_thread.py	2022-05-26 11:03:59.294617461 +0200
+++ HyperKitty-1.3.5/hyperkitty/tests/views/test_thread.py	2022-05-26 11:03:59.330617665 +0200
@@ -31,7 +31,7 @@ from django.test import override_setting
 
 from bs4 import BeautifulSoup
 from django_mailman3.tests.utils import get_flash_messages
-from mock import patch
+from unittest.mock import patch
 
 from hyperkitty.lib.incoming import add_to_list
 from hyperkitty.models import Email, MailingList, Tag, Tagging, Thread