diff -r 3dc7d29a42e9 -r f0c81b6d67c6 tests/run-tests.py
--- a/tests/run-tests.py	Wed Jul 17 12:45:12 2013 -0700
+++ b/tests/run-tests.py	Wed Jul 17 13:02:12 2013 -0700
@@ -76,8 +76,9 @@
                          close_fds=closefds,
                          stdin=subprocess.PIPE, stdout=subprocess.PIPE,
                          stderr=subprocess.STDOUT)
-    p.wait = waitlocked(p.wait)
-    p.poll = waitlocked(p.poll)
+    if sys.version_info[1] < 5:
+        p.wait = waitlocked(p.wait)
+        p.poll = waitlocked(p.poll)
     processlock.release()
 
     p.fromchild = p.stdout