diff --git a/disable-flake.patch b/disable-flake-and-cov.patch
similarity index 86%
rename from disable-flake.patch
rename to disable-flake-and-cov.patch
index 66d6de0..be4ac53 100644
--- a/disable-flake.patch
+++ b/disable-flake-and-cov.patch
@@ -7,4 +7,4 @@ index 098f636..0ccb9dc 100644
  
  [tool:pytest]
 -addopts = -vv --cov=rpmlint -n auto --flake8
-+addopts = -vv --cov=rpmlint -n auto
++addopts = -vv -n auto
diff --git a/rpmlint.changes b/rpmlint.changes
index 62ed643..aed18d5 100644
--- a/rpmlint.changes
+++ b/rpmlint.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Aug 18 21:26:31 UTC 2022 - Ben Greiner <code@bnavigator.de>
+
+- Enhance disable-flake.patch to disable-flake-and-cov.patch
+- Reflect the requirements from setup.py in the rpm requirements:
+  Use tomli until we have python3 = 3.11
+
 -------------------------------------------------------------------
 Thu Aug 18 15:55:46 UTC 2022 - mliska@suse.cz
 
diff --git a/rpmlint.spec b/rpmlint.spec
index de80788..f969d7e 100644
--- a/rpmlint.spec
+++ b/rpmlint.spec
@@ -29,8 +29,9 @@ Summary:        RPM file correctness checker
 License:        GPL-2.0-or-later
 URL:            https://github.com/rpm-software-management/rpmlint
 Source0:        rpmlint-%{version}.tar.xz
-Patch0:         disable-flake.patch
+Patch0:         disable-flake-and-cov.patch
 BuildRequires:  fdupes
+BuildRequires:  python-rpm-macros
 BuildRequires:  python3-setuptools
 BuildArch:      noarch
 %if "%{flavor}" == "test"
@@ -41,16 +42,16 @@ BuildRequires:  dash
 BuildRequires:  desktop-file-utils
 BuildRequires:  myspell-cs_CZ
 BuildRequires:  myspell-en_US
-BuildRequires:  python-rpm-macros
 BuildRequires:  python3-magic
 BuildRequires:  python3-pybeam
 BuildRequires:  python3-pyenchant
 BuildRequires:  python3-pytest
-BuildRequires:  python3-pytest-cov
 BuildRequires:  python3-pytest-xdist
 BuildRequires:  python3-pyxdg
 BuildRequires:  python3-rpm
+%if 0%{?python3_version_nodots < 311}
 BuildRequires:  python3-tomli
+%endif
 BuildRequires:  python3-tomli-w
 BuildRequires:  python3-zstandard
 BuildRequires:  xz
@@ -74,8 +75,10 @@ Requires:       python3-pybeam
 Requires:       python3-pyenchant
 Requires:       python3-pyxdg
 Requires:       python3-rpm
-Requires:       python3-toml
-Requires:       python3-xml
+%if 0%{?python3_version_nodots < 311}
+Requires:       python3-tomli
+%endif
+Requires:       python3-tomli-w
 Requires:       python3-zstandard
 Requires:       rpm-build
 %endif