diff --git a/test/stub/wsgi/cgi.py b/test/stub/wsgi/cgishim.py
similarity index 100%
rename from test/stub/wsgi/cgi.py
rename to test/stub/wsgi/cgishim.py
diff --git a/test/stub/wsgi/passenger_wsgi.py b/test/stub/wsgi/passenger_wsgi.py
index a4353f1c5..acaddd19b 100644
--- a/test/stub/wsgi/passenger_wsgi.py
+++ b/test/stub/wsgi/passenger_wsgi.py
@@ -1,4 +1,9 @@
-import os, sys, time, cgi
+import os, sys, time
+
+if sys.version_info[0] >= 3 and sys.version_info[1] >= 13:
+	import cgishim
+else:
+	import cgi
 
 def file_exist(filename):
 	try: