diff --git a/maint/appengine/py25/tornado b/maint/appengine/py25/tornado
deleted file mode 120000
index 13b2e093..00000000
--- a/maint/appengine/py25/tornado
+++ /dev/null
@@ -1 +0,0 @@
-../../../tornado
\ No newline at end of file
diff --git a/maint/appengine/py27/tornado b/maint/appengine/py27/tornado
deleted file mode 120000
index 13b2e093..00000000
--- a/maint/appengine/py27/tornado
+++ /dev/null
@@ -1 +0,0 @@
-../../../tornado
\ No newline at end of file
diff --git a/maint/appengine/README b/maint/test/appengine/README
similarity index 100%
rename from maint/appengine/README
rename to maint/test/appengine/README
diff --git a/maint/appengine/common/cgi_runtests.py b/maint/test/appengine/common/cgi_runtests.py
similarity index 100%
rename from maint/appengine/common/cgi_runtests.py
rename to maint/test/appengine/common/cgi_runtests.py
diff --git a/maint/appengine/common/runtests.py b/maint/test/appengine/common/runtests.py
similarity index 100%
rename from maint/appengine/common/runtests.py
rename to maint/test/appengine/common/runtests.py
diff --git a/maint/appengine/py25/app.yaml b/maint/test/appengine/py25/app.yaml
similarity index 100%
rename from maint/appengine/py25/app.yaml
rename to maint/test/appengine/py25/app.yaml
diff --git a/maint/appengine/py25/cgi_runtests.py b/maint/test/appengine/py25/cgi_runtests.py
similarity index 100%
rename from maint/appengine/py25/cgi_runtests.py
rename to maint/test/appengine/py25/cgi_runtests.py
diff --git a/maint/appengine/py25/runtests.py b/maint/test/appengine/py25/runtests.py
similarity index 100%
rename from maint/appengine/py25/runtests.py
rename to maint/test/appengine/py25/runtests.py
diff --git a/maint/test/appengine/py25/tornado b/maint/test/appengine/py25/tornado
new file mode 120000
index 00000000..d4f6cc31
--- /dev/null
+++ b/maint/test/appengine/py25/tornado
@@ -0,0 +1 @@
+../../../../tornado
\ No newline at end of file
diff --git a/maint/appengine/py27/app.yaml b/maint/test/appengine/py27/app.yaml
similarity index 100%
rename from maint/appengine/py27/app.yaml
rename to maint/test/appengine/py27/app.yaml
diff --git a/maint/appengine/py27/cgi_runtests.py b/maint/test/appengine/py27/cgi_runtests.py
similarity index 100%
rename from maint/appengine/py27/cgi_runtests.py
rename to maint/test/appengine/py27/cgi_runtests.py
diff --git a/maint/appengine/py27/runtests.py b/maint/test/appengine/py27/runtests.py
similarity index 100%
rename from maint/appengine/py27/runtests.py
rename to maint/test/appengine/py27/runtests.py
diff --git a/maint/test/appengine/py27/tornado b/maint/test/appengine/py27/tornado
new file mode 120000
index 00000000..d4f6cc31
--- /dev/null
+++ b/maint/test/appengine/py27/tornado
@@ -0,0 +1 @@
+../../../../tornado
\ No newline at end of file
diff --git a/maint/appengine/setup.py b/maint/test/appengine/setup.py
similarity index 100%
rename from maint/appengine/setup.py
rename to maint/test/appengine/setup.py
diff --git a/maint/appengine/tox.ini b/maint/test/appengine/tox.ini
similarity index 100%
rename from maint/appengine/tox.ini
rename to maint/test/appengine/tox.ini