diff --git a/checkin_notes b/checkin_notes
index d794234b3d..bb796ba487 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -7774,3 +7774,10 @@ Karl 2003-11-22
 
     client/
         client_types.C
+
+Karl 2003-11-24
+    - testbase fixes
+
+    test/
+        testbase.py
+        cgiserver.py
diff --git a/test/cgiserver.py b/test/cgiserver.py
index af532a0ffd..e0d491c3cf 100755
--- a/test/cgiserver.py
+++ b/test/cgiserver.py
@@ -142,7 +142,6 @@ class PHPHTTPRequestHandler(CGIHTTPServer.CGIHTTPRequestHandler):
                 args = [script]
             if '=' not in decoded_query:
                 args.append(decoded_query)
-            nobody = CGIHTTPServer.nobody_uid()
             self.wfile.flush() # Always flush before forking
             pid = os.fork()
             if pid != 0:
@@ -160,10 +159,6 @@ class PHPHTTPRequestHandler(CGIHTTPServer.CGIHTTPRequestHandler):
                 return
             # Child
             try:
-                try:
-                    os.setuid(nobody)
-                except os.error:
-                    pass
                 os.dup2(self.rfile.fileno(), 0)
                 os.dup2(self.wfile.fileno(), 1)
                 os.chdir(self.translate_path(dir)) # KC
diff --git a/test/testbase.py b/test/testbase.py
index 134d3b5294..a6472b68d4 100644
--- a/test/testbase.py
+++ b/test/testbase.py
@@ -726,7 +726,7 @@ class AsynchCGIServer:
             return
         ## child
         os.chdir(base_dir)
-        sys.stderr = open('cgiserver.log', 'w')
+        sys.stderr = open('cgiserver.log', 'w', 0)
         cgiserver.serve(port=port)
         os._exit(1)
     def kill(self):