diff --git a/Lib/dos-8x3/cgihttps.py b/Lib/dos-8x3/cgihttps.py
index 85e1721..b40edbc 100755
--- a/Lib/dos-8x3/cgihttps.py
+++ b/Lib/dos-8x3/cgihttps.py
@@ -148,8 +148,7 @@
 	    if ua:
 		env['HTTP_USER_AGENT'] = ua
 	    # XXX Other HTTP_* headers
-	    import regsub
-	    decoded_query = regsub.gsub('+', ' ', query)
+	    decoded_query = string.replace(query, '+', ' ')
 	    try:
 		os.setuid(nobody)
 	    except os.error:
diff --git a/Lib/dos-8x3/test_zli.py b/Lib/dos-8x3/test_zli.py
index 62c2604..72dbcfa 100644
--- a/Lib/dos-8x3/test_zli.py
+++ b/Lib/dos-8x3/test_zli.py
@@ -3,8 +3,11 @@
 import imp
 import string
 
-t = imp.find_module('test_zlib')
-file = t[0]
+try:
+    t = imp.find_module('test_zlib')
+    file = t[0]
+except ImportError:
+    file = open(__file__)
 buf = file.read() * 8
 file.close()