diff --git a/tests/arm64/Tests.lst b/tests/arm64/Tests.lst
index c4917fecf74d..b786e311d979 100644
--- a/tests/arm64/Tests.lst
+++ b/tests/arm64/Tests.lst
@@ -13033,7 +13033,7 @@ RelativePath=CoreMangLib\cti\system\math\MathRound3\MathRound3.cmd
 WorkingDir=CoreMangLib\cti\system\math\MathRound3
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=Pri1;RT;EXPECTED_PASS
+Categories=Pri1;RT;EXPECTED_FAIL;12549
 HostStyle=0
 
 [MathRound4.cmd_1804]
@@ -89401,7 +89401,7 @@ RelativePath=JIT\Performance\CodeQuality\Span\SpanBench\SpanBench.cmd
 WorkingDir=JIT\Performance\CodeQuality\Span\SpanBench
 Expected=0
 MaxAllowedDurationSeconds=600
-Categories=EXPECTED_PASS;NEW
+Categories=EXPECTED_FAIL;NEW;12549
 HostStyle=0
 
 [Generated1202.cmd_11489]
diff --git a/tests/src/dir.props b/tests/src/dir.props
index 03c04a2a95a1..fcdc55df6107 100644
--- a/tests/src/dir.props
+++ b/tests/src/dir.props
@@ -34,7 +34,7 @@
     <When Condition="'$(OSGroup)'=='Windows_NT'">
       <PropertyGroup>
         <TargetsWindows>true</TargetsWindows>
-        <TestNugetRuntimeId>win7-$(__BuildArch)</TestNugetRuntimeId>
+        <TestNugetRuntimeId>win-$(__BuildArch)</TestNugetRuntimeId>
       </PropertyGroup>
     </When>
     <When Condition="'$(OSGroup)'=='Linux'">