diff --git a/MANIFEST.in b/MANIFEST.in
index 5b28bd64..ff3a1f86 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -9,4 +9,5 @@ include tornado/test/gettext_translations/fr_FR/LC_MESSAGES/tornado_test.mo
 include tornado/test/gettext_translations/fr_FR/LC_MESSAGES/tornado_test.po
 include tornado/test/static/robots.txt
 include tornado/test/templates/utf8.html
+include runtests.sh
 global-exclude _auto2to3*
\ No newline at end of file
diff --git a/runtests.sh b/runtests.sh
new file mode 100755
index 00000000..07bd360a
--- /dev/null
+++ b/runtests.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+cd $(dirname $0)
+
+# "python -m" differs from "python tornado/test/runtests.py" in how it sets
+# up the default python path.  "python -m" uses the current directory,
+# while "python file.py" uses the directory containing "file.py" (which is
+# not what you want if file.py appears within a package you want to import
+# from)
+python -m tornado.test.runtests "$@"
diff --git a/tornado/test/run_pyversion_tests.py b/tornado/test/run_pyversion_tests.py
deleted file mode 100755
index 16806456..00000000
--- a/tornado/test/run_pyversion_tests.py
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/env python
-"""Runs the tornado test suite with all supported python interpreters."""
-
-from __future__ import absolute_import, division, with_statement
-
-import os
-import subprocess
-import sys
-
-INTERPRETERS = [
-    "python2.5",
-    "python2.6",
-    "python2.7",
-    "auto2to3",
-    "pypy",
-    ]
-
-
-def exists_on_path(filename):
-    for dir in os.environ["PATH"].split(":"):
-        if os.path.exists(os.path.join(dir, filename)):
-            return True
-    return False
-
-
-def main():
-    for interpreter in INTERPRETERS:
-        print "=================== %s =======================" % interpreter
-        if not exists_on_path(interpreter):
-            print "Interpreter not found, skipping..."
-            continue
-        args = [interpreter, "-m", "tornado.test.runtests"] + sys.argv[1:]
-        ret = subprocess.call(args)
-        if ret != 0:
-            print "Tests on %s failed with exit code %d" % (interpreter, ret)
-            sys.exit(ret)
-    print "All tests passed"
-
-if __name__ == "__main__":
-    main()
diff --git a/tornado/test/runtests.py b/tornado/test/runtests.py
old mode 100755
new mode 100644
diff --git a/tornado/testing.py b/tornado/testing.py
index e809123e..83a7e033 100644
--- a/tornado/testing.py
+++ b/tornado/testing.py
@@ -388,9 +388,9 @@ def main():
     be overridden by naming a single test on the command line::
 
         # Runs all tests
-        tornado/test/runtests.py
+        python -m tornado.test.runtests
         # Runs one test
-        tornado/test/runtests.py tornado.test.stack_context_test
+        python -m tornado.test.runtests tornado.test.stack_context_test
 
     """
     from tornado.options import define, options, parse_command_line