diff --git a/Library/Contributions/cmd/brew-test-bot.xml.erb b/Library/Contributions/cmd/brew-test-bot.xml.erb
index a835740f37..f5fb4079b7 100644
--- a/Library/Contributions/cmd/brew-test-bot.xml.erb
+++ b/Library/Contributions/cmd/brew-test-bot.xml.erb
@@ -3,11 +3,14 @@
   <% tests.each do |test| %>
   <testsuite name="brew-test-bot.<%= test.name %>" tests="<%= test.steps.count %>">
     <% test.steps.each do |step| %>
-    <testcase name="<%= step.command %>" status="<%= step.status %>" time="<%= step.time %>">
+    <testcase name="<%= step.command_short %>" status="<%= step.status %>" time="<%= step.time %>">
       <% if step.has_output? %>
+      <% if step.failed? %>
+      <failure message="<%= step.status %>: <%= step.command %>"><![CDATA[<%= step.output %>]]></failure>
+      <% else %>
       <system-out><![CDATA[<%= step.output %>]]></system-out>
       <% end %>
-      <% if step.failed? %>
+      <% elsif step.failed? %>
       <failure />
       <% end %>
     </testcase>