diff --git a/python-execnet.spec b/python-execnet.spec
index 30c34ee..c91ba0e 100644
--- a/python-execnet.spec
+++ b/python-execnet.spec
@@ -1,15 +1,15 @@
 %global srcname execnet
 
 Name:           python-%{srcname}
-Version:        1.7.1
-Release:        5%{?dist}
+Version:        1.8.0
+Release:        1%{?dist}
 Summary:        Distributed Python deployment and communication
 License:        MIT
 URL:            https://github.com/pytest-dev/execnet
 Source0:        %pypi_source
 
 BuildArch:      noarch
-BuildRequires: make
+BuildRequires:  make
 BuildRequires:  %{_bindir}/ps
 
 %description
@@ -30,8 +30,9 @@ BuildRequires:  python3-setuptools
 BuildRequires:  python3-setuptools_scm
 BuildRequires:  python3-apipkg
 BuildRequires:  python3-pytest
-#BuildRequires:  python3-eventlet
-#BuildRequires:  python3-gevent
+BuildRequires:  python3-eventlet
+BuildRequires:  python3-gevent
+BuildRequires:  python3-pytest-timeout
 BuildRequires:  %{_bindir}/sphinx-build-3
 %{?python_provide:%python_provide python3-%{srcname}}
 
@@ -68,10 +69,15 @@ SETUPTOOLS_SCM_PRETEND_VERSION=%{version}
 
 
 %check
+PYTEST_SELECT='not test_popen_io[gevent-sys.executable]'
+PYTEST_SELECT+=' and not [gevent-socket]'
+PYTEST_SELECT+=' and not [eventlet-socket]'
+PYTEST_SELECT+=' and not [python2.7]'
 PYTHONPATH=$(pwd) \
 py.test-%{python3_version} -r s \
-  -k 'not test_stdouterrin_setnull' \
-  testing
+  -k "$PYTEST_SELECT" \
+  testing \
+  --timeout=30
 
 
 %files -n python3-%{srcname}
@@ -83,6 +89,9 @@ py.test-%{python3_version} -r s \
 
 
 %changelog
+* Sat May  8 2021 Thomas Moschny <thomas.moschny@gmx.de> - 1.8.0-1
+- Update to 1.8.0.
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/sources b/sources
index 4e4086c..3321f7d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (execnet-1.7.1.tar.gz) = 375748c03f8d955bd8fca90d5c6308073c31a978fd7a604257512e0a710f899dec5db8a91d5bb5f16de9b0656e1742da9ab513827a1a065a5125bafcf1e63a70
+SHA512 (execnet-1.8.0.tar.gz) = a0ca76002270daa5cbfa00563a51a3412008f893f755a1eb84f53e228dd61a82bdc94fe6152e30d471b4caff3059c662bb9de82100ec2c96df4d014836452698