diff --git a/python-mako.spec b/python-mako.spec
index 469a59f..ea7cc2c 100644
--- a/python-mako.spec
+++ b/python-mako.spec
@@ -1,20 +1,12 @@
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >= 8
 %global with_python3 1
 %endif
 
-%if 0%{?rhel} && 0%{?rhel} < 6
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%endif
-
-%if 0%{?fedora} <= 16
-%{!?python3_version: %global python3_version %(%{__python3} -c 'import sys ; sys.stdout.write("%s.%s" % sys.version_info[:2])')}
-%endif
-
 %global upname Mako
 
 Name: python-mako
 Version: 1.0.6
-Release: 5%{?dist}
+Release: 6%{?dist}
 BuildArch: noarch
 
 # Mostly MIT, but _ast_util.py is Python licensed.
@@ -40,9 +32,7 @@ BuildRequires: python3-setuptools
 BuildRequires: python3-markupsafe
 BuildRequires: python3-beaker
 BuildRequires: python3-mock
-%if 0%{?fedora} > 14
 BuildRequires: python3-nose
-%endif
 %endif # if with_python3
 
 %global _description\
@@ -140,7 +130,7 @@ rm -rf doc/build
 %check
 python2 setup.py test
 
-%if 0%{?with_python3} && 0%{?fedora} > 14
+%if 0%{?with_python3}
 pushd %{py3dir}
 python3 setup.py test
 popd
@@ -171,6 +161,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Sep 27 2017 Troy Dawson <tdawson@redhat.com> - 1.0.6-6
+- Cleanup spec file conditionals
+
 * Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.0.6-5
 - Python 2 binary package renamed to python2-mako
   See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3