Index: lldb/packages/Python/lldbsuite/test/test_result.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/test_result.py
+++ lldb/packages/Python/lldbsuite/test/test_result.py
@@ -9,6 +9,7 @@
 
 # System modules
 import os
+import traceback
 
 # Third-party modules
 import unittest2
@@ -243,8 +244,8 @@
         if method:
             method()
         self.stream.write(
-            "CLEANUP ERROR: LLDB (%s) :: %s\n" %
-            (self._config_string(test), str(test)))
+            "CLEANUP ERROR: LLDB (%s) :: %s\n%s\n" %
+            (self._config_string(test), str(test), traceback.format_exc()))
         if self.results_formatter:
             self.results_formatter.handle_event(
                 EventBuilder.event_for_cleanup_error(