diff --git a/python-httpbin.spec b/python-httpbin.spec
index 21febef..2588c1a 100644
--- a/python-httpbin.spec
+++ b/python-httpbin.spec
@@ -1,10 +1,5 @@
-# Not building on EPEL 6 because python-flask on EPEL 6 is flat broken;
-# it depends on python-jinja2-26 but does not load it properly, so
-# httpbin's test suite fails as soon as it tries to import flask.
-
-# Not building on EPEL 7 as test_delete_endpoint_returns_body fails
-# there, for some reason, and I do not have the round tuits to figure
-# it out.
+# Not building on EPEL for now due to an issue with older Werkzeug:
+# https://github.com/Runscope/httpbin/pull/318
 
 %global github_owner    Runscope
 %global github_name     httpbin
@@ -29,12 +24,12 @@ being considered. All endpoint responses are JSON-encoded.
 
 # Requirements for tests (BuildRequires) and run (Requires)
 # EPEL builds do not provide python2-*
-%global t_requires python-flask python-markupsafe python-decorator python-itsdangerous python-six python-argparse
+%global t_requires python-flask python-markupsafe python-decorator python-itsdangerous python-six
 %global t3_requires python%{python3_pkgversion}-flask python%{python3_pkgversion}-markupsafe python%{python3_pkgversion}-decorator python%{python3_pkgversion}-itsdangerous python%{python3_pkgversion}-six
 
 Name:           python-%{github_name}
 Version:        0.5.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        %{sum}
 
 License:        MIT
@@ -46,6 +41,11 @@ BuildRequires:  python2-devel
 # no python2-setuptools on EL6
 BuildRequires:  python-setuptools
 BuildRequires:  %{t_requires}
+# Required on EL 6 but no longer provided on F>25, hence this annoying
+# conditional
+%if 0%{?rhel} && 0%{?rhel} < 7
+BuildRequires:  python-argparse
+%endif # rhel < 7
 
 %if %{with python3}
 # Required for Python 3 pkgversion macros to work
@@ -68,6 +68,11 @@ BuildRequires:  python%{python3_other_pkgversion}-devel
 %package -n python2-%{github_name}
 Summary:    %{sum}
 Requires:   %{t_requires}
+# Required on EL 6 but no longer provided on F>25, hence this annoying
+# conditional
+%if 0%{?rhel} && 0%{?rhel} < 7
+Requires:   python-argparse
+%endif # rhel < 7
 %{?python_provide:%python_provide python2-%{github_name}}
 
 %description -n python2-%{github_name}
@@ -160,6 +165,9 @@ LANG=en_US.UTF-8 %py3_other_install
 
 #################################################################################
 %changelog
+* Tue Jan 10 2017 Adam Williamson <awilliam@redhat.com> - 0.5.0-4
+- Conditionalize argparse dependency as it disappeared from Rawhide
+
 * Wed Dec 21 2016 Adam Williamson <awilliam@redhat.com> - 0.5.0-3
 - properly own all directories
 - fix the mode of a template (doesn't need to be executable)