diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/Microsoft.DotNet.Helix.Sdk.MonoQueue.targets b/src/Microsoft.DotNet.Helix/Sdk/tools/Microsoft.DotNet.Helix.Sdk.MonoQueue.targets
index f1e7cd0a403..90456cf2394 100644
--- a/src/Microsoft.DotNet.Helix/Sdk/tools/Microsoft.DotNet.Helix.Sdk.MonoQueue.targets
+++ b/src/Microsoft.DotNet.Helix/Sdk/tools/Microsoft.DotNet.Helix.Sdk.MonoQueue.targets
@@ -71,9 +71,13 @@
     <PropertyGroup>
       <_AccessTokenSuffix />
       <_AccessTokenSuffix Condition=" '$(HelixAccessToken)' != '' ">&amp;access_token={Get this from helix.dot.net}</_AccessTokenSuffix>
+      <_HelixBaseUri Condition="'$(HelixBaseUri)' == ''">https://helix.dot.net</_HelixBaseUri>
+      <_HelixBaseUri Condition="'$(HelixBaseUri)' != ''">$(HelixBaseUri.TrimEnd('/'))</_HelixBaseUri>
+      <_HelixJobName />
+      <_HelixJobName Condition="'$(HelixJobName)' != ''"> '$(HelixJobName)'</_HelixJobName>
     </PropertyGroup>
-    <Message Condition=" '$(HelixBaseUri)' == '' " Text="Sent Helix Job; see work items at https://helix.dot.net/api/jobs/$(HelixJobId)/workitems?api-version=2019-06-17$(_AccessTokenSuffix)" Importance="High" />
-    <Message Condition=" '$(HelixBaseUri)' != '' " Text="Sent Helix Job; see work items at $(HelixBaseUri.TrimEnd('/'))/api/jobs/$(HelixJobId)/workitems?api-version=2019-06-17$(_AccessTokenSuffix)" Importance="High" />
+    <Message Text="$(_HelixJobSentMessage)" Importance="High" />
+    <Message Text="Sent Helix Job$(_HelixJobName); see work items at $(_HelixBaseUri)/api/jobs/$(HelixJobId)/workitems?api-version=2019-06-17$(_AccessTokenSuffix)" Importance="High" />
   </Target>
 
   <Target Name="Test"
diff --git a/tests/UnitTests.proj b/tests/UnitTests.proj
index 7dcbd830e9e..baaa1b68e4f 100644
--- a/tests/UnitTests.proj
+++ b/tests/UnitTests.proj
@@ -9,6 +9,7 @@
 
   <PropertyGroup>
     <HelixType>test/product/</HelixType>
+    <HelixJobName>Arcade Job Name</HelixJobName>
 
     <IncludeDotNetCli>true</IncludeDotNetCli>
     <DotNetCliPackageType>sdk</DotNetCliPackageType>