diff --git a/doc/conftest.py b/doc/conftest.py
index 900bc9f24..51e028516 100644
--- a/doc/conftest.py
+++ b/doc/conftest.py
@@ -1,2 +1,3 @@
 #XXX make work: excludedirs = ['_build']
 pytest_plugins = ['pytest_restdoc']
+rsyncdirs = ['.']
diff --git a/py/conftest.py b/py/conftest.py
index 95650f104..f407769a4 100644
--- a/py/conftest.py
+++ b/py/conftest.py
@@ -1,4 +1,5 @@
 pytest_plugins = 'pytest_doctest', 'pytest_pytester' # , 'pytest_restdoc'
+rsyncdirs = ['../doc']
 rsyncignore = ['c-extension/greenlet/build']
 
 import py
diff --git a/py/test/plugin/pytest_execnetcleanup.py b/py/test/plugin/pytest_execnetcleanup.py
index 922964a73..9a177e42e 100644
--- a/py/test/plugin/pytest_execnetcleanup.py
+++ b/py/test/plugin/pytest_execnetcleanup.py
@@ -33,6 +33,14 @@ class ExecnetcleanupPlugin:
             l.append(gw)
         #for gw in l:
         #    gw.join()
+        #
+    def pytest_pyfunc_call(self, __call__, pyfuncitem, args, kwargs):
+        if self._gateways is not None:
+            gateways = self._gateways[:]
+            res = __call__.execute(firstresult=True)
+            while len(self._gateways) > len(gateways):
+                self._gateways[-1].exit()
+            return res
    
 def test_generic(plugintester):
     plugintester.apicheck(ExecnetcleanupPlugin)