diff --git a/python-f5-icontrol-rest.spec b/python-f5-icontrol-rest.spec
index c87e9bc..368a2a5 100644
--- a/python-f5-icontrol-rest.spec
+++ b/python-f5-icontrol-rest.spec
@@ -22,46 +22,37 @@ URL:            https://pypi.python.org/pypi/%{srcname}
 Source0:        https://github.com/F5Networks/%{srcname}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
 BuildArch:      noarch
+
 %if 0%{?with_python2}
 BuildRequires:  python2-devel
-%if 0%{?el6}%{?el7}
-BuildRequires:  python-setuptools
-BuildRequires:  python-requests >= 2.5.0
-BuildRequires:  python-urllib3
-%else
 BuildRequires:  python2-setuptools
 BuildRequires:  python2-requests >= 2.5.0
-BuildRequires:  python2-urllib3
-%endif
+%{!?el6:BuildRequires:  python2-urllib3}
+%{?el6:BuildRequires:  python-urllib3}
 # doc
 BuildRequires:  python2-sphinx
-%if 0%{?fedora} || 0%{?rhel} > 6
-BuildRequires:  python2-sphinx_rtd_theme
-%else
-BuildRequires:  python-sphinx_rtd_theme
-%endif
+%{!?el6:BuildRequires:  python2-sphinx_rtd_theme}
+%{?el6:BuildRequires:  python-sphinx_rtd_theme}
 # tests
+BuildRequires:  python2-mock
 BuildRequires:  python2-pytest
-%{!?el6:BuildRequires:  python2-pytest-cov}
 # Not packaged yet...
 #BuildRequires:  python2-pytest-symbols
-%if 0%{?el6}%{?el7}
-# Missing on EL6/EL7
+%if 0%{?el6}
 #BuildRequires:  python2-coveralls
 BuildRequires:  python-flake8
-%{?el6:BuildRequires:  python-mccabe}
-%{?el7:BuildRequires:  python2-mccabe}
-BuildRequires:  python2-mock
-BuildRequires:  pyflakes
-# Missing on EL6/EL7
-#BuildRequires:  python-requests-mock
+BuildRequires:  python-mccabe
+BuildRequires:  python-pyflakes
+#BuildRequires:  python2-requests-mock
+#BuildRequires:  python2-pytest-cov
 %else
-BuildRequires:  python2-coveralls
-BuildRequires:  python2-flake8
+%{!?el7:BuildRequires:  python2-coveralls}
+%{!?el7:BuildRequires:  python2-flake8}
+%{?el7:BuildRequires:  python-flake8}
 BuildRequires:  python2-mccabe
-BuildRequires:  python2-mock
 BuildRequires:  python2-pyflakes
 BuildRequires:  python2-requests-mock
+BuildRequires:  python2-pytest-cov
 %endif
 %endif