diff --git a/python-mailman-hyperkitty-fix-archiver-test.patch b/python-mailman-hyperkitty-fix-archiver-test.patch
new file mode 100644
index 0000000..ace98b4
--- /dev/null
+++ b/python-mailman-hyperkitty-fix-archiver-test.patch
@@ -0,0 +1,13 @@
+Index: mailman-hyperkitty-1.2.0/mailman_hyperkitty/tests/test_archiver.py
+===================================================================
+--- mailman-hyperkitty-1.2.0.orig/mailman_hyperkitty/tests/test_archiver.py	2022-06-09 13:02:11.689258996 +0200
++++ mailman-hyperkitty-1.2.0/mailman_hyperkitty/tests/test_archiver.py	2022-06-09 13:09:00.023906415 +0200
+@@ -130,7 +130,7 @@ MIME-Version: 1.0
+ Content-Type: multipart/alternative; boundary="zzz123"
+ 
+ Ce message est au format MIME. Comme votre logiciel de courrier ne comprend
+-pas ce format, tout ou partie de ce message pourrait \xc3\xaatre illisible.
++pas ce format, tout ou partie de ce message pourrait \udcc3\udcaatre illisible.
+ 
+ --zzz123
+ Content-Type: text/plain; charset="us-ascii"
diff --git a/python-mailman-hyperkitty.changes b/python-mailman-hyperkitty.changes
index 1b7b2bd..bac685a 100644
--- a/python-mailman-hyperkitty.changes
+++ b/python-mailman-hyperkitty.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jun  9 11:11:24 UTC 2022 - Andreas Schneider <asn@cryptomilk.org>
+
+- Fix BR for mailman3 (package has been renamed)
+- Fix test_archive_message_with_surrogates
+  * Added python-mailman-hyperkitty-fix-archiver-test.patch
+
 -------------------------------------------------------------------
 Thu May 26 08:46:16 UTC 2022 - pgajdos@suse.com
 
diff --git a/python-mailman-hyperkitty.spec b/python-mailman-hyperkitty.spec
index 0519f56..fe164c6 100644
--- a/python-mailman-hyperkitty.spec
+++ b/python-mailman-hyperkitty.spec
@@ -28,6 +28,7 @@ URL:            https://gitlab.com/mailman/mailman-hyperkitty/
 Source:         https://files.pythonhosted.org/packages/source/m/mailman-hyperkitty/mailman-hyperkitty-%{version}.tar.gz
 # https://gitlab.com/mailman/mailman-hyperkitty/-/issues/28
 Patch0:         python-mailman-hyperkitty-no-mock.patch
+Patch1:         python-mailman-hyperkitty-fix-archiver-test.patch
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
@@ -37,7 +38,7 @@ Requires:       python-setuptools
 Requires:       python-zope.interface
 BuildArch:      noarch
 # SECTION test requirements
-BuildRequires:  %{python_module mailman}
+BuildRequires:  mailman3 >= 3.3.5
 BuildRequires:  %{python_module nose2}
 BuildRequires:  %{python_module requests}
 BuildRequires:  %{python_module setuptools}