diff --git a/tools/test.py b/tools/test.py
index 59bfb9e70b0885..12ab9ab035c484 100755
--- a/tools/test.py
+++ b/tools/test.py
@@ -285,7 +285,7 @@ def HasRun(self, output):
     if output.UnexpectedOutput():
       status_line = 'not ok %i %s' % (self._done, command)
       self.severity = 'fail'
-      self.traceback = output.output.stdout + output.output.stderr
+      self.traceback = "exit code: " + output.output.exit_code + "\n" + output.output.stdout + output.output.stderr
 
       if FLAKY in output.test.outcomes and self.flaky_tests_mode == DONTCARE:
         status_line = status_line + ' # TODO : Fix flaky test'