diff --git a/python-click.spec b/python-click.spec
index eefa004..be00609 100644
--- a/python-click.spec
+++ b/python-click.spec
@@ -28,10 +28,12 @@ comes with good defaults out of the box.
 Summary:        %{summary}
 %{?python_provide:%python_provide python2-%{pypi_name}}
 BuildRequires:  python2-devel
-BuildRequires:  python%{?fedora:2}-setuptools
-%if %{undefined rhel}
+%if ! (0%{?rhel} && 0%{?rhel} <= 7)
+BuildRequires:  python2-setuptools
 # pytest in base RHEL is too old, we'll skip the tests there
 BuildRequires:  python2-pytest >= 2.8
+%else
+BuildRequires:  python-setuptools
 %endif
 
 %description -n python2-%{pypi_name} %{_description}
@@ -63,7 +65,7 @@ Python 3 version.
 %check
 export PYTHONPATH=$(pwd)
 export LC_ALL=en_US.UTF-8
-%if %{undefined rhel}
+%if ! (0%{?rhel} && 0%{?rhel} <= 7)
 # pytest in base RHEL is too old, we'll skip the tests there
 py.test-%{python2_version} tests --tb=long --verbose
 %endif
@@ -82,6 +84,9 @@ py.test-%{python3_version} tests --tb=long --verbose
 %{python3_sitelib}/%{pypi_name}/
 
 %changelog
+* Thu Oct 12 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 6.7-6
+- Fixup EPEL packaging
+
 * Thu Oct 12 2017 Carl George <carl@george.computer> - 6.7-6
 - Add EPEL compatibility