diff --git a/tests/intermittents_commenter/expected_comment.text b/tests/intermittents_commenter/expected_comment.text
index 30a5a0ae35f..b173ad77080 100644
--- a/tests/intermittents_commenter/expected_comment.text
+++ b/tests/intermittents_commenter/expected_comment.text
@@ -6,7 +6,7 @@ Repository breakdown:
 * mozilla-central: 1
 
 Platform and build breakdown:
-* b2g-emu-jb: 1
+* linux1804: 1
   * debug: 1
 
 For more details, see:
diff --git a/tests/webapp/api/test_note_api.py b/tests/webapp/api/test_note_api.py
index 2bc6a539ccb..b694df36c22 100644
--- a/tests/webapp/api/test_note_api.py
+++ b/tests/webapp/api/test_note_api.py
@@ -159,7 +159,7 @@ def test_push_notes(client, test_job_with_notes):
             "id": 1,
             "job": {
                 "task_id": notes[0].job.taskcluster_metadata.task_id,
-                "job_type_name": "B2G Emulator Image Build",
+                "job_type_name": "Linux x64 Tsan Build",
                 "result": "success",
                 "duration": 191,
             },
@@ -173,7 +173,7 @@ def test_push_notes(client, test_job_with_notes):
             "id": 2,
             "job": {
                 "duration": 191,
-                "job_type_name": "B2G Emulator Image Build",
+                "job_type_name": "Linux x64 Tsan Build",
                 "result": "success",
                 "task_id": notes[1].job.taskcluster_metadata.task_id,
             },
diff --git a/tests/webapp/api/test_performance_data_api.py b/tests/webapp/api/test_performance_data_api.py
index 8bc29282e4f..0b36924324f 100644
--- a/tests/webapp/api/test_performance_data_api.py
+++ b/tests/webapp/api/test_performance_data_api.py
@@ -721,8 +721,8 @@ def test_alert_summary_tasks_get(client, test_perf_alert_summary, test_perf_data
     assert resp.json() == {
         "id": test_perf_alert_summary.id,
         "tasks": [
-            "B2G Emulator Image Build",
             "Inari Device Image Build",
+            "Linux x64 Tsan Build",
             "Mochitest Browser Chrome",
             "Nexus 4 Device Image Build",
         ],