Index: utils/lit/examples/many-tests/ManyTests.py
===================================================================
--- utils/lit/examples/many-tests/ManyTests.py
+++ utils/lit/examples/many-tests/ManyTests.py
@@ -1,5 +1,3 @@
-# -*- Python -*-
-
 from lit import Test
 
 class ManyTests(object):
@@ -12,12 +10,9 @@
             test_name = 'test-%04d' % (i,)
             yield Test.Test(testSuite, path_in_suite + (test_name,),
                             localConfig)
-
     def execute(self, test, litConfig):
         # Do a "non-trivial" amount of Python work.
         sum = 0
         for i in range(10000):
             sum += i
         return Test.PASS,''
-
-config.test_format = ManyTests()
Index: utils/lit/examples/many-tests/lit.cfg
===================================================================
--- utils/lit/examples/many-tests/lit.cfg
+++ utils/lit/examples/many-tests/lit.cfg
@@ -1,23 +1,8 @@
 # -*- Python -*-
 
-from lit import Test
+import sys
+import os
+sys.path.insert(0, os.path.dirname(__file__))
+import ManyTests
 
-class ManyTests(object):
-    def __init__(self, N=10000):
-        self.N = N
-
-    def getTestsInDirectory(self, testSuite, path_in_suite,
-                            litConfig, localConfig):
-        for i in range(self.N):
-            test_name = 'test-%04d' % (i,)
-            yield Test.Test(testSuite, path_in_suite + (test_name,),
-                            localConfig)
-
-    def execute(self, test, litConfig):
-        # Do a "non-trivial" amount of Python work.
-        sum = 0
-        for i in range(10000):
-            sum += i
-        return Test.PASS,''
-
-config.test_format = ManyTests()
+config.test_format = ManyTests.ManyTests()