diff --git a/llvm/utils/lit/lit/LitTestCase.py b/llvm/utils/lit/lit/LitTestCase.py
new file mode 100644
--- /dev/null
+++ b/llvm/utils/lit/lit/LitTestCase.py
@@ -0,0 +1,62 @@
+import unittest
+
+import lit.worker
+import lit.LitConfig
+
+"""
+TestCase adaptor for providing a Python 'unittest' compatible interface to 'lit'
+tests.
+"""
+
+
+class UnresolvedError(RuntimeError):
+    pass
+
+
+class LitTestCase(unittest.TestCase):
+    def __init__(self, test, lit_config):
+        unittest.TestCase.__init__(self)
+        self._test = test
+        self._lit_config = lit_config
+
+    def id(self):
+        return self._test.getFullName()
+
+    def shortDescription(self):
+        return self._test.getFullName()
+
+    def runTest(self):
+        # Run the test.
+        lit.worker._execute_test(self._test, self._lit_config)
+
+        # Adapt the result to unittest.
+        result = self._test.result
+        if result.code is lit.Test.UNRESOLVED:
+            raise UnresolvedError(result.output)
+        elif result.code.isFailure:
+            self.fail(result.output)
+
+
+def load_test_suite(inputs):
+    import platform
+    windows = platform.system() == 'Windows'
+
+    # Create the global config object.
+    lit_config = lit.LitConfig.LitConfig(
+        progname='lit',
+        path=[],
+        quiet=False,
+        useValgrind=False,
+        valgrindLeakCheck=False,
+        valgrindArgs=[],
+        noExecute=False,
+        debug=False,
+        isWindows=windows,
+        params={})
+
+    # Perform test discovery.
+    tests = lit.discovery.find_tests_for_inputs(lit_config, inputs)
+    test_adaptors = [LitTestCase(t, lit_config) for t in tests]
+
+    # Return a unittest test suite which just runs the tests in order.
+    return unittest.TestSuite(test_adaptors)
diff --git a/llvm/utils/lit/tests/Inputs/unittest-adaptor/lit.cfg b/llvm/utils/lit/tests/Inputs/unittest-adaptor/lit.cfg
new file mode 100644
--- /dev/null
+++ b/llvm/utils/lit/tests/Inputs/unittest-adaptor/lit.cfg
@@ -0,0 +1,6 @@
+import lit.formats
+config.name = 'unittest-adaptor'
+config.suffixes = ['.txt']
+config.test_format = lit.formats.ShTest()
+config.test_source_root = None
+config.test_exec_root = None
diff --git a/llvm/utils/lit/tests/Inputs/unittest-adaptor/test-one.txt b/llvm/utils/lit/tests/Inputs/unittest-adaptor/test-one.txt
new file mode 100644
--- /dev/null
+++ b/llvm/utils/lit/tests/Inputs/unittest-adaptor/test-one.txt
@@ -0,0 +1 @@
+# RUN: true
diff --git a/llvm/utils/lit/tests/Inputs/unittest-adaptor/test-two.txt b/llvm/utils/lit/tests/Inputs/unittest-adaptor/test-two.txt
new file mode 100644
--- /dev/null
+++ b/llvm/utils/lit/tests/Inputs/unittest-adaptor/test-two.txt
@@ -0,0 +1 @@
+# RUN: false
diff --git a/llvm/utils/lit/tests/unittest-adaptor.py b/llvm/utils/lit/tests/unittest-adaptor.py
new file mode 100644
--- /dev/null
+++ b/llvm/utils/lit/tests/unittest-adaptor.py
@@ -0,0 +1,17 @@
+# Check the lit adaption to run under unittest.
+#
+# RUN: %{python} %s %{inputs}/unittest-adaptor 2> %t.err
+# RUN: FileCheck < %t.err %s
+#
+# CHECK-DAG: unittest-adaptor :: test-two.txt ... FAIL
+# CHECK-DAG: unittest-adaptor :: test-one.txt ... ok
+
+import sys
+import unittest
+
+import lit.LitTestCase
+
+input_path = sys.argv[1]
+unittest_suite = lit.LitTestCase.load_test_suite([input_path])
+runner = unittest.TextTestRunner(verbosity=2)
+runner.run(unittest_suite)