diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props b/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props
index 0746d3586c4..f8e0924acdb 100644
--- a/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props
+++ b/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props
@@ -1,10 +1,11 @@
 <Project>
   <PropertyGroup>
     <IncludeDotNetCli Condition=" '$(IncludeDotNetCli)' != 'true' ">false</IncludeDotNetCli>
+    <AspNetCoreRuntimeVersion>6.0.0-preview.2.21154.6</AspNetCoreRuntimeVersion>
     <DotNetCliPackageType Condition=" '$(DotNetCliPackageType)' == '' ">runtime</DotNetCliPackageType>
     <DotNetCliVersion Condition=" '$(DotNetCliVersion)' == '' AND '$(DotNetCliPackageType)' == 'runtime' ">$(BundledNETCoreAppPackageVersion)</DotNetCliVersion>
     <!-- TODO (https://github.com/dotnet/arcade/issues/7022): We are hardcoding this version to use the one tied to the SDK version from global.json -->
-    <DotNetCliVersion Condition=" '$(DotNetCliVersion)' == '' AND '$(DotNetCliPackageType)' == 'aspnetcore-runtime' ">6.0.0-preview.2.21154.6</DotNetCliVersion>
+    <DotNetCliVersion Condition=" '$(DotNetCliVersion)' == '' AND '$(DotNetCliPackageType)' == 'aspnetcore-runtime' ">$(AspNetCoreRuntimeVersion)</DotNetCliVersion>
     <DotNetCliVersion Condition=" '$(DotNetCliVersion)' == '' AND '$(DotNetCliPackageType)' == 'sdk' ">$(NETCoreSdkVersion)</DotNetCliVersion>
     <DotNetCliChannel Condition=" '$(DotNetCliChannel)' == '' ">Current</DotNetCliChannel>
     <DotNetCliDestination>dotnet-cli</DotNetCliDestination>
diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.targets b/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.targets
index 0e31001124d..cd38f7766b3 100644
--- a/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.targets
+++ b/src/Microsoft.DotNet.Helix/Sdk/tools/xharness-runner/XHarnessRunner.targets
@@ -1,12 +1,11 @@
 <Project>
-
   <PropertyGroup Condition=" '$(IncludeXHarnessCli)' == 'true' ">
     <!-- We then invoke the CLI DLL directly using .NET runtime without the need for .NET SDK -->
     <IncludeDotNetCli>true</IncludeDotNetCli>
     <IncludeXHarnessCli>true</IncludeXHarnessCli>
     <DotNetCliPackageType Condition="'$(DotNetCliPackageType)' != 'sdk'">aspnetcore-runtime</DotNetCliPackageType>
     <DotNetCliVersion Condition=" '$(DotNetCliVersion)' == '' ">6.0.100-preview.2.21155.3</DotNetCliVersion>
-    <DotNetCliVersion Condition=" '$(DotNetCliVersion)' == '$(BundledNETCoreAppPackageVersion)' AND '$(DotNetCliPackageType)' == 'aspnetcore-runtime' ">6.0.0-preview.2.21154.6</DotNetCliVersion>
+    <DotNetCliVersion Condition=" '$(DotNetCliVersion)' == '$(BundledNETCoreAppPackageVersion)' AND '$(DotNetCliPackageType)' == 'aspnetcore-runtime' ">$(AspNetCoreRuntimeVersion)</DotNetCliVersion>
   </PropertyGroup>
 
   <Target Name="AddXHarnessCli"
diff --git a/tests/AspNetVersionCheck/aspnet-versioncheck.ps1 b/tests/AspNetVersionCheck/aspnet-versioncheck.ps1
new file mode 100644
index 00000000000..5c754f1f342
--- /dev/null
+++ b/tests/AspNetVersionCheck/aspnet-versioncheck.ps1
@@ -0,0 +1,29 @@
+Param(
+  [string] $aspNetCoreVersion
+)
+
+$versionRegex = "(?<version>\d+\.\d+)\.\d+(?:-(?<preview>\w+\.\d+)\.\d+\.\d+)?"
+
+$dotnetVersion = & dotnet --version
+$dotNetSdkMatch = $dotnetVersion -Match $versionRegex
+if ($dotNetSdkMatch -eq $false) {
+  Write-Host ".NET SDK version '$dotnetVersion' did not match regex!"
+  exit 2
+}
+$dotnetMajorVersion = $Matches.version
+$dotnetPreviewVersion = $Matches.preview
+Write-Host ".NET SDK '$dotnetVersion' -- major version: '$dotnetMajorVersion'; preview: '$dotnetPreviewVersion'"
+
+$aspNetCoreMatch = $aspNetCoreVersion -Match $versionRegex
+if ($aspNetCoreMatch -eq $false) {
+  Write-Host "ASP.NET Core Runtime version '$aspNetCoreVersion' did not match regex!"
+  exit 3
+}
+$aspNetCoreMajorVersion = $Matches.version
+$aspNetCorePreviewVersion = $Matches.preview
+Write-Host "ASP.NET SDK '$aspNetCoreVersion' -- major version: '$aspNetCoreMajorVersion'; preview: '$aspNetCorePreviewVersion'"
+
+if ($dotnetMajorVersion -ne $aspNetCoreMajorVersion -or $dotnetPreviewVersion -ne $aspNetCorePreviewVersion) {
+    Write-Host "ASP.NET Core Runtime version and .NET Core Runtime version do not match -- update DotNetCli.props!"
+    exit 1
+}
\ No newline at end of file
diff --git a/tests/UnitTests.proj b/tests/UnitTests.proj
index b1e35c137b7..a5a1a709a07 100644
--- a/tests/UnitTests.proj
+++ b/tests/UnitTests.proj
@@ -100,4 +100,11 @@
   <!-- <Import Sdk="Microsoft.DotNet.Helix.Sdk" Project="Sdk.targets"/> -->
   <!-- Using locally built version of the helix sdk, normal projects replace the below Import with the SDK import above-->
   <Import Project="$(MSBuildThisFileDirectory)\..\src\Microsoft.DotNet.Helix\Sdk\sdk\Sdk.targets"/>
+
+  <ItemGroup>
+    <HelixWorkItem Condition="$(HelixTargetQueue.StartsWith('Windows'))" Include="AspNetCoreTest">
+      <Command>powershell %HELIX_WORKITEM_PAYLOAD%\aspnet-versioncheck.ps1 -aspNetCoreVersion $(AspNetCoreRuntimeVersion)</Command>
+      <PayloadDirectory>$(MSBuildThisFileDirectory)\AspNetVersionCheck</PayloadDirectory>
+    </HelixWorkItem>
+  </ItemGroup>
 </Project>