diff --git a/python-execnet.spec b/python-execnet.spec
index 4a2554e..fc9dbf6 100644
--- a/python-execnet.spec
+++ b/python-execnet.spec
@@ -9,7 +9,7 @@
 
 Name:           python-%{srcname}
 Version:        1.2.0
-Release:        4%{?dist}
+Release:        4%{?dist}.1
 Summary:        Elastic Python Deployment
 Group:          Development/Languages
 # package is now under the MIT license, (although the docs still say
@@ -32,7 +32,9 @@ BuildRequires:  pytest
 BuildRequires:  python-sphinx
 BuildRequires:  /bin/ps
 BuildRequires:  python-eventlet
+%if 0%{?fedora} >= 21 || 0%{?rhel} >= 7
 BuildRequires:  python-gevent >= 1.0
+%endif
 %if 0%{?with_python3}
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
@@ -117,7 +119,7 @@ rm doc/_build/html/.buildinfo
 
 %check
 PYTHONPATH=$(pwd) LC_ALL="en_US.UTF-8" \
-py.test-%{python_version} -r s testing
+py.test-%{python_version} -r s -k'-test_stdouterrin_setnull' testing
 %if 0%{?with_python3}
 pushd %{py3dir}
 PYTHONPATH=$(pwd) LC_ALL="en_US.UTF-8" \
@@ -141,6 +143,12 @@ popd
 
 
 %changelog
+* Sun Jan 18 2015 Thomas Moschny <thomas.moschny@gmx.de> - 1.2.0-4.1
+- Conditionalize dependency on python-gevent, in order to update
+  python-execnet for F20 and add it to EPEL6 (bugs 1178233 and
+  1178235). Suggested by Ken Dreyer <ktdreyer@ktdreyer.com>.
+- Disable test failing on Rawhide and F21.
+
 * Wed Jun 18 2014 Orion Poplawski <orion@cora.nwra.com> - 1.2.0-4
 - Add patch to fix failing test with old pytest on EL7