diff --git a/python-acme.spec b/python-acme.spec
index 3306bbc..4f6c811 100644
--- a/python-acme.spec
+++ b/python-acme.spec
@@ -30,9 +30,7 @@ Source2:        gpg-A2CFB51FA275A7286234E7B24D17C995CD9775F2.gpg
 
 # When running tests argparse is not recognised as provided by core
 
-%if 0%{?rhel} && 0%{?rhel} == 7
 Patch0:         epel7-setup.patch
-%endif
 # https://github.com/certbot/certbot/issues/6604
 # also: https://github.com/certbot/certbot/issues/6604
 Patch1:         python-acme-remove-mock-runtime-dependency.patch
@@ -177,7 +175,11 @@ Documentation for the ACME python libraries
 
 %prep
 %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
-%autosetup -p1 -n %{srcname}-%{version}
+%setup -n %{srcname}-%{version}
+%if 0%{?rhel} && 0%{?rhel} == 7
+%patch0 -p1
+%endif
+%patch1 -p1
 # Remove bundled egg-info
 rm -rf %{srcname}.egg-info