diff --git a/pygobject3.spec b/pygobject3.spec
index 0a804ac..bf53933 100644
--- a/pygobject3.spec
+++ b/pygobject3.spec
@@ -4,7 +4,7 @@
 %define pycairo_version                1.11.1
 %define python2_version                2.7
 
-%if 0%{?fedora} > 12
+%if 0%{?fedora} || 0%{?rhel} >= 8
 %global with_python3 1
 %define python3_version                3.3
 %endif
@@ -13,7 +13,7 @@
 
 Name:           pygobject3
 Version:        3.26.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python bindings for GObject Introspection
 
 License:        LGPLv2+ and MIT
@@ -33,7 +33,7 @@ BuildRequires:  cairo-gobject-devel
 
 # Required by the upstream selftest suite:
 %if %{with_check}
-%if 0%{?fedora}
+%if 0%{?with_python3}
 # Temporarily disabled pyflakes tests to avoid the build failing due to too new
 # pyflakes 0.7.2 in F19
 # https://bugzilla.gnome.org/show_bug.cgi?id=701009
@@ -217,6 +217,9 @@ xvfb-run make DESTDIR=$RPM_BUILD_ROOT check V=1
 %{_libdir}/pkgconfig/pygobject-3.0.pc
 
 %changelog
+* Wed Sep 27 2017 Troy Dawson <tdawson@redhat.com> - 3.26.0-2
+- Cleanup spec file conditionals
+
 * Thu Sep 14 2017 Kalev Lember <klember@redhat.com> - 3.26.0-1
 - Update to 3.26.0