diff --git a/python-ZEO-rpmlintrc b/python-ZEO-rpmlintrc
deleted file mode 100644
index 0046e59..0000000
--- a/python-ZEO-rpmlintrc
+++ /dev/null
@@ -1,2 +0,0 @@
-# these are only shipped for testing purposes
-addFilter(".*ZEO/tests/.*pem$")
diff --git a/python-ZEO.changes b/python-ZEO.changes
index e2b4b3c..afa85c8 100644
--- a/python-ZEO.changes
+++ b/python-ZEO.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Feb 28 14:09:54 UTC 2022 - Matej Cepl <mcepl@suse.com>
+
+- Set ZEO4_SERVER env. variable to skip expected failing tests.
+
 -------------------------------------------------------------------
 Fri Sep 24 09:30:12 UTC 2021 - pgajdos@suse.com
 
diff --git a/python-ZEO.spec b/python-ZEO.spec
index 822de20..f1fac30 100644
--- a/python-ZEO.spec
+++ b/python-ZEO.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-ZEO
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 # Copyright (c) 2013 LISA GmbH, Bingen, Germany.
 #
 # All modifications and additions to the file contributed by third parties
@@ -26,9 +26,10 @@ Summary:        Client-Server storage implementation for ZODB
 License:        ZPL-2.1
 URL:            https://github.com/zopefoundation/ZEO
 Source:         https://files.pythonhosted.org/packages/source/Z/ZEO/ZEO-%{version}.tar.gz
-Source99:       %{name}-rpmlintrc
 # https://github.com/zopefoundation/ZEO/issues/184
 Patch0:         python-ZEO-no-mock.patch
+# PATCH-FIX-UPSTREAM skip-failing-tests.patch gh#zopefoundation/ZEO#185 mcepl@suse.com
+Patch1:         skip-failing-tests.patch
 BuildRequires:  %{python_module ZConfig}
 BuildRequires:  %{python_module ZODB >= 5.5.1}
 BuildRequires:  %{python_module manuel}
@@ -77,7 +78,8 @@ This package contains documentation files for %{name}.
 
 %prep
 %setup -q -n ZEO-%{version}
-%patch0 -p1
+%autopatch -p1
+
 # delete backup files
 find . -name "*~" -print -delete
 # remove unwanted shebang
@@ -100,6 +102,7 @@ sed -i -e 's:msgpack < 0.6:msgpack:g' setup.py
 
 %check
 pushd src
+export ZEO4_SERVER=1
 %pyunittest -v ZEO/tests/test*.py
 
 %post
diff --git a/skip-failing-tests.patch b/skip-failing-tests.patch
new file mode 100644
index 0000000..473a0f4