diff --git a/tests/etl/test_classification_mirroring.py b/tests/etl/test_classification_mirroring.py
index 12fa32a70..f5879163a 100644
--- a/tests/etl/test_classification_mirroring.py
+++ b/tests/etl/test_classification_mirroring.py
@@ -85,6 +85,7 @@ def test_bugzilla_comment_request_body(test_project, eleven_jobs_processed):
                     u'start_time: 2013-11-13T06:39:13\n'
                     u'who: user[at]mozilla[dot]com\n'
                     u'machine: bld-linux64-ec2-132\n'
+                    u'buildname: non-buildbot b2g-emu-jb test B2G Emulator Image Build\n'
                     u'revision: cdfe03e77e66\n\n'
                     u'First error line\n'
                     u'Second error line')
diff --git a/treeherder/etl/classification_mirroring.py b/treeherder/etl/classification_mirroring.py
index 3430aee6a..f328fd06e 100644
--- a/treeherder/etl/classification_mirroring.py
+++ b/treeherder/etl/classification_mirroring.py
@@ -137,6 +137,9 @@ class BugzillaCommentRequest(object):
 
         if buildapi_info:
             job_description['buildname'] = buildapi_info[0]["blob"]["buildername"]
+        else:
+            # make up a buildername for taskcluster jobs
+            job_description['buildname'] = 'non-buildbot %s test %s' % (job["platform"], job["job_type_name"])
 
         body_comment = '\n'.join(
             ["{0}: {1}".format(k, v) for k, v in job_description.items()])