diff --git a/eventlet/green/CGIHTTPServer.py b/eventlet/green/CGIHTTPServer.py
new file mode 100644
index 0000000..01ea4bf
--- /dev/null
+++ b/eventlet/green/CGIHTTPServer.py
@@ -0,0 +1,17 @@
+from eventlet import patcher
+from eventlet.green import BaseHTTPServer
+from eventlet.green import SimpleHTTPServer
+from eventlet.green import urllib
+from eventlet.green import select
+
+patcher.inject('CGIHTTPServer',
+    globals(),
+    ('BaseHTTPServer', BaseHTTPServer),
+    ('SimpleHTTPServer', SimpleHTTPServer),
+    ('urllib',  urllib),
+    ('select',  select))
+
+del patcher
+
+if __name__ == '__main__':
+    test()
\ No newline at end of file
diff --git a/tests/stdlib/test_httpservers.py b/tests/stdlib/test_httpservers.py
new file mode 100644
index 0000000..20f61c7
--- /dev/null
+++ b/tests/stdlib/test_httpservers.py
@@ -0,0 +1,20 @@
+from eventlet import patcher
+
+from eventlet.green import BaseHTTPServer
+from eventlet.green import SimpleHTTPServer
+from eventlet.green import CGIHTTPServer
+from eventlet.green import urllib
+from eventlet.green import httplib
+from eventlet.green import threading
+
+patcher.inject('test.test_httpservers',
+    globals(),
+    ('BaseHTTPServer', BaseHTTPServer),
+    ('SimpleHTTPServer', SimpleHTTPServer),
+    ('CGIHTTPServer', CGIHTTPServer),
+    ('urllib', urllib),
+    ('httplib', httplib),
+    ('threading', threading))
+
+if __name__ == "__main__":
+    test_main()