diff --git a/AUTHORS b/AUTHORS
index 9a55b453c..6789db2f1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2,9 +2,9 @@ Holger Krekel, holger at merlinux eu
 Guido Wesdorp, johnny at johnnydebris net 
 Samuele Pedroni, pedronis at openend se 
 Carl Friedrich Bolz, cfbolz at gmx de
-Benjamin Peterson, benjamin@python.org
+Benjamin Peterson, benjamin at python org
+Ronny Pfannschmidt, Ronny.Pfannschmidt at gmx de
 Armin Rigo, arigo at tunes org 
-Maciek Fijalkowski, fijal at genesilico.pl
+Maciek Fijalkowski, fijal at genesilico pl
 Brian Dorsey, briandorsey at gmail com 
 merlinux GmbH, Germany, office at merlinux eu
-
diff --git a/testing/cmdline/test_cmdline.py b/testing/cmdline/test_cmdline.py
index 5ccce80ce..6616a9d9f 100644
--- a/testing/cmdline/test_cmdline.py
+++ b/testing/cmdline/test_cmdline.py
@@ -16,7 +16,7 @@ class TestPyLookup:
             ['*%s:*' %(p.basename)]
         )
 
-    def test_with_explicit_path(self, testxbdir):
+    def test_with_explicit_path(self, testdir):
         sub1 = testdir.mkdir("things")
         sub2 = testdir.mkdir("foo")
         sub1.join("pyfile.py").write("def stuff(): pass")