diff --git a/buildbot/master/files/config/factories.py b/buildbot/master/files/config/factories.py
index ff77cc72..7122b3f8 100644
--- a/buildbot/master/files/config/factories.py
+++ b/buildbot/master/files/config/factories.py
@@ -230,6 +230,11 @@ def make_step(self, command):
             else:
                 step_desc += [arg]
 
+        # Add Git SHA for tracking testing failures
+        if step_class == steps.Test:
+            step_env['GIT_SHA'] = self.getProperty('got_revision')
+            step_kwargs['gitSha'] = self.getProperty('got_revision')
+
         if step_class != steps.ShellCommand:
             step_kwargs['description'] = "running"
             step_kwargs['descriptionDone'] = "ran"