diff --git a/recipe_modules/test_utils/api.py b/recipe_modules/test_utils/api.py
index d21060d..49d39ce 100644
--- a/recipe_modules/test_utils/api.py
+++ b/recipe_modules/test_utils/api.py
@@ -86,3 +86,12 @@
     else:
       test_run_status = 'success'
     return test_run_status
+
+  def test_step_name(self, step_name):
+    """Append keyword test to test step name to be consistent.
+    Args:
+      step_name(str): The name of the step.
+
+    Returns(str): The test step name prefixed with "test".
+    """
+    return 'test: %s' % step_name
diff --git a/recipe_modules/test_utils/examples/full.py b/recipe_modules/test_utils/examples/full.py
index 6d95eda..c5e8396 100644
--- a/recipe_modules/test_utils/examples/full.py
+++ b/recipe_modules/test_utils/examples/full.py
@@ -14,10 +14,12 @@
 def RunSteps(api):
   api.test_utils.run_test('mytest', ['ls', '-la'])
   api.test_utils.is_devicelab_bot()
+  api.test_utils.test_step_name('test')
 
 
 def GenTests(api):
-  yield api.test('passing',
+  yield api.test(
+      'passing',
       api.step_data(
           'mytest',
           stdout=api.raw_io.output_text('#success\nthis is a success'),
@@ -42,8 +44,6 @@
   yield api.test(
       'long_stdout',
       api.step_data(
-          'mytest',
-          stdout=api.raw_io.output_text(very_long_string),
-          retcode=1
+          'mytest', stdout=api.raw_io.output_text(very_long_string), retcode=1
       )
   )
diff --git a/recipes/engine.expected/Linux Fuchsia failing test.json b/recipes/engine.expected/Linux Fuchsia failing test.json
index 15857e3..8fce245 100644
--- a/recipes/engine.expected/Linux Fuchsia failing test.json
+++ b/recipes/engine.expected/Linux Fuchsia failing test.json
@@ -1179,7 +1179,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_jit_release_x86"
+    "name": "test: Host Tests for android_jit_release_x86"
   },
   {
     "cmd": [
diff --git a/recipes/engine.expected/clobber.json b/recipes/engine.expected/clobber.json
index f07d721..4a5782d 100644
--- a/recipes/engine.expected/clobber.json
+++ b/recipes/engine.expected/clobber.json
@@ -1986,7 +1986,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
@@ -2412,7 +2412,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_release"
+    "name": "test: Host Tests for host_release"
   },
   {
     "cmd": [
@@ -5162,7 +5162,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_jit_release_x86"
+    "name": "test: Host Tests for android_jit_release_x86"
   },
   {
     "cmd": [
@@ -6036,7 +6036,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_debug"
+    "name": "test: Host Tests for android_debug"
   },
   {
     "cmd": [
@@ -9232,7 +9232,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Build and test arm64 profile.Android Firebase Test",
+    "name": "Build and test arm64 profile.test: Android Firebase Test",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
diff --git a/recipes/engine.expected/experimental.json b/recipes/engine.expected/experimental.json
index d6200d7..a665ff3 100644
--- a/recipes/engine.expected/experimental.json
+++ b/recipes/engine.expected/experimental.json
@@ -1984,7 +1984,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
@@ -2410,7 +2410,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_release"
+    "name": "test: Host Tests for host_release"
   },
   {
     "cmd": [
@@ -5160,7 +5160,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_jit_release_x86"
+    "name": "test: Host Tests for android_jit_release_x86"
   },
   {
     "cmd": [
@@ -6034,7 +6034,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_debug"
+    "name": "test: Host Tests for android_debug"
   },
   {
     "cmd": [
@@ -9220,7 +9220,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Build and test arm64 profile.Android Firebase Test",
+    "name": "Build and test arm64 profile.test: Android Firebase Test",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
diff --git a/recipes/engine.expected/experimental_upload.json b/recipes/engine.expected/experimental_upload.json
index f62f470..3421c44 100644
--- a/recipes/engine.expected/experimental_upload.json
+++ b/recipes/engine.expected/experimental_upload.json
@@ -1984,7 +1984,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
@@ -2410,7 +2410,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_release"
+    "name": "test: Host Tests for host_release"
   },
   {
     "cmd": [
@@ -5589,7 +5589,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_jit_release_x86"
+    "name": "test: Host Tests for android_jit_release_x86"
   },
   {
     "cmd": [
@@ -6502,7 +6502,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_debug"
+    "name": "test: Host Tests for android_debug"
   },
   {
     "cmd": [
@@ -10552,7 +10552,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Build and test arm64 profile.Android Firebase Test",
+    "name": "Build and test arm64 profile.test: Android Firebase Test",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
diff --git a/recipes/engine.expected/fail_android_aot_sharded_builds.json b/recipes/engine.expected/fail_android_aot_sharded_builds.json
index 936acd6..913e9a9 100644
--- a/recipes/engine.expected/fail_android_aot_sharded_builds.json
+++ b/recipes/engine.expected/fail_android_aot_sharded_builds.json
@@ -1256,7 +1256,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_jit_release_x86"
+    "name": "test: Host Tests for android_jit_release_x86"
   },
   {
     "cmd": [
diff --git a/recipes/engine.expected/first_bot_update_failed.json b/recipes/engine.expected/first_bot_update_failed.json
index 1957f61..f72db3f 100644
--- a/recipes/engine.expected/first_bot_update_failed.json
+++ b/recipes/engine.expected/first_bot_update_failed.json
@@ -2119,7 +2119,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
@@ -2545,7 +2545,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_release"
+    "name": "test: Host Tests for host_release"
   },
   {
     "cmd": [
@@ -5295,7 +5295,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_jit_release_x86"
+    "name": "test: Host Tests for android_jit_release_x86"
   },
   {
     "cmd": [
@@ -6169,7 +6169,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_debug"
+    "name": "test: Host Tests for android_debug"
   },
   {
     "cmd": [
@@ -9365,7 +9365,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Build and test arm64 profile.Android Firebase Test",
+    "name": "Build and test arm64 profile.test: Android Firebase Test",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
diff --git a/recipes/engine.expected/gcloud_pubsub_failure.json b/recipes/engine.expected/gcloud_pubsub_failure.json
index 788eb7f..372dd43 100644
--- a/recipes/engine.expected/gcloud_pubsub_failure.json
+++ b/recipes/engine.expected/gcloud_pubsub_failure.json
@@ -1952,7 +1952,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
@@ -2378,7 +2378,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_release"
+    "name": "test: Host Tests for host_release"
   },
   {
     "cmd": [
@@ -5128,7 +5128,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_jit_release_x86"
+    "name": "test: Host Tests for android_jit_release_x86"
   },
   {
     "cmd": [
@@ -6002,7 +6002,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_debug"
+    "name": "test: Host Tests for android_debug"
   },
   {
     "cmd": [
@@ -9198,7 +9198,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Build and test arm64 profile.Android Firebase Test",
+    "name": "Build and test arm64 profile.test: Android Firebase Test",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
diff --git a/recipes/engine.expected/linux.json b/recipes/engine.expected/linux.json
index 39c526e..006cfb5 100644
--- a/recipes/engine.expected/linux.json
+++ b/recipes/engine.expected/linux.json
@@ -1950,7 +1950,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
@@ -2376,7 +2376,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_release"
+    "name": "test: Host Tests for host_release"
   },
   {
     "cmd": [
@@ -5126,7 +5126,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_jit_release_x86"
+    "name": "test: Host Tests for android_jit_release_x86"
   },
   {
     "cmd": [
@@ -6000,7 +6000,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_debug"
+    "name": "test: Host Tests for android_debug"
   },
   {
     "cmd": [
@@ -9186,7 +9186,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Build and test arm64 profile.Android Firebase Test",
+    "name": "Build and test arm64 profile.test: Android Firebase Test",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
diff --git a/recipes/engine.expected/linux_font_subset.json b/recipes/engine.expected/linux_font_subset.json
index 39c526e..006cfb5 100644
--- a/recipes/engine.expected/linux_font_subset.json
+++ b/recipes/engine.expected/linux_font_subset.json
@@ -1950,7 +1950,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
@@ -2376,7 +2376,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_release"
+    "name": "test: Host Tests for host_release"
   },
   {
     "cmd": [
@@ -5126,7 +5126,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_jit_release_x86"
+    "name": "test: Host Tests for android_jit_release_x86"
   },
   {
     "cmd": [
@@ -6000,7 +6000,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_debug"
+    "name": "test: Host Tests for android_debug"
   },
   {
     "cmd": [
@@ -9186,7 +9186,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Build and test arm64 profile.Android Firebase Test",
+    "name": "Build and test arm64 profile.test: Android Firebase Test",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
diff --git a/recipes/engine.expected/linux_maven.json b/recipes/engine.expected/linux_maven.json
index 39c526e..006cfb5 100644
--- a/recipes/engine.expected/linux_maven.json
+++ b/recipes/engine.expected/linux_maven.json
@@ -1950,7 +1950,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
@@ -2376,7 +2376,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_release"
+    "name": "test: Host Tests for host_release"
   },
   {
     "cmd": [
@@ -5126,7 +5126,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_jit_release_x86"
+    "name": "test: Host Tests for android_jit_release_x86"
   },
   {
     "cmd": [
@@ -6000,7 +6000,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_debug"
+    "name": "test: Host Tests for android_debug"
   },
   {
     "cmd": [
@@ -9186,7 +9186,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Build and test arm64 profile.Android Firebase Test",
+    "name": "Build and test arm64 profile.test: Android Firebase Test",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
diff --git a/recipes/engine.expected/linux_maven_font_subset.json b/recipes/engine.expected/linux_maven_font_subset.json
index 39c526e..006cfb5 100644
--- a/recipes/engine.expected/linux_maven_font_subset.json
+++ b/recipes/engine.expected/linux_maven_font_subset.json
@@ -1950,7 +1950,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
@@ -2376,7 +2376,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_release"
+    "name": "test: Host Tests for host_release"
   },
   {
     "cmd": [
@@ -5126,7 +5126,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_jit_release_x86"
+    "name": "test: Host Tests for android_jit_release_x86"
   },
   {
     "cmd": [
@@ -6000,7 +6000,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_debug"
+    "name": "test: Host Tests for android_debug"
   },
   {
     "cmd": [
@@ -9186,7 +9186,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Build and test arm64 profile.Android Firebase Test",
+    "name": "Build and test arm64 profile.test: Android Firebase Test",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
diff --git a/recipes/engine.expected/linux_maven_no_lto.json b/recipes/engine.expected/linux_maven_no_lto.json
index c0f8549..dd5a723 100644
--- a/recipes/engine.expected/linux_maven_no_lto.json
+++ b/recipes/engine.expected/linux_maven_no_lto.json
@@ -1953,7 +1953,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
@@ -2379,7 +2379,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_release"
+    "name": "test: Host Tests for host_release"
   },
   {
     "cmd": [
@@ -5132,7 +5132,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_jit_release_x86"
+    "name": "test: Host Tests for android_jit_release_x86"
   },
   {
     "cmd": [
@@ -6006,7 +6006,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_debug"
+    "name": "test: Host Tests for android_debug"
   },
   {
     "cmd": [
@@ -9193,7 +9193,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Build and test arm64 profile.Android Firebase Test",
+    "name": "Build and test arm64 profile.test: Android Firebase Test",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
diff --git a/recipes/engine.expected/linux_maven_no_lto_font_subset.json b/recipes/engine.expected/linux_maven_no_lto_font_subset.json
index c0f8549..dd5a723 100644
--- a/recipes/engine.expected/linux_maven_no_lto_font_subset.json
+++ b/recipes/engine.expected/linux_maven_no_lto_font_subset.json
@@ -1953,7 +1953,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
@@ -2379,7 +2379,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_release"
+    "name": "test: Host Tests for host_release"
   },
   {
     "cmd": [
@@ -5132,7 +5132,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_jit_release_x86"
+    "name": "test: Host Tests for android_jit_release_x86"
   },
   {
     "cmd": [
@@ -6006,7 +6006,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_debug"
+    "name": "test: Host Tests for android_debug"
   },
   {
     "cmd": [
@@ -9193,7 +9193,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Build and test arm64 profile.Android Firebase Test",
+    "name": "Build and test arm64 profile.test: Android Firebase Test",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
diff --git a/recipes/engine.expected/linux_maven_publish_cipd.json b/recipes/engine.expected/linux_maven_publish_cipd.json
index 39c526e..006cfb5 100644
--- a/recipes/engine.expected/linux_maven_publish_cipd.json
+++ b/recipes/engine.expected/linux_maven_publish_cipd.json
@@ -1950,7 +1950,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
@@ -2376,7 +2376,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_release"
+    "name": "test: Host Tests for host_release"
   },
   {
     "cmd": [
@@ -5126,7 +5126,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_jit_release_x86"
+    "name": "test: Host Tests for android_jit_release_x86"
   },
   {
     "cmd": [
@@ -6000,7 +6000,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_debug"
+    "name": "test: Host Tests for android_debug"
   },
   {
     "cmd": [
@@ -9186,7 +9186,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Build and test arm64 profile.Android Firebase Test",
+    "name": "Build and test arm64 profile.test: Android Firebase Test",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
diff --git a/recipes/engine.expected/linux_maven_publish_cipd_font_subset.json b/recipes/engine.expected/linux_maven_publish_cipd_font_subset.json
index 39c526e..006cfb5 100644
--- a/recipes/engine.expected/linux_maven_publish_cipd_font_subset.json
+++ b/recipes/engine.expected/linux_maven_publish_cipd_font_subset.json
@@ -1950,7 +1950,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
@@ -2376,7 +2376,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_release"
+    "name": "test: Host Tests for host_release"
   },
   {
     "cmd": [
@@ -5126,7 +5126,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_jit_release_x86"
+    "name": "test: Host Tests for android_jit_release_x86"
   },
   {
     "cmd": [
@@ -6000,7 +6000,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_debug"
+    "name": "test: Host Tests for android_debug"
   },
   {
     "cmd": [
@@ -9186,7 +9186,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Build and test arm64 profile.Android Firebase Test",
+    "name": "Build and test arm64 profile.test: Android Firebase Test",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
diff --git a/recipes/engine.expected/linux_maven_publish_cipd_no_lto.json b/recipes/engine.expected/linux_maven_publish_cipd_no_lto.json
index c0f8549..dd5a723 100644
--- a/recipes/engine.expected/linux_maven_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/linux_maven_publish_cipd_no_lto.json
@@ -1953,7 +1953,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
@@ -2379,7 +2379,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_release"
+    "name": "test: Host Tests for host_release"
   },
   {
     "cmd": [
@@ -5132,7 +5132,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_jit_release_x86"
+    "name": "test: Host Tests for android_jit_release_x86"
   },
   {
     "cmd": [
@@ -6006,7 +6006,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_debug"
+    "name": "test: Host Tests for android_debug"
   },
   {
     "cmd": [
@@ -9193,7 +9193,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Build and test arm64 profile.Android Firebase Test",
+    "name": "Build and test arm64 profile.test: Android Firebase Test",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
diff --git a/recipes/engine.expected/linux_maven_publish_cipd_no_lto_font_subset.json b/recipes/engine.expected/linux_maven_publish_cipd_no_lto_font_subset.json
index c0f8549..dd5a723 100644
--- a/recipes/engine.expected/linux_maven_publish_cipd_no_lto_font_subset.json
+++ b/recipes/engine.expected/linux_maven_publish_cipd_no_lto_font_subset.json
@@ -1953,7 +1953,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
@@ -2379,7 +2379,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_release"
+    "name": "test: Host Tests for host_release"
   },
   {
     "cmd": [
@@ -5132,7 +5132,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_jit_release_x86"
+    "name": "test: Host Tests for android_jit_release_x86"
   },
   {
     "cmd": [
@@ -6006,7 +6006,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_debug"
+    "name": "test: Host Tests for android_debug"
   },
   {
     "cmd": [
@@ -9193,7 +9193,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Build and test arm64 profile.Android Firebase Test",
+    "name": "Build and test arm64 profile.test: Android Firebase Test",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
diff --git a/recipes/engine.expected/linux_no_lto.json b/recipes/engine.expected/linux_no_lto.json
index c0f8549..dd5a723 100644
--- a/recipes/engine.expected/linux_no_lto.json
+++ b/recipes/engine.expected/linux_no_lto.json
@@ -1953,7 +1953,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
@@ -2379,7 +2379,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_release"
+    "name": "test: Host Tests for host_release"
   },
   {
     "cmd": [
@@ -5132,7 +5132,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_jit_release_x86"
+    "name": "test: Host Tests for android_jit_release_x86"
   },
   {
     "cmd": [
@@ -6006,7 +6006,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_debug"
+    "name": "test: Host Tests for android_debug"
   },
   {
     "cmd": [
@@ -9193,7 +9193,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Build and test arm64 profile.Android Firebase Test",
+    "name": "Build and test arm64 profile.test: Android Firebase Test",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
diff --git a/recipes/engine.expected/linux_no_lto_font_subset.json b/recipes/engine.expected/linux_no_lto_font_subset.json
index c0f8549..dd5a723 100644
--- a/recipes/engine.expected/linux_no_lto_font_subset.json
+++ b/recipes/engine.expected/linux_no_lto_font_subset.json
@@ -1953,7 +1953,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
@@ -2379,7 +2379,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_release"
+    "name": "test: Host Tests for host_release"
   },
   {
     "cmd": [
@@ -5132,7 +5132,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_jit_release_x86"
+    "name": "test: Host Tests for android_jit_release_x86"
   },
   {
     "cmd": [
@@ -6006,7 +6006,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_debug"
+    "name": "test: Host Tests for android_debug"
   },
   {
     "cmd": [
@@ -9193,7 +9193,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Build and test arm64 profile.Android Firebase Test",
+    "name": "Build and test arm64 profile.test: Android Firebase Test",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
diff --git a/recipes/engine.expected/linux_publish_cipd.json b/recipes/engine.expected/linux_publish_cipd.json
index 39c526e..006cfb5 100644
--- a/recipes/engine.expected/linux_publish_cipd.json
+++ b/recipes/engine.expected/linux_publish_cipd.json
@@ -1950,7 +1950,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
@@ -2376,7 +2376,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_release"
+    "name": "test: Host Tests for host_release"
   },
   {
     "cmd": [
@@ -5126,7 +5126,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_jit_release_x86"
+    "name": "test: Host Tests for android_jit_release_x86"
   },
   {
     "cmd": [
@@ -6000,7 +6000,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_debug"
+    "name": "test: Host Tests for android_debug"
   },
   {
     "cmd": [
@@ -9186,7 +9186,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Build and test arm64 profile.Android Firebase Test",
+    "name": "Build and test arm64 profile.test: Android Firebase Test",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
diff --git a/recipes/engine.expected/linux_publish_cipd_font_subset.json b/recipes/engine.expected/linux_publish_cipd_font_subset.json
index 39c526e..006cfb5 100644
--- a/recipes/engine.expected/linux_publish_cipd_font_subset.json
+++ b/recipes/engine.expected/linux_publish_cipd_font_subset.json
@@ -1950,7 +1950,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
@@ -2376,7 +2376,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_release"
+    "name": "test: Host Tests for host_release"
   },
   {
     "cmd": [
@@ -5126,7 +5126,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_jit_release_x86"
+    "name": "test: Host Tests for android_jit_release_x86"
   },
   {
     "cmd": [
@@ -6000,7 +6000,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_debug"
+    "name": "test: Host Tests for android_debug"
   },
   {
     "cmd": [
@@ -9186,7 +9186,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Build and test arm64 profile.Android Firebase Test",
+    "name": "Build and test arm64 profile.test: Android Firebase Test",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
diff --git a/recipes/engine.expected/linux_publish_cipd_no_lto.json b/recipes/engine.expected/linux_publish_cipd_no_lto.json
index c0f8549..dd5a723 100644
--- a/recipes/engine.expected/linux_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/linux_publish_cipd_no_lto.json
@@ -1953,7 +1953,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
@@ -2379,7 +2379,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_release"
+    "name": "test: Host Tests for host_release"
   },
   {
     "cmd": [
@@ -5132,7 +5132,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_jit_release_x86"
+    "name": "test: Host Tests for android_jit_release_x86"
   },
   {
     "cmd": [
@@ -6006,7 +6006,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_debug"
+    "name": "test: Host Tests for android_debug"
   },
   {
     "cmd": [
@@ -9193,7 +9193,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Build and test arm64 profile.Android Firebase Test",
+    "name": "Build and test arm64 profile.test: Android Firebase Test",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
diff --git a/recipes/engine.expected/linux_publish_cipd_no_lto_font_subset.json b/recipes/engine.expected/linux_publish_cipd_no_lto_font_subset.json
index c0f8549..dd5a723 100644
--- a/recipes/engine.expected/linux_publish_cipd_no_lto_font_subset.json
+++ b/recipes/engine.expected/linux_publish_cipd_no_lto_font_subset.json
@@ -1953,7 +1953,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
@@ -2379,7 +2379,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_release"
+    "name": "test: Host Tests for host_release"
   },
   {
     "cmd": [
@@ -5132,7 +5132,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_jit_release_x86"
+    "name": "test: Host Tests for android_jit_release_x86"
   },
   {
     "cmd": [
@@ -6006,7 +6006,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_debug"
+    "name": "test: Host Tests for android_debug"
   },
   {
     "cmd": [
@@ -9193,7 +9193,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Build and test arm64 profile.Android Firebase Test",
+    "name": "Build and test arm64 profile.test: Android Firebase Test",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
diff --git a/recipes/engine.expected/linux_upload.json b/recipes/engine.expected/linux_upload.json
index aeccd1d..8e2d0ba 100644
--- a/recipes/engine.expected/linux_upload.json
+++ b/recipes/engine.expected/linux_upload.json
@@ -1950,7 +1950,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
@@ -2376,7 +2376,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_release"
+    "name": "test: Host Tests for host_release"
   },
   {
     "cmd": [
@@ -5516,7 +5516,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_jit_release_x86"
+    "name": "test: Host Tests for android_jit_release_x86"
   },
   {
     "cmd": [
@@ -6429,7 +6429,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_debug"
+    "name": "test: Host Tests for android_debug"
   },
   {
     "cmd": [
@@ -10479,7 +10479,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Build and test arm64 profile.Android Firebase Test",
+    "name": "Build and test arm64 profile.test: Android Firebase Test",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
diff --git a/recipes/engine.expected/linux_upload_font_subset.json b/recipes/engine.expected/linux_upload_font_subset.json
index 7cd7a9c..bad2d52 100644
--- a/recipes/engine.expected/linux_upload_font_subset.json
+++ b/recipes/engine.expected/linux_upload_font_subset.json
@@ -1950,7 +1950,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
@@ -2376,7 +2376,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_release"
+    "name": "test: Host Tests for host_release"
   },
   {
     "cmd": [
@@ -5555,7 +5555,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_jit_release_x86"
+    "name": "test: Host Tests for android_jit_release_x86"
   },
   {
     "cmd": [
@@ -6468,7 +6468,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_debug"
+    "name": "test: Host Tests for android_debug"
   },
   {
     "cmd": [
@@ -10518,7 +10518,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Build and test arm64 profile.Android Firebase Test",
+    "name": "Build and test arm64 profile.test: Android Firebase Test",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
diff --git a/recipes/engine.expected/linux_upload_maven.json b/recipes/engine.expected/linux_upload_maven.json
index a63595b..fe9b4e1 100644
--- a/recipes/engine.expected/linux_upload_maven.json
+++ b/recipes/engine.expected/linux_upload_maven.json
@@ -1950,7 +1950,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
@@ -2376,7 +2376,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_release"
+    "name": "test: Host Tests for host_release"
   },
   {
     "cmd": [
@@ -5516,7 +5516,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_jit_release_x86"
+    "name": "test: Host Tests for android_jit_release_x86"
   },
   {
     "cmd": [
@@ -6429,7 +6429,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_debug"
+    "name": "test: Host Tests for android_debug"
   },
   {
     "cmd": [
@@ -10050,7 +10050,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Build and test arm64 profile.Android Firebase Test",
+    "name": "Build and test arm64 profile.test: Android Firebase Test",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
diff --git a/recipes/engine.expected/linux_upload_maven_font_subset.json b/recipes/engine.expected/linux_upload_maven_font_subset.json
index e7b8e08..4a3c505 100644
--- a/recipes/engine.expected/linux_upload_maven_font_subset.json
+++ b/recipes/engine.expected/linux_upload_maven_font_subset.json
@@ -1950,7 +1950,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
@@ -2376,7 +2376,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_release"
+    "name": "test: Host Tests for host_release"
   },
   {
     "cmd": [
@@ -5555,7 +5555,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_jit_release_x86"
+    "name": "test: Host Tests for android_jit_release_x86"
   },
   {
     "cmd": [
@@ -6468,7 +6468,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_debug"
+    "name": "test: Host Tests for android_debug"
   },
   {
     "cmd": [
@@ -10089,7 +10089,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Build and test arm64 profile.Android Firebase Test",
+    "name": "Build and test arm64 profile.test: Android Firebase Test",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
diff --git a/recipes/engine.expected/linux_upload_maven_no_lto.json b/recipes/engine.expected/linux_upload_maven_no_lto.json
index c5ccd79..36fbd57 100644
--- a/recipes/engine.expected/linux_upload_maven_no_lto.json
+++ b/recipes/engine.expected/linux_upload_maven_no_lto.json
@@ -1953,7 +1953,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
@@ -2379,7 +2379,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_release"
+    "name": "test: Host Tests for host_release"
   },
   {
     "cmd": [
@@ -5522,7 +5522,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_jit_release_x86"
+    "name": "test: Host Tests for android_jit_release_x86"
   },
   {
     "cmd": [
@@ -6435,7 +6435,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_debug"
+    "name": "test: Host Tests for android_debug"
   },
   {
     "cmd": [
@@ -10057,7 +10057,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Build and test arm64 profile.Android Firebase Test",
+    "name": "Build and test arm64 profile.test: Android Firebase Test",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
diff --git a/recipes/engine.expected/linux_upload_maven_no_lto_font_subset.json b/recipes/engine.expected/linux_upload_maven_no_lto_font_subset.json
index f677ddd..689169f 100644
--- a/recipes/engine.expected/linux_upload_maven_no_lto_font_subset.json
+++ b/recipes/engine.expected/linux_upload_maven_no_lto_font_subset.json
@@ -1953,7 +1953,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
@@ -2379,7 +2379,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_release"
+    "name": "test: Host Tests for host_release"
   },
   {
     "cmd": [
@@ -5561,7 +5561,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_jit_release_x86"
+    "name": "test: Host Tests for android_jit_release_x86"
   },
   {
     "cmd": [
@@ -6474,7 +6474,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_debug"
+    "name": "test: Host Tests for android_debug"
   },
   {
     "cmd": [
@@ -10096,7 +10096,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Build and test arm64 profile.Android Firebase Test",
+    "name": "Build and test arm64 profile.test: Android Firebase Test",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
diff --git a/recipes/engine.expected/linux_upload_maven_publish_cipd.json b/recipes/engine.expected/linux_upload_maven_publish_cipd.json
index 4827e18..34186e6 100644
--- a/recipes/engine.expected/linux_upload_maven_publish_cipd.json
+++ b/recipes/engine.expected/linux_upload_maven_publish_cipd.json
@@ -1950,7 +1950,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
@@ -2376,7 +2376,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_release"
+    "name": "test: Host Tests for host_release"
   },
   {
     "cmd": [
@@ -5516,7 +5516,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_jit_release_x86"
+    "name": "test: Host Tests for android_jit_release_x86"
   },
   {
     "cmd": [
@@ -6429,7 +6429,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_debug"
+    "name": "test: Host Tests for android_debug"
   },
   {
     "cmd": [
@@ -10050,7 +10050,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Build and test arm64 profile.Android Firebase Test",
+    "name": "Build and test arm64 profile.test: Android Firebase Test",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
diff --git a/recipes/engine.expected/linux_upload_maven_publish_cipd_font_subset.json b/recipes/engine.expected/linux_upload_maven_publish_cipd_font_subset.json
index 5299904..bb22a77 100644
--- a/recipes/engine.expected/linux_upload_maven_publish_cipd_font_subset.json
+++ b/recipes/engine.expected/linux_upload_maven_publish_cipd_font_subset.json
@@ -1950,7 +1950,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
@@ -2376,7 +2376,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_release"
+    "name": "test: Host Tests for host_release"
   },
   {
     "cmd": [
@@ -5555,7 +5555,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_jit_release_x86"
+    "name": "test: Host Tests for android_jit_release_x86"
   },
   {
     "cmd": [
@@ -6468,7 +6468,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_debug"
+    "name": "test: Host Tests for android_debug"
   },
   {
     "cmd": [
@@ -10089,7 +10089,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Build and test arm64 profile.Android Firebase Test",
+    "name": "Build and test arm64 profile.test: Android Firebase Test",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
diff --git a/recipes/engine.expected/linux_upload_maven_publish_cipd_no_lto.json b/recipes/engine.expected/linux_upload_maven_publish_cipd_no_lto.json
index 39e8d80..972ee00 100644
--- a/recipes/engine.expected/linux_upload_maven_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/linux_upload_maven_publish_cipd_no_lto.json
@@ -1953,7 +1953,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
@@ -2379,7 +2379,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_release"
+    "name": "test: Host Tests for host_release"
   },
   {
     "cmd": [
@@ -5522,7 +5522,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_jit_release_x86"
+    "name": "test: Host Tests for android_jit_release_x86"
   },
   {
     "cmd": [
@@ -6435,7 +6435,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_debug"
+    "name": "test: Host Tests for android_debug"
   },
   {
     "cmd": [
@@ -10057,7 +10057,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Build and test arm64 profile.Android Firebase Test",
+    "name": "Build and test arm64 profile.test: Android Firebase Test",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
diff --git a/recipes/engine.expected/linux_upload_maven_publish_cipd_no_lto_font_subset.json b/recipes/engine.expected/linux_upload_maven_publish_cipd_no_lto_font_subset.json
index c864cad..8b2a5e1 100644
--- a/recipes/engine.expected/linux_upload_maven_publish_cipd_no_lto_font_subset.json
+++ b/recipes/engine.expected/linux_upload_maven_publish_cipd_no_lto_font_subset.json
@@ -1953,7 +1953,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
@@ -2379,7 +2379,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_release"
+    "name": "test: Host Tests for host_release"
   },
   {
     "cmd": [
@@ -5561,7 +5561,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_jit_release_x86"
+    "name": "test: Host Tests for android_jit_release_x86"
   },
   {
     "cmd": [
@@ -6474,7 +6474,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_debug"
+    "name": "test: Host Tests for android_debug"
   },
   {
     "cmd": [
@@ -10096,7 +10096,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Build and test arm64 profile.Android Firebase Test",
+    "name": "Build and test arm64 profile.test: Android Firebase Test",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
diff --git a/recipes/engine.expected/linux_upload_no_lto.json b/recipes/engine.expected/linux_upload_no_lto.json
index 0355f4d..c91f6cc 100644
--- a/recipes/engine.expected/linux_upload_no_lto.json
+++ b/recipes/engine.expected/linux_upload_no_lto.json
@@ -1953,7 +1953,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
@@ -2379,7 +2379,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_release"
+    "name": "test: Host Tests for host_release"
   },
   {
     "cmd": [
@@ -5522,7 +5522,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_jit_release_x86"
+    "name": "test: Host Tests for android_jit_release_x86"
   },
   {
     "cmd": [
@@ -6435,7 +6435,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_debug"
+    "name": "test: Host Tests for android_debug"
   },
   {
     "cmd": [
@@ -10486,7 +10486,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Build and test arm64 profile.Android Firebase Test",
+    "name": "Build and test arm64 profile.test: Android Firebase Test",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
diff --git a/recipes/engine.expected/linux_upload_no_lto_font_subset.json b/recipes/engine.expected/linux_upload_no_lto_font_subset.json
index 08800df..5690f5d 100644
--- a/recipes/engine.expected/linux_upload_no_lto_font_subset.json
+++ b/recipes/engine.expected/linux_upload_no_lto_font_subset.json
@@ -1953,7 +1953,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
@@ -2379,7 +2379,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_release"
+    "name": "test: Host Tests for host_release"
   },
   {
     "cmd": [
@@ -5561,7 +5561,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_jit_release_x86"
+    "name": "test: Host Tests for android_jit_release_x86"
   },
   {
     "cmd": [
@@ -6474,7 +6474,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_debug"
+    "name": "test: Host Tests for android_debug"
   },
   {
     "cmd": [
@@ -10525,7 +10525,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Build and test arm64 profile.Android Firebase Test",
+    "name": "Build and test arm64 profile.test: Android Firebase Test",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
diff --git a/recipes/engine.expected/linux_upload_publish_cipd.json b/recipes/engine.expected/linux_upload_publish_cipd.json
index decfc95..c71f201 100644
--- a/recipes/engine.expected/linux_upload_publish_cipd.json
+++ b/recipes/engine.expected/linux_upload_publish_cipd.json
@@ -1950,7 +1950,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
@@ -2376,7 +2376,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_release"
+    "name": "test: Host Tests for host_release"
   },
   {
     "cmd": [
@@ -5516,7 +5516,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_jit_release_x86"
+    "name": "test: Host Tests for android_jit_release_x86"
   },
   {
     "cmd": [
@@ -6429,7 +6429,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_debug"
+    "name": "test: Host Tests for android_debug"
   },
   {
     "cmd": [
@@ -10479,7 +10479,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Build and test arm64 profile.Android Firebase Test",
+    "name": "Build and test arm64 profile.test: Android Firebase Test",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
diff --git a/recipes/engine.expected/linux_upload_publish_cipd_font_subset.json b/recipes/engine.expected/linux_upload_publish_cipd_font_subset.json
index 74a4034..f72e48c 100644
--- a/recipes/engine.expected/linux_upload_publish_cipd_font_subset.json
+++ b/recipes/engine.expected/linux_upload_publish_cipd_font_subset.json
@@ -1950,7 +1950,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
@@ -2376,7 +2376,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_release"
+    "name": "test: Host Tests for host_release"
   },
   {
     "cmd": [
@@ -5555,7 +5555,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_jit_release_x86"
+    "name": "test: Host Tests for android_jit_release_x86"
   },
   {
     "cmd": [
@@ -6468,7 +6468,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_debug"
+    "name": "test: Host Tests for android_debug"
   },
   {
     "cmd": [
@@ -10518,7 +10518,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Build and test arm64 profile.Android Firebase Test",
+    "name": "Build and test arm64 profile.test: Android Firebase Test",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
diff --git a/recipes/engine.expected/linux_upload_publish_cipd_no_lto.json b/recipes/engine.expected/linux_upload_publish_cipd_no_lto.json
index d534551..011caad 100644
--- a/recipes/engine.expected/linux_upload_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/linux_upload_publish_cipd_no_lto.json
@@ -1953,7 +1953,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
@@ -2379,7 +2379,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_release"
+    "name": "test: Host Tests for host_release"
   },
   {
     "cmd": [
@@ -5522,7 +5522,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_jit_release_x86"
+    "name": "test: Host Tests for android_jit_release_x86"
   },
   {
     "cmd": [
@@ -6435,7 +6435,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_debug"
+    "name": "test: Host Tests for android_debug"
   },
   {
     "cmd": [
@@ -10486,7 +10486,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Build and test arm64 profile.Android Firebase Test",
+    "name": "Build and test arm64 profile.test: Android Firebase Test",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
diff --git a/recipes/engine.expected/linux_upload_publish_cipd_no_lto_font_subset.json b/recipes/engine.expected/linux_upload_publish_cipd_no_lto_font_subset.json
index 2bf5ff5..e053a1d 100644
--- a/recipes/engine.expected/linux_upload_publish_cipd_no_lto_font_subset.json
+++ b/recipes/engine.expected/linux_upload_publish_cipd_no_lto_font_subset.json
@@ -1953,7 +1953,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
@@ -2379,7 +2379,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_release"
+    "name": "test: Host Tests for host_release"
   },
   {
     "cmd": [
@@ -5561,7 +5561,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_jit_release_x86"
+    "name": "test: Host Tests for android_jit_release_x86"
   },
   {
     "cmd": [
@@ -6474,7 +6474,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_debug"
+    "name": "test: Host Tests for android_debug"
   },
   {
     "cmd": [
@@ -10525,7 +10525,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Build and test arm64 profile.Android Firebase Test",
+    "name": "Build and test arm64 profile.test: Android Firebase Test",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
diff --git a/recipes/engine.expected/mac.json b/recipes/engine.expected/mac.json
index 28f9e8c..25be6c1 100644
--- a/recipes/engine.expected/mac.json
+++ b/recipes/engine.expected/mac.json
@@ -1353,7 +1353,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
diff --git a/recipes/engine.expected/mac_font_subset.json b/recipes/engine.expected/mac_font_subset.json
index 28f9e8c..25be6c1 100644
--- a/recipes/engine.expected/mac_font_subset.json
+++ b/recipes/engine.expected/mac_font_subset.json
@@ -1353,7 +1353,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
diff --git a/recipes/engine.expected/mac_no_lto.json b/recipes/engine.expected/mac_no_lto.json
index b8e27a0..3cb2de1 100644
--- a/recipes/engine.expected/mac_no_lto.json
+++ b/recipes/engine.expected/mac_no_lto.json
@@ -1353,7 +1353,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
diff --git a/recipes/engine.expected/mac_no_lto_font_subset.json b/recipes/engine.expected/mac_no_lto_font_subset.json
index b8e27a0..3cb2de1 100644
--- a/recipes/engine.expected/mac_no_lto_font_subset.json
+++ b/recipes/engine.expected/mac_no_lto_font_subset.json
@@ -1353,7 +1353,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
diff --git a/recipes/engine.expected/mac_publish_cipd.json b/recipes/engine.expected/mac_publish_cipd.json
index 28f9e8c..25be6c1 100644
--- a/recipes/engine.expected/mac_publish_cipd.json
+++ b/recipes/engine.expected/mac_publish_cipd.json
@@ -1353,7 +1353,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
diff --git a/recipes/engine.expected/mac_publish_cipd_font_subset.json b/recipes/engine.expected/mac_publish_cipd_font_subset.json
index 28f9e8c..25be6c1 100644
--- a/recipes/engine.expected/mac_publish_cipd_font_subset.json
+++ b/recipes/engine.expected/mac_publish_cipd_font_subset.json
@@ -1353,7 +1353,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
diff --git a/recipes/engine.expected/mac_publish_cipd_no_lto.json b/recipes/engine.expected/mac_publish_cipd_no_lto.json
index b8e27a0..3cb2de1 100644
--- a/recipes/engine.expected/mac_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/mac_publish_cipd_no_lto.json
@@ -1353,7 +1353,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
diff --git a/recipes/engine.expected/mac_publish_cipd_no_lto_font_subset.json b/recipes/engine.expected/mac_publish_cipd_no_lto_font_subset.json
index b8e27a0..3cb2de1 100644
--- a/recipes/engine.expected/mac_publish_cipd_no_lto_font_subset.json
+++ b/recipes/engine.expected/mac_publish_cipd_no_lto_font_subset.json
@@ -1353,7 +1353,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
diff --git a/recipes/engine.expected/mac_upload.json b/recipes/engine.expected/mac_upload.json
index 924c303..df12aa9 100644
--- a/recipes/engine.expected/mac_upload.json
+++ b/recipes/engine.expected/mac_upload.json
@@ -1353,7 +1353,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
diff --git a/recipes/engine.expected/mac_upload_font_subset.json b/recipes/engine.expected/mac_upload_font_subset.json
index 7cdb9b6..41d00a6 100644
--- a/recipes/engine.expected/mac_upload_font_subset.json
+++ b/recipes/engine.expected/mac_upload_font_subset.json
@@ -1353,7 +1353,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
diff --git a/recipes/engine.expected/mac_upload_no_lto.json b/recipes/engine.expected/mac_upload_no_lto.json
index ebe95cb..995c9ec 100644
--- a/recipes/engine.expected/mac_upload_no_lto.json
+++ b/recipes/engine.expected/mac_upload_no_lto.json
@@ -1353,7 +1353,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
diff --git a/recipes/engine.expected/mac_upload_no_lto_font_subset.json b/recipes/engine.expected/mac_upload_no_lto_font_subset.json
index 844aff7..e2dc666 100644
--- a/recipes/engine.expected/mac_upload_no_lto_font_subset.json
+++ b/recipes/engine.expected/mac_upload_no_lto_font_subset.json
@@ -1353,7 +1353,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
diff --git a/recipes/engine.expected/mac_upload_publish_cipd.json b/recipes/engine.expected/mac_upload_publish_cipd.json
index 924c303..df12aa9 100644
--- a/recipes/engine.expected/mac_upload_publish_cipd.json
+++ b/recipes/engine.expected/mac_upload_publish_cipd.json
@@ -1353,7 +1353,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
diff --git a/recipes/engine.expected/mac_upload_publish_cipd_font_subset.json b/recipes/engine.expected/mac_upload_publish_cipd_font_subset.json
index 7cdb9b6..41d00a6 100644
--- a/recipes/engine.expected/mac_upload_publish_cipd_font_subset.json
+++ b/recipes/engine.expected/mac_upload_publish_cipd_font_subset.json
@@ -1353,7 +1353,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
diff --git a/recipes/engine.expected/mac_upload_publish_cipd_no_lto.json b/recipes/engine.expected/mac_upload_publish_cipd_no_lto.json
index ebe95cb..995c9ec 100644
--- a/recipes/engine.expected/mac_upload_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/mac_upload_publish_cipd_no_lto.json
@@ -1353,7 +1353,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
diff --git a/recipes/engine.expected/mac_upload_publish_cipd_no_lto_font_subset.json b/recipes/engine.expected/mac_upload_publish_cipd_no_lto_font_subset.json
index 844aff7..e2dc666 100644
--- a/recipes/engine.expected/mac_upload_publish_cipd_no_lto_font_subset.json
+++ b/recipes/engine.expected/mac_upload_publish_cipd_no_lto_font_subset.json
@@ -1353,7 +1353,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
diff --git a/recipes/engine.expected/pull_request.json b/recipes/engine.expected/pull_request.json
index a9ee00e..3baeca9 100644
--- a/recipes/engine.expected/pull_request.json
+++ b/recipes/engine.expected/pull_request.json
@@ -1952,7 +1952,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_profile"
+    "name": "test: Host Tests for host_profile"
   },
   {
     "cmd": [],
@@ -2378,7 +2378,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_release"
+    "name": "test: Host Tests for host_release"
   },
   {
     "cmd": [
@@ -5128,7 +5128,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_jit_release_x86"
+    "name": "test: Host Tests for android_jit_release_x86"
   },
   {
     "cmd": [
@@ -6002,7 +6002,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_debug"
+    "name": "test: Host Tests for android_debug"
   },
   {
     "cmd": [
@@ -9198,7 +9198,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Build and test arm64 profile.Android Firebase Test",
+    "name": "Build and test arm64 profile.test: Android Firebase Test",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
diff --git a/recipes/engine.expected/win.json b/recipes/engine.expected/win.json
index 5f45539..07c4473 100644
--- a/recipes/engine.expected/win.json
+++ b/recipes/engine.expected/win.json
@@ -875,7 +875,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_debug"
+    "name": "test: Host Tests for host_debug"
   },
   {
     "cmd": [
diff --git a/recipes/engine.expected/win_font_subset.json b/recipes/engine.expected/win_font_subset.json
index 20542fc..c4bf0c1 100644
--- a/recipes/engine.expected/win_font_subset.json
+++ b/recipes/engine.expected/win_font_subset.json
@@ -875,7 +875,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_debug"
+    "name": "test: Host Tests for host_debug"
   },
   {
     "cmd": [
diff --git a/recipes/engine.expected/win_no_lto.json b/recipes/engine.expected/win_no_lto.json
index 0d6128e..d8a4415 100644
--- a/recipes/engine.expected/win_no_lto.json
+++ b/recipes/engine.expected/win_no_lto.json
@@ -875,7 +875,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_debug"
+    "name": "test: Host Tests for host_debug"
   },
   {
     "cmd": [
diff --git a/recipes/engine.expected/win_no_lto_font_subset.json b/recipes/engine.expected/win_no_lto_font_subset.json
index e3636d2..d60ce70 100644
--- a/recipes/engine.expected/win_no_lto_font_subset.json
+++ b/recipes/engine.expected/win_no_lto_font_subset.json
@@ -875,7 +875,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_debug"
+    "name": "test: Host Tests for host_debug"
   },
   {
     "cmd": [
diff --git a/recipes/engine.expected/win_publish_cipd.json b/recipes/engine.expected/win_publish_cipd.json
index 5f45539..07c4473 100644
--- a/recipes/engine.expected/win_publish_cipd.json
+++ b/recipes/engine.expected/win_publish_cipd.json
@@ -875,7 +875,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_debug"
+    "name": "test: Host Tests for host_debug"
   },
   {
     "cmd": [
diff --git a/recipes/engine.expected/win_publish_cipd_font_subset.json b/recipes/engine.expected/win_publish_cipd_font_subset.json
index 20542fc..c4bf0c1 100644
--- a/recipes/engine.expected/win_publish_cipd_font_subset.json
+++ b/recipes/engine.expected/win_publish_cipd_font_subset.json
@@ -875,7 +875,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_debug"
+    "name": "test: Host Tests for host_debug"
   },
   {
     "cmd": [
diff --git a/recipes/engine.expected/win_publish_cipd_no_lto.json b/recipes/engine.expected/win_publish_cipd_no_lto.json
index 0d6128e..d8a4415 100644
--- a/recipes/engine.expected/win_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/win_publish_cipd_no_lto.json
@@ -875,7 +875,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_debug"
+    "name": "test: Host Tests for host_debug"
   },
   {
     "cmd": [
diff --git a/recipes/engine.expected/win_publish_cipd_no_lto_font_subset.json b/recipes/engine.expected/win_publish_cipd_no_lto_font_subset.json
index e3636d2..d60ce70 100644
--- a/recipes/engine.expected/win_publish_cipd_no_lto_font_subset.json
+++ b/recipes/engine.expected/win_publish_cipd_no_lto_font_subset.json
@@ -875,7 +875,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_debug"
+    "name": "test: Host Tests for host_debug"
   },
   {
     "cmd": [
diff --git a/recipes/engine.expected/win_upload.json b/recipes/engine.expected/win_upload.json
index 5b5a5c4..8449aea 100644
--- a/recipes/engine.expected/win_upload.json
+++ b/recipes/engine.expected/win_upload.json
@@ -875,7 +875,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_debug"
+    "name": "test: Host Tests for host_debug"
   },
   {
     "cmd": [
diff --git a/recipes/engine.expected/win_upload_font_subset.json b/recipes/engine.expected/win_upload_font_subset.json
index 656a7b2..d2b392d 100644
--- a/recipes/engine.expected/win_upload_font_subset.json
+++ b/recipes/engine.expected/win_upload_font_subset.json
@@ -875,7 +875,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_debug"
+    "name": "test: Host Tests for host_debug"
   },
   {
     "cmd": [
diff --git a/recipes/engine.expected/win_upload_no_lto.json b/recipes/engine.expected/win_upload_no_lto.json
index 4eb9e60..7f4a63c 100644
--- a/recipes/engine.expected/win_upload_no_lto.json
+++ b/recipes/engine.expected/win_upload_no_lto.json
@@ -875,7 +875,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_debug"
+    "name": "test: Host Tests for host_debug"
   },
   {
     "cmd": [
diff --git a/recipes/engine.expected/win_upload_no_lto_font_subset.json b/recipes/engine.expected/win_upload_no_lto_font_subset.json
index 37e0864..9efe6fe 100644
--- a/recipes/engine.expected/win_upload_no_lto_font_subset.json
+++ b/recipes/engine.expected/win_upload_no_lto_font_subset.json
@@ -875,7 +875,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_debug"
+    "name": "test: Host Tests for host_debug"
   },
   {
     "cmd": [
diff --git a/recipes/engine.expected/win_upload_publish_cipd.json b/recipes/engine.expected/win_upload_publish_cipd.json
index 5b5a5c4..8449aea 100644
--- a/recipes/engine.expected/win_upload_publish_cipd.json
+++ b/recipes/engine.expected/win_upload_publish_cipd.json
@@ -875,7 +875,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_debug"
+    "name": "test: Host Tests for host_debug"
   },
   {
     "cmd": [
diff --git a/recipes/engine.expected/win_upload_publish_cipd_font_subset.json b/recipes/engine.expected/win_upload_publish_cipd_font_subset.json
index 656a7b2..d2b392d 100644
--- a/recipes/engine.expected/win_upload_publish_cipd_font_subset.json
+++ b/recipes/engine.expected/win_upload_publish_cipd_font_subset.json
@@ -875,7 +875,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_debug"
+    "name": "test: Host Tests for host_debug"
   },
   {
     "cmd": [
diff --git a/recipes/engine.expected/win_upload_publish_cipd_no_lto.json b/recipes/engine.expected/win_upload_publish_cipd_no_lto.json
index 4eb9e60..7f4a63c 100644
--- a/recipes/engine.expected/win_upload_publish_cipd_no_lto.json
+++ b/recipes/engine.expected/win_upload_publish_cipd_no_lto.json
@@ -875,7 +875,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_debug"
+    "name": "test: Host Tests for host_debug"
   },
   {
     "cmd": [
diff --git a/recipes/engine.expected/win_upload_publish_cipd_no_lto_font_subset.json b/recipes/engine.expected/win_upload_publish_cipd_no_lto_font_subset.json
index 37e0864..9efe6fe 100644
--- a/recipes/engine.expected/win_upload_publish_cipd_no_lto_font_subset.json
+++ b/recipes/engine.expected/win_upload_publish_cipd_no_lto_font_subset.json
@@ -875,7 +875,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_debug"
+    "name": "test: Host Tests for host_debug"
   },
   {
     "cmd": [
diff --git a/recipes/engine.py b/recipes/engine.py
index 45c04ca..94c8843 100644
--- a/recipes/engine.py
+++ b/recipes/engine.py
@@ -23,6 +23,7 @@
     'flutter/osx_sdk',
     'flutter/repo_util',
     'flutter/retry',
+    'flutter/test_utils',
     'flutter/zip',
     'fuchsia/display_util',
     'fuchsia/gcloud',
@@ -125,8 +126,15 @@
   args = ['--variant', out_dir, '--type', types, '--engine-capture-core-dump']
   if android_out_dir:
     args.extend(['--android-variant', android_out_dir])
+
   def run_test():
-    return api.python('Host Tests for %s' % out_dir, script_path, args, venv=venv_path)
+    return api.python(
+        api.test_utils.test_step_name('Host Tests for %s' % out_dir),
+        script_path,
+        args,
+        venv=venv_path
+    )
+
   # Rerun test step 3 times by default if failing.
   # TODO(keyonghan): notify tree gardener for test failures/flakes:
   # https://github.com/flutter/flutter/issues/89308
@@ -526,8 +534,10 @@
     ]
 
     def firebase_func():
-      api.python('Android Firebase Test',
-          './flutter/ci/firebase_testlab.py', args)
+      api.python(
+          api.test_utils.test_step_name('Android Firebase Test'),
+          './flutter/ci/firebase_testlab.py', args
+      )
 
     api.retry.wrap(firebase_func, retriable_codes=(1, 15, 20))
 
diff --git a/recipes/engine/framework_smoke.expected/basic.json b/recipes/engine/framework_smoke.expected/basic.json
index fbd70f8..90155ec 100644
--- a/recipes/engine/framework_smoke.expected/basic.json
+++ b/recipes/engine/framework_smoke.expected/basic.json
@@ -627,7 +627,7 @@
     "env": {
       "FLUTTER_PREBUILT_DART_SDK": "True"
     },
-    "name": "Framework test.Framework test",
+    "name": "Framework test.test: Framework test",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
diff --git a/recipes/engine/framework_smoke.py b/recipes/engine/framework_smoke.py
index 000c781..ab857fa 100644
--- a/recipes/engine/framework_smoke.py
+++ b/recipes/engine/framework_smoke.py
@@ -18,6 +18,7 @@
     'flutter/os_utils',
     'flutter/osx_sdk',
     'flutter/repo_util',
+    'flutter/test_utils',
     'fuchsia/goma',
     'recipe_engine/context',
     'recipe_engine/file',
@@ -85,7 +86,7 @@
     with api.context(env=env, env_prefixes=env_prefixes,
                      cwd=flutter_checkout_path.join('packages', 'flutter')):
       api.step(
-          'Framework test', [
+          api.test_utils.test_step_name('Framework test'), [
               str(flutter_checkout_path.join('bin', 'flutter')), 'test',
               '--null-assertions', '--sound-null-safety',
               '--local-engine=%s' % str(build_dir)
diff --git a/recipes/engine/web_engine_framework.expected/linux-pre-submit.json b/recipes/engine/web_engine_framework.expected/linux-pre-submit.json
index 4288fe8..2437fcf 100644
--- a/recipes/engine/web_engine_framework.expected/linux-pre-submit.json
+++ b/recipes/engine/web_engine_framework.expected/linux-pre-submit.json
@@ -1403,7 +1403,7 @@
         "[CLEANUP]/tmp_tmp_1/curl"
       ]
     },
-    "name": "run web integration tests"
+    "name": "test: run web integration tests"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/web_engine_framework.py b/recipes/engine/web_engine_framework.py
index d280d9b..daddf45 100644
--- a/recipes/engine/web_engine_framework.py
+++ b/recipes/engine/web_engine_framework.py
@@ -22,6 +22,7 @@
     'flutter/repo_util',
     'flutter/flutter_deps',
     'flutter/shard_util',
+    'flutter/test_utils',
     'fuchsia/archive',
     'fuchsia/goma',
     'recipe_engine/buildbucket',
@@ -174,7 +175,7 @@
         infra_step=True,
     )
     api.step(
-        'run web integration tests', [
+        api.test_utils.test_step_name('run web integration tests'), [
             'flutter',
             '--local-engine=%s' % build_dir,
             'build',
diff --git a/recipes/engine_unopt.expected/linux.json b/recipes/engine_unopt.expected/linux.json
index cd54f30..14561fe 100644
--- a/recipes/engine_unopt.expected/linux.json
+++ b/recipes/engine_unopt.expected/linux.json
@@ -329,7 +329,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "format and dart test"
+    "name": "test: format and dart test"
   },
   {
     "cmd": [
@@ -356,7 +356,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "lint test"
+    "name": "test: lint test"
   },
   {
     "cmd": [
@@ -964,7 +964,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_debug_unopt"
+    "name": "test: Host Tests for host_debug_unopt"
   },
   {
     "cmd": [
@@ -1408,7 +1408,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "test observatory and service protocol"
+    "name": "test: observatory and service protocol"
   },
   {
     "cmd": [],
@@ -1867,7 +1867,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_debug_unopt"
+    "name": "test: Host Tests for android_debug_unopt"
   },
   {
     "cmd": [],
diff --git a/recipes/engine_unopt.expected/linux_lto.json b/recipes/engine_unopt.expected/linux_lto.json
index 64a18d6..a0ab008 100644
--- a/recipes/engine_unopt.expected/linux_lto.json
+++ b/recipes/engine_unopt.expected/linux_lto.json
@@ -329,7 +329,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "format and dart test"
+    "name": "test: format and dart test"
   },
   {
     "cmd": [
@@ -356,7 +356,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "lint test"
+    "name": "test: lint test"
   },
   {
     "cmd": [
@@ -963,7 +963,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_debug_unopt"
+    "name": "test: Host Tests for host_debug_unopt"
   },
   {
     "cmd": [
@@ -1406,7 +1406,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "test observatory and service protocol"
+    "name": "test: observatory and service protocol"
   },
   {
     "cmd": [],
@@ -1864,7 +1864,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for android_debug_unopt"
+    "name": "test: Host Tests for android_debug_unopt"
   },
   {
     "cmd": [],
diff --git a/recipes/engine_unopt.expected/mac.json b/recipes/engine_unopt.expected/mac.json
index d151309..0580969 100644
--- a/recipes/engine_unopt.expected/mac.json
+++ b/recipes/engine_unopt.expected/mac.json
@@ -1023,7 +1023,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_debug_unopt"
+    "name": "test: Host Tests for host_debug_unopt"
   },
   {
     "cmd": [
@@ -1905,7 +1905,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for ios_debug_sim"
+    "name": "test: Host Tests for ios_debug_sim"
   },
   {
     "cmd": [
@@ -1935,7 +1935,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Scenario App Integration Tests"
+    "name": "test: Scenario App Integration Tests"
   },
   {
     "cmd": [
diff --git a/recipes/engine_unopt.expected/mac_lto.json b/recipes/engine_unopt.expected/mac_lto.json
index d151309..0580969 100644
--- a/recipes/engine_unopt.expected/mac_lto.json
+++ b/recipes/engine_unopt.expected/mac_lto.json
@@ -1023,7 +1023,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_debug_unopt"
+    "name": "test: Host Tests for host_debug_unopt"
   },
   {
     "cmd": [
@@ -1905,7 +1905,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for ios_debug_sim"
+    "name": "test: Host Tests for ios_debug_sim"
   },
   {
     "cmd": [
@@ -1935,7 +1935,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Scenario App Integration Tests"
+    "name": "test: Scenario App Integration Tests"
   },
   {
     "cmd": [
diff --git a/recipes/engine_unopt.expected/win.json b/recipes/engine_unopt.expected/win.json
index 7bd2dda..de425a9 100644
--- a/recipes/engine_unopt.expected/win.json
+++ b/recipes/engine_unopt.expected/win.json
@@ -965,7 +965,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_debug_unopt"
+    "name": "test: Host Tests for host_debug_unopt"
   },
   {
     "cmd": [],
diff --git a/recipes/engine_unopt.expected/win_lto.json b/recipes/engine_unopt.expected/win_lto.json
index 0d24a2a..99f9253 100644
--- a/recipes/engine_unopt.expected/win_lto.json
+++ b/recipes/engine_unopt.expected/win_lto.json
@@ -964,7 +964,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "Host Tests for host_debug_unopt"
+    "name": "test: Host Tests for host_debug_unopt"
   },
   {
     "cmd": [],
diff --git a/recipes/engine_unopt.py b/recipes/engine_unopt.py
index 5b7209c..35ec08b 100644
--- a/recipes/engine_unopt.py
+++ b/recipes/engine_unopt.py
@@ -17,6 +17,7 @@
     'flutter/osx_sdk',
     'flutter/repo_util',
     'flutter/retry',
+    'flutter/test_utils',
     'fuchsia/goma',
     'recipe_engine/buildbucket',
     'recipe_engine/context',
@@ -64,7 +65,13 @@
     args.extend(['--use-sanitizer-suppressions'])
 
   def run_test():
-    return api.python('Host Tests for %s' % out_dir, script_path, args, venv=venv_path)
+    return api.python(
+        api.test_utils.test_step_name('Host Tests for %s' % out_dir),
+        script_path,
+        args,
+        venv=venv_path
+    )
+
   # Rerun test step 3 times by default if failing.
   api.retry.wrap(run_test)
 
@@ -82,14 +89,16 @@
   checkout = GetCheckoutPath(api)
   with api.context(cwd=checkout.join('flutter')):
     format_cmd = checkout.join('flutter', 'ci', 'format.sh')
-    api.step('format and dart test', [format_cmd])
+    api.step(
+        api.test_utils.test_step_name('format and dart test'), [format_cmd]
+    )
 
 
 def Lint(api):
   checkout = GetCheckoutPath(api)
   with api.context(cwd=checkout):
     lint_cmd = checkout.join('flutter', 'ci', 'lint.sh')
-    api.step('lint test', [lint_cmd])
+    api.step(api.test_utils.test_step_name('lint test'), [lint_cmd])
 
 
 def LintAndroidHost(api):
@@ -140,7 +149,10 @@
   test_path = checkout.join('flutter/shell/testing/observatory/test.dart')
   test_cmd = ['dart', test_path, flutter_tester_path, empty_main_path]
   with api.context(cwd=checkout):
-    api.step('test observatory and service protocol', test_cmd)
+    api.step(
+        api.test_utils.test_step_name('observatory and service protocol'),
+        test_cmd
+    )
 
 
 @contextmanager
@@ -163,7 +175,7 @@
 
   with api.context(cwd=scenario_app_tests):
     api.step(
-        'Scenario App Integration Tests',
+        api.test_utils.test_step_name('Scenario App Integration Tests'),
         ['./run_ios_tests.sh', 'ios_debug_sim']
     )
 
diff --git a/recipes/femu_test.expected/start_femu_with_vdl.json b/recipes/femu_test.expected/start_femu_with_vdl.json
index ab523ac..fb17fad 100644
--- a/recipes/femu_test.expected/start_femu_with_vdl.json
+++ b/recipes/femu_test.expected/start_femu_with_vdl.json
@@ -2223,7 +2223,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "FEMU Test.Run FEMU Test Suite v2_test",
+    "name": "FEMU Test.test: Run FEMU Test Suite v2_test",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@syslog@failure@@@",
@@ -2269,7 +2269,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "FEMU Test.Run FEMU Test Suite v2_test (2)",
+    "name": "FEMU Test.test: Run FEMU Test Suite v2_test (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@syslog@failure@@@",
@@ -2315,7 +2315,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "FEMU Test.Run FEMU Test Suite v1_test_component",
+    "name": "FEMU Test.test: Run FEMU Test Suite v1_test_component",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@syslog@failure@@@",
@@ -2361,7 +2361,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "FEMU Test.Run FEMU Test Suite v1_test_component (2)",
+    "name": "FEMU Test.test: Run FEMU Test Suite v1_test_component (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@",
       "@@@STEP_LOG_LINE@syslog@failure@@@",
diff --git a/recipes/femu_test.py b/recipes/femu_test.py
index 371634c..dbe002c 100644
--- a/recipes/femu_test.py
+++ b/recipes/femu_test.py
@@ -16,6 +16,7 @@
     'depot_tools/depot_tools',
     'flutter/repo_util',
     'flutter/retry',
+    'flutter/test_utils',
     'flutter/yaml',
     'fuchsia/archive',
     'fuchsia/display_util',
@@ -221,7 +222,9 @@
           api.raw_io.output_text(name='syslog')
         ]
         api.retry.step(
-            'Run FEMU Test Suite %s' % suite['name'],
+            api.test_utils.test_step_name(
+                'Run FEMU Test Suite %s' % suite['name']
+            ),
             test_cmd,
             step_test_data=(
                 lambda: api.raw_io.test_api.
@@ -313,8 +316,8 @@
           'Read manifest',
           api.file.read_json({'id': '0.20200101.0.1'}),
       ),
-      api.step_data('FEMU Test.Run FEMU Test Suite v2_test', retcode=1),
-      api.step_data('FEMU Test.Run FEMU Test Suite v1_test_component', retcode=1),
+      api.step_data('FEMU Test.test: Run FEMU Test Suite v2_test', retcode=1),
+      api.step_data('FEMU Test.test: Run FEMU Test Suite v1_test_component', retcode=1),
       api.properties.environ(EnvProperties(SWARMING_TASK_ID='deadbeef')),
       api.platform('linux', 64),
       api.path.exists(
diff --git a/recipes/web_engine.expected/mac-post-submit.json b/recipes/web_engine.expected/mac-post-submit.json
index 706c6bb..9a6a794 100644
--- a/recipes/web_engine.expected/mac-post-submit.json
+++ b/recipes/web_engine.expected/mac-post-submit.json
@@ -1044,7 +1044,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "felt test safari desktop"
+    "name": "test: felt test safari desktop"
   },
   {
     "cmd": [
@@ -1193,7 +1193,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "felt ios-safari test"
+    "name": "test: felt ios-safari test"
   },
   {
     "cmd": [
diff --git a/recipes/web_engine.expected/windows-post-submit.json b/recipes/web_engine.expected/windows-post-submit.json
index 64b0a61..ce191c6 100644
--- a/recipes/web_engine.expected/windows-post-submit.json
+++ b/recipes/web_engine.expected/windows-post-submit.json
@@ -933,7 +933,7 @@
         "RECIPE_REPO[depot_tools]"
       ]
     },
-    "name": "felt test chrome"
+    "name": "test: felt test chrome"
   },
   {
     "cmd": [],
diff --git a/recipes/web_engine.py b/recipes/web_engine.py
index 5465a47..aac785f 100644
--- a/recipes/web_engine.py
+++ b/recipes/web_engine.py
@@ -25,6 +25,7 @@
     'flutter/repo_util',
     'flutter/retry',
     'flutter/shard_util',
+    'flutter/test_utils',
     'flutter/web_util',
     'flutter/yaml',
     'fuchsia/archive',
@@ -198,7 +199,10 @@
         felt_test_safari_desktop = copy.deepcopy(felt_cmd)
         felt_test_safari_desktop.append('test')
         felt_test_safari_desktop.extend(additional_args_safari_desktop)
-        api.retry.step('felt test safari desktop', felt_test_safari_desktop)
+        api.retry.step(
+            api.test_utils.test_step_name('felt test safari desktop'),
+            felt_test_safari_desktop
+        )
       if api.platform.is_linux:
         # TODO(nurhan): Web engine analysis can also be part of felt and used
         # in a shard.
@@ -221,7 +225,9 @@
             felt_test = copy.deepcopy(felt_cmd)
             felt_test.append('test')
             felt_test.extend(additional_args)
-            api.step('felt ios-safari test', felt_test)
+            api.step(
+                api.test_utils.test_step_name('felt ios-safari test'), felt_test
+            )
             api.web_util.upload_failing_goldens(checkout, 'ios-safari')
             CleanUpProcesses(api)
       else:
@@ -229,7 +235,7 @@
         felt_test = copy.deepcopy(felt_cmd)
         felt_test.append('test')
         felt_test.extend(additional_args)
-        api.step('felt test chrome', felt_test)
+        api.step(api.test_utils.test_step_name('felt test chrome'), felt_test)
         CleanUpProcesses(api)