diff --git a/python-virtualenv.spec b/python-virtualenv.spec
index cb6595e..649ab35 100644
--- a/python-virtualenv.spec
+++ b/python-virtualenv.spec
@@ -1,6 +1,6 @@
 Name:           python-virtualenv
 Version:        20.20.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Tool to create isolated Python environments
 
 License:        MIT
@@ -25,6 +25,14 @@ BuildRequires:  python3-pytest
 BuildRequires:  python3-pytest-mock
 BuildRequires:  python3-pytest-randomly
 BuildRequires:  python3-pytest-timeout
+
+# The .dist-info folder generated by
+# %%pyproject_buildrequires confuses
+# importlib.metadata entry points and
+# that leads to failed tests where
+# virtualenv is run via subprocess.
+# The .dist-info is removed since:
+BuildRequires:  pyproject-rpm-macros >= 1.6.3
 %endif
 
 # RPM installed wheels
@@ -98,12 +106,6 @@ sed -i "s|/usr/share/python-wheels|%{python_wheel_dir}|" src/virtualenv/util/pat
 
 %if %{with tests}
 %check
-# Existing dist-info folder confuses
-# importlib.metadata entry points and
-# that leads to failed tests where
-# virtualenv is run via subprocess.
-rm -rv *.dist-info
-
 # Skip tests which requires internet or some extra dependencies
 # Requires internet:
 # - test_download_*
@@ -133,6 +135,10 @@ PIP_CERT=/etc/pki/tls/certs/ca-bundle.crt \
 %{_bindir}/virtualenv
 
 %changelog
+* Mon Mar 06 2023 Miro Hrončok <mhroncok@redhat.com> - 20.20.0-2
+- Fix build with pyproject-rpm-macros >= 1.6.3
+- Local workaround collided with the fix there
+
 * Wed Mar 01 2023 Lumír Balhar <lbalhar@redhat.com> - 20.20.0-1
 - Update to 20.20.0 (rhbz#2174221)