--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -174,17 +174,21 @@ PLATFORMS['linux64-asan']['mozharness_co
     'mozharness_python': '/tools/buildbot/bin/python',
     'hg_bin': 'hg',
     'reboot_command': ['/tools/buildbot/bin/python'] + MOZHARNESS_REBOOT_CMD,
     'system_bits': '64',
     'config_file': 'talos/linux_config.py',
 }
 
 PLATFORMS['linux64-tsan']['slave_platforms'] = ['ubuntu64_vm']
-PLATFORMS['linux64-tsan']['ubuntu64_vm'] = {'name': 'Ubuntu TSAN VM 12.04 x64'}
+PLATFORMS['linux64-tsan']['ubuntu64_vm'] = {
+    'name': 'Ubuntu TSAN VM 12.04 x64',
+    'build_dir_prefix': 'ubuntu64_vm_tsan',
+    'scheduler_slave_platform_identifier': 'ubuntu64_vm_tsan'
+}
 PLATFORMS['linux64-tsan']['stage_product'] = 'firefox'
 PLATFORMS['linux64-tsan']['mozharness_config'] = {
     'mozharness_python': '/tools/buildbot/bin/python',
     'hg_bin': 'hg',
     'reboot_command': ['/tools/buildbot/bin/python'] + MOZHARNESS_REBOOT_CMD,
     'system_bits': '64',
     'config_file': 'talos/linux_config.py',
 }
@@ -1084,19 +1088,19 @@ PLATFORM_UNITTEST_VARS = {
     'linux64-tsan': {
         'product_name': 'firefox',
         'app_name': 'browser',
         'brand_name': 'Minefield',
         'builds_before_reboot': 1,
         'unittest-env': {'DISPLAY': ':0'},
         'enable_opt_unittests': True,
         'enable_debug_unittests': False,
-        'ubuntu64-tsan_vm': {
+        'ubuntu64_vm': {
             'opt_unittest_suites': UNITTEST_SUITES['opt_unittest_suites'][:],
-            'debug_unittest_suites': UNITTEST_SUITES['debug_unittest_suites'][:] + XPCSHELL,
+            'debug_unittest_suites': [],
             'suite_config': {
                 'mochitest': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
                 'mochitest-push': {
                     'config_files': ["unittests/linux_unittest.py"],
                 },
                 'mochitest-e10s': {