diff --git a/llvm/utils/lit/examples/README.txt b/llvm/utils/lit/examples/README.txt
new file mode 100644
index 000000000000..a59daa8f770a
--- /dev/null
+++ b/llvm/utils/lit/examples/README.txt
@@ -0,0 +1,7 @@
+==============
+ lit Examples
+==============
+
+This directory contains examples of 'lit' test suite configurations. The test
+suites they define can be run with 'lit examples/example-name', for more details
+see the README in each example.
diff --git a/llvm/utils/lit/examples/many-tests/README.txt b/llvm/utils/lit/examples/many-tests/README.txt
new file mode 100644
index 000000000000..6bffff1468c0
--- /dev/null
+++ b/llvm/utils/lit/examples/many-tests/README.txt
@@ -0,0 +1,10 @@
+========================
+ Many Tests lit Example
+========================
+
+This directory contains a trivial lit test suite configuration that defines a
+custom test format which just generates a large (N=10000) number of tests that
+do a small amount of work in the Python test execution code.
+
+This test suite is useful for testing the performance of lit on large numbers of
+tests.
diff --git a/llvm/utils/lit/lit/ExampleTests/ManyTests/lit.local.cfg b/llvm/utils/lit/examples/many-tests/lit.cfg
similarity index 96%
rename from llvm/utils/lit/lit/ExampleTests/ManyTests/lit.local.cfg
rename to llvm/utils/lit/examples/many-tests/lit.cfg
index 6cc47522b16c..8f7b940b6eac 100644
--- a/llvm/utils/lit/lit/ExampleTests/ManyTests/lit.local.cfg
+++ b/llvm/utils/lit/examples/many-tests/lit.cfg
@@ -1,6 +1,6 @@
 # -*- Python -*-
 
-Test = lit.Test
+from lit import Test
 
 class ManyTests(object):
     def __init__(self, N=10000):