diff --git a/AUTHORS b/AUTHORS
index e27853c84..135bd7a24 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -133,6 +133,7 @@ The following submitted code, packages or analysis, and deserve special thanks:
   Ran Benita
   Vladimir
   Zachary Manning
+  jrabbit
 
 Thanks to the following, who submitted detailed bug reports and excellent
 suggestions:
diff --git a/ChangeLog b/ChangeLog
index bc9eb5a12..a48df6064 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -45,6 +45,8 @@
 - Deprecated use of alternate Boolean configuration settings. Use values "0" for
   off, and "1" for on. Avoid used of "on", "off", "true", "t", "false", "f",
   "yes", "y", "no", "n".
+- Fixed test harness for Python 3.x.
+          (thanks to jrabbit).
 
 ------ current release ---------------------------
 
diff --git a/test/run_all b/test/run_all
index a41aa6cba..3f68d283e 100755
--- a/test/run_all
+++ b/test/run_all
@@ -60,7 +60,10 @@ def run_test(testqueue, outqueue, threadname):
 class TestRunner(object):
     def __init__(self):
         self.threads = []
-        self.tap = open(cmd_args.tapfile, 'w')
+        if sys.version_info > (3,):
+            self.tap = open(cmd_args.tapfile, 'w', errors='ignore')
+        else:
+            self.tap = open(cmd_args.tapfile, 'w')
 
         self._parallelq = Queue()
         self._serialq = Queue()