diff --git a/setup.py b/setup.py
index dedb940..a67b81e 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
     name="pytest-xdist",
-    version='1.8.dev1',
+    version='1.8.dev2',
     description='py.test xdist plugin for distributed testing and loop-on-failing modes',
     long_description=open('README.txt').read(),
     license='GPLv2 or later',
@@ -13,7 +13,7 @@ setup(
     packages = ['xdist'],
     entry_points = {'pytest11': ['xdist = xdist.plugin'],},
     zip_safe=False,
-    install_requires = ['execnet>=1.0.8', 'pytest>=2.2.1.dev1'],
+    install_requires = ['execnet>=1.0.8', 'pytest>=2.2.1.dev2'],
     classifiers=[
     'Development Status :: 5 - Production/Stable',
     'Intended Audience :: Developers',
@@ -27,4 +27,4 @@ setup(
     'Programming Language :: Python',
     'Programming Language :: Python :: 3',
     ],
-)
\ No newline at end of file
+)
diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py
index 5d873ea..f38e772 100644
--- a/testing/acceptance_test.py
+++ b/testing/acceptance_test.py
@@ -314,7 +314,7 @@ def test_teardownfails_one_function(testdir):
 @py.test.mark.xfail
 def test_terminate_on_hangingnode(testdir):
     p = testdir.makeconftest("""
-        def pytest__teardown_final(session):
+        def pytest_sessionfinishes(session):
             if session.nodeid == "my": # running on slave
                 import time
                 time.sleep(3)
diff --git a/xdist/__init__.py b/xdist/__init__.py
index d205fa3..bb8beb5 100644
--- a/xdist/__init__.py
+++ b/xdist/__init__.py
@@ -1,2 +1,2 @@
 #
-__version__ = '1.8.dev1'
+__version__ = '1.8.dev2'
diff --git a/xdist/dsession.py b/xdist/dsession.py
index 6eb2198..b7d9b04 100644
--- a/xdist/dsession.py
+++ b/xdist/dsession.py
@@ -284,10 +284,6 @@ class DSession:
         self.config.hook.pytest_runtest_logreport(report=rep)
         self._handlefailures(rep)
 
-    def slave_teardownreport(self, node, rep):
-        rep.node = node
-        self.config.hook.pytest__teardown_final_logerror(report=rep)
-
     def slave_collectreport(self, node, rep):
         #self.report_line("collectreport %s: %s" %(rep.id, rep.status))
         #rep.node = node
diff --git a/xdist/remote.py b/xdist/remote.py
index 1408c9c..c589ca8 100644
--- a/xdist/remote.py
+++ b/xdist/remote.py
@@ -26,10 +26,6 @@ class SlaveInteractor:
         for line in str(excrepr).split("\n"):
             self.log("IERROR> " + line)
 
-    def pytest__teardown_final_logerror(self, report):
-        rep = serialize_report(report)
-        self.sendevent("teardownreport", data=rep)
-
     def pytest_sessionstart(self, session):
         self.session = session
         slaveinfo = getinfodict()
diff --git a/xdist/slavemanage.py b/xdist/slavemanage.py
index e130758..45ddff2 100644
--- a/xdist/slavemanage.py
+++ b/xdist/slavemanage.py
@@ -301,5 +301,3 @@ def unserialize_report(name, reportdict):
         return runner.TestReport(**d)
     elif name == "collectreport":
         return runner.CollectReport(**d)
-    elif name == "teardownreport":
-        return runner.TeardownErrorReport(**d)