diff --git a/MANIFEST.in b/MANIFEST.in
index f324feb..4d3163f 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,3 @@
-recursive-include greentest *.py *.crt *.key
+recursive-include tests *.py *.crt *.key
 recursive-include examples *.py
 include MANIFEST.in README.twisted NEWS
diff --git a/makedoc b/makedoc
deleted file mode 100755
index 178c6cb..0000000
--- a/makedoc
+++ /dev/null
@@ -1,3 +0,0 @@
-dir="$(dirname "$0")"
-epydoc -o "$dir/html" --graph classtree --docformat=restructuredtext "$dir/eventlet/" || exit $?
-open "$dir/html/index.html"
diff --git a/greentest/README b/tests/README
similarity index 100%
rename from greentest/README
rename to tests/README
diff --git a/greentest/__init__.py b/tests/__init__.py
similarity index 100%
rename from greentest/__init__.py
rename to tests/__init__.py
diff --git a/greentest/api_test.py b/tests/api_test.py
similarity index 100%
rename from greentest/api_test.py
rename to tests/api_test.py
diff --git a/greentest/coros_test.py b/tests/coros_test.py
similarity index 100%
rename from greentest/coros_test.py
rename to tests/coros_test.py
diff --git a/greentest/db_pool_test.py b/tests/db_pool_test.py
similarity index 100%
rename from greentest/db_pool_test.py
rename to tests/db_pool_test.py
diff --git a/greentest/generate_report.py b/tests/generate_report.py
old mode 100755
new mode 100644
similarity index 100%
rename from greentest/generate_report.py
rename to tests/generate_report.py
diff --git a/greentest/greenio_test.py b/tests/greenio_test.py
similarity index 100%
rename from greentest/greenio_test.py
rename to tests/greenio_test.py
diff --git a/greentest/parse_results.py b/tests/parse_results.py
old mode 100755
new mode 100644
similarity index 100%
rename from greentest/parse_results.py
rename to tests/parse_results.py
diff --git a/greentest/pools_test.py b/tests/pools_test.py
similarity index 100%
rename from greentest/pools_test.py
rename to tests/pools_test.py
diff --git a/greentest/processes_test.py b/tests/processes_test.py
similarity index 100%
rename from greentest/processes_test.py
rename to tests/processes_test.py
diff --git a/greentest/record_results.py b/tests/record_results.py
old mode 100755
new mode 100644
similarity index 100%
rename from greentest/record_results.py
rename to tests/record_results.py
diff --git a/greentest/runall.py b/tests/runall.py
old mode 100755
new mode 100644
similarity index 100%
rename from greentest/runall.py
rename to tests/runall.py
diff --git a/greentest/saranwrap_test.py b/tests/saranwrap_test.py
similarity index 100%
rename from greentest/saranwrap_test.py
rename to tests/saranwrap_test.py
diff --git a/greentest/test__api.py b/tests/test__api.py
similarity index 100%
rename from greentest/test__api.py
rename to tests/test__api.py
diff --git a/greentest/test__api_timeout.py b/tests/test__api_timeout.py
similarity index 100%
rename from greentest/test__api_timeout.py
rename to tests/test__api_timeout.py
diff --git a/greentest/test__coros_queue.py b/tests/test__coros_queue.py
similarity index 100%
rename from greentest/test__coros_queue.py
rename to tests/test__coros_queue.py
diff --git a/greentest/test__coros_semaphore.py b/tests/test__coros_semaphore.py
similarity index 100%
rename from greentest/test__coros_semaphore.py
rename to tests/test__coros_semaphore.py
diff --git a/greentest/test__doctests.py b/tests/test__doctests.py
similarity index 100%
rename from greentest/test__doctests.py
rename to tests/test__doctests.py
diff --git a/greentest/test__event.py b/tests/test__event.py
similarity index 100%
rename from greentest/test__event.py
rename to tests/test__event.py
diff --git a/greentest/test__greenness.py b/tests/test__greenness.py
similarity index 100%
rename from greentest/test__greenness.py
rename to tests/test__greenness.py
diff --git a/greentest/test__hub.py b/tests/test__hub.py
similarity index 100%
rename from greentest/test__hub.py
rename to tests/test__hub.py
diff --git a/greentest/test__pool.py b/tests/test__pool.py
similarity index 100%
rename from greentest/test__pool.py
rename to tests/test__pool.py
diff --git a/greentest/test__proc.py b/tests/test__proc.py
similarity index 100%
rename from greentest/test__proc.py
rename to tests/test__proc.py
diff --git a/greentest/test__refcount.py b/tests/test__refcount.py
similarity index 100%
rename from greentest/test__refcount.py
rename to tests/test__refcount.py
diff --git a/greentest/test__socket_errors.py b/tests/test__socket_errors.py
similarity index 100%
rename from greentest/test__socket_errors.py
rename to tests/test__socket_errors.py
diff --git a/greentest/test__timers.py b/tests/test__timers.py
similarity index 100%
rename from greentest/test__timers.py
rename to tests/test__timers.py
diff --git a/greentest/test__twistedutil.py b/tests/test__twistedutil.py
similarity index 100%
rename from greentest/test__twistedutil.py
rename to tests/test__twistedutil.py
diff --git a/greentest/test__twistedutil_protocol.py b/tests/test__twistedutil_protocol.py
similarity index 100%
rename from greentest/test__twistedutil_protocol.py
rename to tests/test__twistedutil_protocol.py
diff --git a/greentest/test_server.crt b/tests/test_server.crt
similarity index 100%
rename from greentest/test_server.crt
rename to tests/test_server.crt
diff --git a/greentest/test_server.key b/tests/test_server.key
similarity index 100%
rename from greentest/test_server.key
rename to tests/test_server.key
diff --git a/greentest/test_socket.py b/tests/test_socket.py
similarity index 100%
rename from greentest/test_socket.py
rename to tests/test_socket.py
diff --git a/greentest/test_socket_ssl.py b/tests/test_socket_ssl.py
similarity index 100%
rename from greentest/test_socket_ssl.py
rename to tests/test_socket_ssl.py
diff --git a/greentest/test_socketserver.py b/tests/test_socketserver.py
similarity index 100%
rename from greentest/test_socketserver.py
rename to tests/test_socketserver.py
diff --git a/greentest/test_support.py b/tests/test_support.py
similarity index 100%
rename from greentest/test_support.py
rename to tests/test_support.py
diff --git a/greentest/test_thread.py b/tests/test_thread.py
similarity index 100%
rename from greentest/test_thread.py
rename to tests/test_thread.py
diff --git a/greentest/test_thread__boundedsem.py b/tests/test_thread__boundedsem.py
similarity index 100%
rename from greentest/test_thread__boundedsem.py
rename to tests/test_thread__boundedsem.py
diff --git a/greentest/test_threading.py b/tests/test_threading.py
similarity index 100%
rename from greentest/test_threading.py
rename to tests/test_threading.py
diff --git a/greentest/test_threading_local.py b/tests/test_threading_local.py
similarity index 100%
rename from greentest/test_threading_local.py
rename to tests/test_threading_local.py
diff --git a/greentest/test_timeout.py b/tests/test_timeout.py
similarity index 100%
rename from greentest/test_timeout.py
rename to tests/test_timeout.py
diff --git a/greentest/test_urllib2.py b/tests/test_urllib2.py
similarity index 100%
rename from greentest/test_urllib2.py
rename to tests/test_urllib2.py
diff --git a/greentest/test_urllib2_localnet.py b/tests/test_urllib2_localnet.py
similarity index 100%
rename from greentest/test_urllib2_localnet.py
rename to tests/test_urllib2_localnet.py
diff --git a/greentest/timer_test.py b/tests/timer_test.py
similarity index 100%
rename from greentest/timer_test.py
rename to tests/timer_test.py
diff --git a/greentest/tpool_test.py b/tests/tpool_test.py
similarity index 100%
rename from greentest/tpool_test.py
rename to tests/tpool_test.py
diff --git a/greentest/with_eventlet.py b/tests/with_eventlet.py
old mode 100755
new mode 100644
similarity index 100%
rename from greentest/with_eventlet.py
rename to tests/with_eventlet.py
diff --git a/greentest/with_timeout.py b/tests/with_timeout.py
old mode 100755
new mode 100644
similarity index 100%
rename from greentest/with_timeout.py
rename to tests/with_timeout.py
diff --git a/greentest/wsgi_test.py b/tests/wsgi_test.py
similarity index 100%
rename from greentest/wsgi_test.py
rename to tests/wsgi_test.py