diff --git a/python-packaging.spec b/python-packaging.spec
index 1da8aaa..42f4b34 100644
--- a/python-packaging.spec
+++ b/python-packaging.spec
@@ -1,41 +1,59 @@
 %global pypi_name packaging
 
+%if 0%{?fedora}
 %global build_wheel 1
+%global with_python3 1
+%endif
 
 %global python2_wheelname %{pypi_name}-%{version}-py2.py3-none-any.whl
 %global python3_wheelname %python2_wheelname
 
 Name:           python-%{pypi_name}
 Version:        16.8
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Core utilities for Python packages
 
 License:        BSD or ASL 2.0
 URL:            https://github.com/pypa/packaging
 Source0:        https://files.pythonhosted.org/packages/source/p/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
 BuildArch:      noarch
- 
+
+# Dependencies with different names in Fedora and Epel7
+%if 0%{?fedora}
 BuildRequires:  python2-setuptools
 BuildRequires:  python2-devel
 BuildRequires:  python2-pytest
-BuildRequires:  python-pretend
 BuildRequires:  python2-pyparsing
+%else
+BuildRequires:  python-setuptools
+BuildRequires:  python-devel
+BuildRequires:  pytest
+BuildRequires:  pyparsing
+BuildRequires:  python-sphinx
+%endif
+
+BuildRequires:  python-pretend
 BuildRequires:  python-six
- 
-BuildRequires:  python3-setuptools
-BuildRequires:  python3-devel
-BuildRequires:  python3-pytest
-BuildRequires:  python3-pretend
-BuildRequires:  python3-pyparsing
-BuildRequires:  python3-six
-BuildRequires:  python3-sphinx
+
+# Build Python 3 subpackage only for Fedora
+%if 0%{?with_python3}
+BuildRequires:  python%{python3_pkgversion}-setuptools
+BuildRequires:  python%{python3_pkgversion}-devel
+BuildRequires:  python%{python3_pkgversion}-pytest
+BuildRequires:  python%{python3_pkgversion}-pretend
+BuildRequires:  python%{python3_pkgversion}-pyparsing
+BuildRequires:  python%{python3_pkgversion}-six
+BuildRequires:  python%{python3_pkgversion}-sphinx
+%endif
 
 %if 0%{?build_wheel}
 BuildRequires:  python2-pip
 BuildRequires:  python-wheel
+%if 0%{?with_python3}
 BuildRequires:  python%{python3_pkgversion}-pip
 BuildRequires:  python%{python3_pkgversion}-wheel
 %endif
+%endif
 
 %description
 python-packaging provides core utilities for Python packages like utilities for
@@ -44,27 +62,33 @@ dealing with versions, specifiers, markers etc.
 %package -n python2-%{pypi_name}
 Summary:        %{summary}
 %{?python_provide:%python_provide python2-%{pypi_name}}
- 
+
+%if 0%{?fedora}
 Requires:       python2-pyparsing
+%else
+Requires:       pyparsing
+%endif
+
 Requires:       python-six
+
 %description -n python2-%{pypi_name}
 python2-packaging provides core utilities for Python packages like utilities for
 dealing with versions, specifiers, markers etc.
 
-
-%package -n python3-%{pypi_name}
+%if 0%{?with_python3}
+%package -n python%{python3_pkgversion}-%{pypi_name}
 Summary:        %{summary}
-%{?python_provide:%python_provide python3-%{pypi_name}}
+%{?python_provide:%python_provide python%{python3_pkgversion}-%{pypi_name}}
  
-Requires:       python3-pyparsing
-Requires:       python3-six
-%description -n python3-%{pypi_name}
+Requires:       python%{python3_pkgversion}-pyparsing
+Requires:       python%{python3_pkgversion}-six
+%description -n python%{python3_pkgversion}-%{pypi_name}
 python3-packaging provides core utilities for Python packages like utilities for
 dealing with versions, specifiers, markers etc.
+%endif
 
 %package -n python-%{pypi_name}-doc
 Summary:        python-packaging documentation
-Suggests:       python3-%{pypi_name} = %{version}-%{release}
 %description -n python-%{pypi_name}-doc
 Documentation for python-packaging
 
@@ -79,13 +103,22 @@ rm -rf %{pypi_name}.egg-info
 %else
 %py2_build
 %endif
+
+%if 0%{?with_python3}
 %if 0%{?build_wheel}
 %py3_build_wheel
 %else
 %py3_build
 %endif
-# generate html docs 
+%endif
+
+# generate html docs
+%if 0%{?with_python3}
 sphinx-build-3 docs html
+%else
+sphinx-build docs html
+%endif
+
 # remove the sphinx-build leftovers
 rm -rf html/.{doctrees,buildinfo}
 # Do not bundle fonts
@@ -97,33 +130,46 @@ rm -rf html/_static/fonts/
 %else
 %py2_install
 %endif
+
+%if 0%{?with_python3}
 %if 0%{?build_wheel}
 %py3_install_wheel %{python3_wheelname}
 %else
 %py3_install
 %endif
+%endif
 
 %check
+%if 0%{?fedora}
 %{__python2} -m pytest tests/
 %{__python3} -m pytest tests/
+%else
+# Disable non-working tests in Epel7
+%{__python2} -m pytest --ignore=tests/test_requirements.py tests/
+%endif
 
 %files -n python2-%{pypi_name}
 %license LICENSE LICENSE.APACHE LICENSE.BSD
 %doc README.rst CHANGELOG.rst CONTRIBUTING.rst
 %{python2_sitelib}/%{pypi_name}/
-%{python2_sitelib}/%{pypi_name}-*.dist-info/
+%{python2_sitelib}/%{pypi_name}-*-info/
 
-%files -n python3-%{pypi_name}
+%if 0%{?with_python3}
+%files -n python%{python3_pkgversion}-%{pypi_name}
 %license LICENSE LICENSE.APACHE LICENSE.BSD
 %doc README.rst CHANGELOG.rst CONTRIBUTING.rst
 %{python3_sitelib}/%{pypi_name}/
-%{python3_sitelib}/%{pypi_name}-*.dist-info/
+%{python3_sitelib}/%{pypi_name}-*-info/
+%endif
 
 %files -n python-%{pypi_name}-doc
 %doc html
 %license LICENSE LICENSE.APACHE LICENSE.BSD
 
 %changelog
+* Wed Mar 22 2017 Lumir Balhar <lbalhar@redhat.com> - 16.8-5
+- Epel7 compatible spec/package
+
 * Mon Feb 13 2017 Charalampos Stratakis <cstratak@redhat.com> - 16.8-4
 - Rebuild as wheel