diff --git a/tests/0001-Fix-disabling-of-location-header-autocorrect-for-wer.patch b/tests/python-httpbin-werkzeug-2.1.patch
similarity index 100%
rename from tests/0001-Fix-disabling-of-location-header-autocorrect-for-wer.patch
rename to tests/python-httpbin-werkzeug-2.1.patch
diff --git a/tests/python-httpbin.spec b/tests/python-httpbin.spec
index 72e1165..7e7a49e 100644
--- a/tests/python-httpbin.spec
+++ b/tests/python-httpbin.spec
@@ -12,7 +12,7 @@ BuildRequires:  pyproject-rpm-macros
 
 %if 0%{?rhel} != 9
 # Wekrzeug in Fedora and EL10+ isn't compatible with our httpbin
-Patch:          0001-Fix-disabling-of-location-header-autocorrect-for-wer.patch
+Patch:          python-httpbin-werkzeug-2.1.patch
 %endif
 
 # no flask, itsdangerous, raven, werkzeug packaged for EPEL 9 yet
diff --git a/tests/0001-Remove-optional-or-unpackaged-test-deps.patch b/tests/python-setuptools-59.6.0-remove-optional-or-unpackaged-test-deps.patch
similarity index 100%
rename from tests/0001-Remove-optional-or-unpackaged-test-deps.patch
rename to tests/python-setuptools-59.6.0-remove-optional-or-unpackaged-test-deps.patch
diff --git a/tests/Remove-optional-or-unpackaged-test-deps.patch b/tests/python-setuptools-67.7.2-remove-optional-or-unpackaged-test-deps.patch
similarity index 100%
rename from tests/Remove-optional-or-unpackaged-test-deps.patch
rename to tests/python-setuptools-67.7.2-remove-optional-or-unpackaged-test-deps.patch
diff --git a/tests/python-setuptools.spec b/tests/python-setuptools.spec
index 307fbf7..fbc554b 100644
--- a/tests/python-setuptools.spec
+++ b/tests/python-setuptools.spec
@@ -14,11 +14,7 @@ URL:            https://pypi.python.org/pypi/setuptools
 Source:         %{pypi_source setuptools %{version}}
 
 # Patch from Fedora proper
-%if 0%{?rhel} != 9
-Patch:          Remove-optional-or-unpackaged-test-deps.patch
-%else
-Patch:          0001-Remove-optional-or-unpackaged-test-deps.patch
-%endif
+Patch:          python-setuptools-%{version}-remove-optional-or-unpackaged-test-deps.patch
 
 BuildArch:      noarch