diff --git a/tools/test.py b/tools/test.py
index 62457ec0717a6f..3b420b7a8a0d0a 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -333,7 +333,7 @@ def HasRun(self, output):
       (total_seconds, duration.microseconds / 1000))
     if self.severity is not 'ok' or self.traceback is not '':
       if output.HasTimedOut():
-        self.traceback = 'timeout'
+        self.traceback = 'timeout\n' + output.output.stdout + output.output.stderr
       self._printDiagnostic()
     logger.info('  ...')