diff --git a/doc/test/plugin/links.txt b/doc/test/plugin/links.txt
index 157b91272..8735f6ebc 100644
--- a/doc/test/plugin/links.txt
+++ b/doc/test/plugin/links.txt
@@ -1,33 +1,33 @@
-.. _`pytest_recwarn.py`: http://bitbucket.org/hpk42/py-trunk/raw/70c2666f98bce5a86a5554c601c9c1e77dd1d63d/py/test/plugin/pytest_recwarn.py
-.. _`pytest_iocapture.py`: http://bitbucket.org/hpk42/py-trunk/raw/70c2666f98bce5a86a5554c601c9c1e77dd1d63d/py/test/plugin/pytest_iocapture.py
-.. _`pytest_monkeypatch.py`: http://bitbucket.org/hpk42/py-trunk/raw/70c2666f98bce5a86a5554c601c9c1e77dd1d63d/py/test/plugin/pytest_monkeypatch.py
+.. _`pytest_recwarn.py`: http://bitbucket.org/hpk42/py-trunk/raw/69bd12627e4d304c89c2003842703ccb10dfe838/py/test/plugin/pytest_recwarn.py
+.. _`pytest_iocapture.py`: http://bitbucket.org/hpk42/py-trunk/raw/69bd12627e4d304c89c2003842703ccb10dfe838/py/test/plugin/pytest_iocapture.py
+.. _`pytest_monkeypatch.py`: http://bitbucket.org/hpk42/py-trunk/raw/69bd12627e4d304c89c2003842703ccb10dfe838/py/test/plugin/pytest_monkeypatch.py
 .. _`plugins`: index.html
-.. _`pytest_doctest.py`: http://bitbucket.org/hpk42/py-trunk/raw/70c2666f98bce5a86a5554c601c9c1e77dd1d63d/py/test/plugin/pytest_doctest.py
+.. _`pytest_doctest.py`: http://bitbucket.org/hpk42/py-trunk/raw/69bd12627e4d304c89c2003842703ccb10dfe838/py/test/plugin/pytest_doctest.py
 .. _`terminal`: terminal.html
 .. _`hooklog`: hooklog.html
-.. _`pytest_restdoc.py`: http://bitbucket.org/hpk42/py-trunk/raw/70c2666f98bce5a86a5554c601c9c1e77dd1d63d/py/test/plugin/pytest_restdoc.py
+.. _`pytest_restdoc.py`: http://bitbucket.org/hpk42/py-trunk/raw/69bd12627e4d304c89c2003842703ccb10dfe838/py/test/plugin/pytest_restdoc.py
 .. _`xfail`: xfail.html
-.. _`pytest_pocoo.py`: http://bitbucket.org/hpk42/py-trunk/raw/70c2666f98bce5a86a5554c601c9c1e77dd1d63d/py/test/plugin/pytest_pocoo.py
-.. _`pytest_keyword.py`: http://bitbucket.org/hpk42/py-trunk/raw/70c2666f98bce5a86a5554c601c9c1e77dd1d63d/py/test/plugin/pytest_keyword.py
-.. _`pytest_figleaf.py`: http://bitbucket.org/hpk42/py-trunk/raw/70c2666f98bce5a86a5554c601c9c1e77dd1d63d/py/test/plugin/pytest_figleaf.py
-.. _`pytest_hooklog.py`: http://bitbucket.org/hpk42/py-trunk/raw/70c2666f98bce5a86a5554c601c9c1e77dd1d63d/py/test/plugin/pytest_hooklog.py
+.. _`pytest_pocoo.py`: http://bitbucket.org/hpk42/py-trunk/raw/69bd12627e4d304c89c2003842703ccb10dfe838/py/test/plugin/pytest_pocoo.py
+.. _`pytest_keyword.py`: http://bitbucket.org/hpk42/py-trunk/raw/69bd12627e4d304c89c2003842703ccb10dfe838/py/test/plugin/pytest_keyword.py
+.. _`pytest_figleaf.py`: http://bitbucket.org/hpk42/py-trunk/raw/69bd12627e4d304c89c2003842703ccb10dfe838/py/test/plugin/pytest_figleaf.py
+.. _`pytest_hooklog.py`: http://bitbucket.org/hpk42/py-trunk/raw/69bd12627e4d304c89c2003842703ccb10dfe838/py/test/plugin/pytest_hooklog.py
 .. _`contact`: ../../contact.html
 .. _`pocoo`: pocoo.html
 .. _`checkout the py.test development version`: ../../download.html#checkout
 .. _`oejskit`: oejskit.html
 .. _`unittest`: unittest.html
 .. _`iocapture`: iocapture.html
-.. _`pytest_xfail.py`: http://bitbucket.org/hpk42/py-trunk/raw/70c2666f98bce5a86a5554c601c9c1e77dd1d63d/py/test/plugin/pytest_xfail.py
+.. _`pytest_xfail.py`: http://bitbucket.org/hpk42/py-trunk/raw/69bd12627e4d304c89c2003842703ccb10dfe838/py/test/plugin/pytest_xfail.py
 .. _`figleaf`: figleaf.html
 .. _`extend`: ../extend.html
-.. _`pytest_terminal.py`: http://bitbucket.org/hpk42/py-trunk/raw/70c2666f98bce5a86a5554c601c9c1e77dd1d63d/py/test/plugin/pytest_terminal.py
+.. _`pytest_terminal.py`: http://bitbucket.org/hpk42/py-trunk/raw/69bd12627e4d304c89c2003842703ccb10dfe838/py/test/plugin/pytest_terminal.py
 .. _`recwarn`: recwarn.html
-.. _`pytest_pdb.py`: http://bitbucket.org/hpk42/py-trunk/raw/70c2666f98bce5a86a5554c601c9c1e77dd1d63d/py/test/plugin/pytest_pdb.py
+.. _`pytest_pdb.py`: http://bitbucket.org/hpk42/py-trunk/raw/69bd12627e4d304c89c2003842703ccb10dfe838/py/test/plugin/pytest_pdb.py
 .. _`monkeypatch`: monkeypatch.html
 .. _`resultlog`: resultlog.html
 .. _`keyword`: keyword.html
 .. _`restdoc`: restdoc.html
-.. _`pytest_unittest.py`: http://bitbucket.org/hpk42/py-trunk/raw/70c2666f98bce5a86a5554c601c9c1e77dd1d63d/py/test/plugin/pytest_unittest.py
+.. _`pytest_unittest.py`: http://bitbucket.org/hpk42/py-trunk/raw/69bd12627e4d304c89c2003842703ccb10dfe838/py/test/plugin/pytest_unittest.py
 .. _`doctest`: doctest.html
-.. _`pytest_resultlog.py`: http://bitbucket.org/hpk42/py-trunk/raw/70c2666f98bce5a86a5554c601c9c1e77dd1d63d/py/test/plugin/pytest_resultlog.py
+.. _`pytest_resultlog.py`: http://bitbucket.org/hpk42/py-trunk/raw/69bd12627e4d304c89c2003842703ccb10dfe838/py/test/plugin/pytest_resultlog.py
 .. _`pdb`: pdb.html
diff --git a/py/test/plugin/pytest_pytester.py b/py/test/plugin/pytest_pytester.py
index 8d162f1f5..d97c70100 100644
--- a/py/test/plugin/pytest_pytester.py
+++ b/py/test/plugin/pytest_pytester.py
@@ -542,7 +542,7 @@ class SetupBuilder:
         try:
             args = ['python', str(self.setup_path), 'sdist', 
                     '--dist-dir', str(temp)]
-            subprocess.check_call(args)
+            subcall(args)
             l = temp.listdir('py-*')
             assert len(l) == 1
             sdist = l[0]
@@ -557,6 +557,11 @@ class SetupBuilder:
         finally:
             temp.remove()
 
+def subcall(args):
+    if hasattr(subprocess, 'check_call'):
+        subprocess.check_call(args)
+    else:
+        subprocess.call(args)
 # code taken from Ronny Pfannenschmidt's virtualenvmanager 
 
 class VirtualEnv(object):
@@ -578,7 +583,7 @@ class VirtualEnv(object):
         args = ['virtualenv', self.path]
         if not sitepackages:
             args.append('--no-site-packages')
-        subprocess.check_call(args)
+        subcall(args)
 
     def makegateway(self):
         python = self._cmd('python')
diff --git a/py/test/plugin/pytest_restdoc.py b/py/test/plugin/pytest_restdoc.py
index 427ae2dee..95928be10 100644
--- a/py/test/plugin/pytest_restdoc.py
+++ b/py/test/plugin/pytest_restdoc.py
@@ -105,12 +105,14 @@ class ReSTSyntaxTest(py.test.collect.Item):
 
     def register_pygments(self):
         # taken from pygments-main/external/rst-directive.py 
+        from docutils.parsers.rst import directives
         try:
             from pygments.formatters import HtmlFormatter
         except ImportError:
             def pygments_directive(name, arguments, options, content, lineno,
                                    content_offset, block_text, state, state_machine):
                 return []
+            pygments_directive.options = {}
         else:
             # The default formatter
             DEFAULT = HtmlFormatter(noclasses=True)
@@ -120,7 +122,6 @@ class ReSTSyntaxTest(py.test.collect.Item):
             }
 
             from docutils import nodes
-            from docutils.parsers.rst import directives
 
             from pygments import highlight
             from pygments.lexers import get_lexer_by_name, TextLexer
@@ -137,10 +138,10 @@ class ReSTSyntaxTest(py.test.collect.Item):
                 parsed = highlight(u'\n'.join(content), lexer, formatter)
                 return [nodes.raw('', parsed, format='html')]
 
+            pygments_directive.options = dict([(key, directives.flag) for key in VARIANTS])
+
         pygments_directive.arguments = (1, 0, 1)
         pygments_directive.content = 1
-        pygments_directive.options = dict([(key, directives.flag) for key in VARIANTS])
-
         directives.register_directive('sourcecode', pygments_directive)
 
     def resolve_linkrole(self, name, text, check=True):
diff --git a/py/test/plugin/pytest_runner.py b/py/test/plugin/pytest_runner.py
index d3fa89381..df5d5f257 100644
--- a/py/test/plugin/pytest_runner.py
+++ b/py/test/plugin/pytest_runner.py
@@ -20,18 +20,11 @@ def pytest_configure(config):
     config._setupstate = SetupState()
 
 def pytest_sessionfinish(session, exitstatus):
-    # XXX see above
     if hasattr(session.config, '_setupstate'):
         hook = session.config.hook
         rep = hook.pytest__teardown_final(session=session)
         if rep:
             hook.pytest__teardown_final_logerror(rep=rep)
-    # prevent logging module atexit handler from choking on 
-    # its attempt to close already closed streams 
-    # see http://bugs.python.org/issue6333
-    mod = py.std.sys.modules.get("logging", None)
-    if mod is not None: 
-        mod.raiseExceptions = False 
 
 def pytest_make_collect_report(collector):
     result = excinfo = None