diff --git a/tests/etl/test_buildbot.py b/tests/etl/test_buildbot.py
index a9ed3c7cf..0675cd0d9 100644
--- a/tests/etl/test_buildbot.py
+++ b/tests/etl/test_buildbot.py
@@ -74,6 +74,17 @@ buildernames = [
                    'os': 'linux',
                    'os_platform': 'b2g-linux64',
                    'vm': True}}),
+    ('b2g_emulator mozilla-central opt test mochitest-chrome',
+     {'build_type': 'opt',
+      'job_type': 'unittest',
+      'name': {'group_name': 'Mochitest',
+               'group_symbol': 'M',
+               'name': 'Mochitest Chrome',
+               'job_symbol': 'c'},
+      'platform': {'arch': 'armv7',
+                   'os': 'b2g',
+                   'os_platform': 'b2g-emu-ics',
+                   'vm': False}}),
     ('Ubuntu VM 12.04 mozilla-central opt test jittest-2',
      {'build_type': 'opt',
       'job_type': 'unittest',
diff --git a/treeherder/etl/buildbot.py b/treeherder/etl/buildbot.py
index 2702d62e9..ee20cb201 100644
--- a/treeherder/etl/buildbot.py
+++ b/treeherder/etl/buildbot.py
@@ -431,6 +431,7 @@ JOB_NAME_BUILDERNAME = [
     {"regex": re.compile(r'mochitest-other'), "desc": "Mochitest Other"},
     {"regex": re.compile(r'mochitest-(?:web)?gl'), "desc": "Mochitest WebGL"},
     {"regex": re.compile(r'mochitest-oop'), "desc": "Mochitest OOP"},
+    {"regex": re.compile(r'mochitest-chrome'), "desc": "Mochitest Chrome"},
     {"regex": re.compile(r'mochitest'), "desc": "Mochitest"},
     {"regex": re.compile(r'webapprt-chrome$'), "desc": "Webapprt Chrome"},
     {"regex": re.compile(r'webapprt-content$'), "desc": "Webapprt Content"},
@@ -619,6 +620,7 @@ GROUP_NAMES = {
     "Android x86 Test Set": "Android x86 Test Combos",
     "Mochitest": "Mochitest",
     "Mochitest Browser Chrome": "Mochitest",
+    "Mochitest Chrome": "Mochitest",
     "Mochitest DevTools Browser Chrome": "Mochitest",
     "Mochitest WebGL": "Mochitest",
     "Mochitest Jetpack": "Mochitest",
@@ -810,6 +812,7 @@ SYMBOLS = {
     # run across all platforms and therefore benefit from better vertical alignment.
     "Mochitest": "M",
     "Mochitest Browser Chrome": "bc",
+    "Mochitest Chrome": "c",
     "Mochitest DevTools Browser Chrome": "dt",
     "Mochitest WebGL": "gl",
     "Mochitest Jetpack": "JP",