--- a/mozilla-tests/b2g_config.py
+++ b/mozilla-tests/b2g_config.py
@@ -23,17 +23,17 @@ BRANCHES = {
 PLATFORMS = {
     'ics_armv7a_gecko': {},
 }
 
 builder_prefix = "b2g "
 
 PLATFORMS['ics_armv7a_gecko']['slave_platforms'] = ['fedora-b2g']
 PLATFORMS['ics_armv7a_gecko']['env_name'] = 'linux-perf'
-PLATFORMS['ics_armv7a_gecko']['fedora-b2g'] = {'name': builder_prefix + "Rev3 Fedora 12"}
+PLATFORMS['ics_armv7a_gecko']['fedora-b2g'] = {'name': builder_prefix + "ics_armv7a_gecko emulator"}
 PLATFORMS['ics_armv7a_gecko']['stage_product'] = 'b2g'
 PLATFORMS['ics_armv7a_gecko']['mozharness_config'] = {
     'mozharness_python': '/tools/buildbot/bin/python',
     'mozharness_repo': MOZHARNESS_REPO,
     'hg_bin': 'hg',
     'reboot_command': ['/tools/buildbot/bin/python'] + MOZHARNESS_REBOOT_CMD,
 }
 
@@ -60,16 +60,31 @@ SUITES = {}
 # Default set of unit tests
 UNITTEST_SUITES = {
     'opt_unittest_suites': [
         ('marionette-webapi', {'suite': 'marionette-webapi',
                                'mozharness_repo': MOZHARNESS_REPO,
                                'script_path': 'scripts/marionette.py',
                               },
         ),
+        ('mochitests-1/3', {'suite': 'mochitest-plain',
+                            'mozharness_repo': MOZHARNESS_REPO,
+                            'script_path': 'scripts/b2g_emulator_unittest.py',
+                           },
+        ),
+        ('mochitests-2/3', {'suite': 'mochitest-plain',
+                            'mozharness_repo': MOZHARNESS_REPO,
+                            'script_path': 'scripts/b2g_emulator_unittest.py',
+                           },
+        ),
+        ('mochitests-3/3', {'suite': 'mochitest-plain',
+                            'mozharness_repo': MOZHARNESS_REPO,
+                            'script_path': 'scripts/b2g_emulator_unittest.py',
+                           },
+        ),
     ],
     'debug_unittest_suites': [],
 }
 
 # You must define opt_unittest_suites when enable_opt_unittests is True for a
 # platform. Likewise debug_unittest_suites for enable_debug_unittests
 PLATFORM_UNITTEST_VARS = {
     'ics_armv7a_gecko': {
@@ -85,16 +100,37 @@ PLATFORM_UNITTEST_VARS = {
                 UNITTEST_SUITES['opt_unittest_suites'][:],
             'debug_unittest_suites' : UNITTEST_SUITES['debug_unittest_suites'][:],
             'suite_config': {
                 'marionette-webapi': {
                     'extra_args': [
                         "--cfg", "marionette/prod_emulator_config.py"
                     ],
                 },
+                'mochitests-1/3': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_prod_config.py',
+                        '--test-suite', 'mochitests',
+                        '--this-chunk', '1', '--total-chunks', '3',
+                    ],
+                },
+                'mochitests-2/3': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_prod_config.py',
+                        '--test-suite', 'mochitests',
+                        '--this-chunk', '2', '--total-chunks', '3',
+                    ],
+                },
+                'mochitests-3/3': {
+                    'extra_args': [
+                        '--cfg', 'b2g/emulator_prod_config.py',
+                        '--test-suite', 'mochitests',
+                        '--this-chunk', '3', '--total-chunks', '3',
+                    ],
+                },
             },
         },
     },
 }
 
 # Copy unittest vars in first, then platform vars
 for branch in BRANCHES.keys():
     for key, value in GLOBAL_VARS.items():