--- a/tests/run-tests.py	Sun Apr 20 10:08:33 2014 -0700
+++ b/tests/run-tests.py	Sun Apr 20 10:09:23 2014 -0700
@@ -1461,10 +1461,6 @@
             else:
                 print "WARNING: Did not find prerequisite tool: %s " % p
 
-def main(args, runner=None, parser=None):
-    runner = runner or TestRunner()
-
-    return runner.run(args, parser=parser)
-
 if __name__ == '__main__':
-    sys.exit(main(sys.argv[1:]))
+    runner = TestRunner()
+    sys.exit(runner.run(sys.argv[1:]))