diff --git a/eng/Tools.props b/eng/Tools.props
index 40a770a47f91..b8c99b032315 100644
--- a/eng/Tools.props
+++ b/eng/Tools.props
@@ -9,6 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.DotNet.Build.Tasks.Packaging" Version="$(MicrosoftDotNetBuildTasksPackagingVersion)" />
+    <PackageDownload Include="Microsoft.DotNet.Helix.Sdk" Version="[$(MicrosoftDotNetHelixSdkVersion)]" />
     <PackageReference Include="Microsoft.NETCore.Platforms" Version="$(MicrosoftNETCorePlatformsVersion)" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/eng/Versions.props b/eng/Versions.props
index 038ecbfb77ec..506eeacc8c7b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -17,6 +17,7 @@
     <!-- arcade -->
     <MicrosoftDotNetBuildTasksFeedVersion>2.2.0-beta.19577.5</MicrosoftDotNetBuildTasksFeedVersion>
     <MicrosoftDotNetBuildTasksPackagingVersion>1.0.0-beta.19577.5</MicrosoftDotNetBuildTasksPackagingVersion>
+    <MicrosoftDotNetHelixSdkVersion>2.0.0-beta.19461.7</MicrosoftDotNetHelixSdkVersion>
     <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.19278.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
     <!-- roslyn -->
     <MicrosoftNetCompilersToolsetVersion>3.3.0-beta2-19367-02</MicrosoftNetCompilersToolsetVersion>
diff --git a/eng/pipelines/ci.yml b/eng/pipelines/ci.yml
index d4401681d99b..811fd93b6514 100644
--- a/eng/pipelines/ci.yml
+++ b/eng/pipelines/ci.yml
@@ -52,7 +52,18 @@ jobs:
   parameters:
     jobTemplate: test-job.yml
     buildConfig: checked
-    platformGroup: all
+    platforms:
+    - Linux_arm
+    - Linux_arm64
+    - Linux_musl_x64
+    - Linux_musl_arm64
+    - Linux_rhel6_x64
+    - Linux_x64
+    - OSX_x64
+    - Windows_NT_x64
+    - Windows_NT_x86
+    # - Windows_NT_arm return this when https://github.com/dotnet/runtime/issues/1097 is fixed.
+    - Windows_NT_arm64
     helixQueueGroup: ci
     jobParameters:
       testGroup: outerloop
@@ -73,7 +84,7 @@ jobs:
     - OSX_x64
     - Windows_NT_x64
     - Windows_NT_x86
-    - Windows_NT_arm
+    # - Windows_NT_arm return this when https://github.com/dotnet/runtime/issues/1097 is fixed.
     - Windows_NT_arm64
     helixQueueGroup: ci
     jobParameters:
diff --git a/eng/pipelines/pr.yml b/eng/pipelines/pr.yml
index 5f0066d40cdb..33ff8c699737 100644
--- a/eng/pipelines/pr.yml
+++ b/eng/pipelines/pr.yml
@@ -65,7 +65,7 @@ jobs:
     - Linux_musl_x64
     - Linux_x64
     - OSX_x64
-    - Windows_NT_arm
+    # - Windows_NT_arm return this when https://github.com/dotnet/runtime/issues/1097 is fixed.
     - Windows_NT_arm64
     - Windows_NT_x64
     - Windows_NT_x86
diff --git a/src/pal/src/exception/remote-unwind.cpp b/src/pal/src/exception/remote-unwind.cpp
index 893cc026c5b2..c4ff0335e4bb 100644
--- a/src/pal/src/exception/remote-unwind.cpp
+++ b/src/pal/src/exception/remote-unwind.cpp
@@ -68,13 +68,19 @@ SET_DEFAULT_DEBUG_CHANNEL(EXCEPT);
 #include <elf.h>
 #include <link.h>
 
-#if defined(_X86_) || defined(_ARM_) 
+#if defined(_X86_) || defined(_ARM_)
+#if !defined(PRIx32)
+#define PRIx32 "lx"
+#endif
 #define PRIx PRIx32
 #define PRIu PRIu32
 #define PRId PRId32
 #define PRIA "08"
 #define PRIxA PRIA PRIx
 #elif defined(_AMD64_) || defined(_ARM64_)
+#if !defined(PRIx64)
+#define PRIx64 "llx"
+#endif
 #define PRIx PRIx64
 #define PRIu PRIu64
 #define PRId PRId64