diff --git a/python-tomli-w.spec b/python-tomli-w.spec
index 79dc155..71860b8 100644
--- a/python-tomli-w.spec
+++ b/python-tomli-w.spec
@@ -1,16 +1,8 @@
-%bcond_with bootstrap
-
-%if %{with bootstrap}
-%bcond_with check
-%else
 %bcond_without check
-%endif
-
-%global modname tomli_w
 
 Name:           python-tomli-w
 Version:        0.4.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A Python library for writing TOML
 
 License:        MIT
@@ -35,14 +27,17 @@ Summary:        %{summary}
 
 %prep
 %autosetup -p1 -n tomli-w-%{version}
+# Measuring coverage is discouraged in Python packaging guidelines:
+sed -i '/pytest-cov/d' tests/requirements.txt
+# This testing dependency is optional and we don't have it in (EP)EL,
+# it has many missing transitive dependencies that we don't want to maintain
+%if 0%{?rhel}
+sed -i '/pytest-randomly/d' tests/requirements.txt
+%endif
 
 
 %generate_buildrequires
-%if %{with check}
-%pyproject_buildrequires -t
-%else
-%pyproject_buildrequires
-%endif
+%pyproject_buildrequires %{?with_check:-t}
 
 
 %build
@@ -51,15 +46,13 @@ Summary:        %{summary}
 
 %install
 %pyproject_install
-%pyproject_save_files %{modname}
+%pyproject_save_files tomli_w
 
 
 %check
+%pyproject_check_import tomli_w
 %if %{with check}
 %tox
-%else
-# no %%pyproject_check_import on EL9
-%py3_check_import %{modname}
 %endif
 
 
@@ -70,6 +63,9 @@ Summary:        %{summary}
 
 
 %changelog
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Thu Jan 20 2022 Michel Alexandre Salim <salimma@fedoraproject.org> - 0.4.0-2
 - Add boostrap and check toggles to ease bootstrapping new EPEL releases