diff --git a/src/libraries/System.Globalization/tests/CultureInfo/CultureInfoCtor.cs b/src/libraries/System.Globalization/tests/CultureInfo/CultureInfoCtor.cs
index d5c4bc44d29e3..2481138415e1e 100644
--- a/src/libraries/System.Globalization/tests/CultureInfo/CultureInfoCtor.cs
+++ b/src/libraries/System.Globalization/tests/CultureInfo/CultureInfoCtor.cs
@@ -254,8 +254,8 @@ public static IEnumerable<object[]> Ctor_String_TestData()
             yield return new object[] { "pa-IN", new [] { "pa-IN" }, true };
             yield return new object[] { "pl", new [] { "pl" } };
             yield return new object[] { "pl-PL", new [] { "pl-PL" } };
-            yield return new object[] { "prs", new [] { "prs" }, true };
-            yield return new object[] { "prs-AF", new [] { "prs-AF" }, true };
+            yield return new object[] { "prs", new [] { "prs", "fa" }, true };
+            yield return new object[] { "prs-AF", new [] { "prs-AF", "fa-AF" }, true};
             yield return new object[] { "ps", new [] { "ps" }, true };
             yield return new object[] { "ps-AF", new [] { "ps-AF" }, true };
             yield return new object[] { "pt", new [] { "pt" } };
@@ -460,7 +460,7 @@ public void TestCreationWithMangledSortName(string cultureName, string expectedC
             Assert.Equal(expectedSortName, ci.CompareInfo.Name);
         }
 
-        private static bool SupportRemoteExecutionWithIcu => RemoteExecutor.IsSupported && PlatformDetection.IsIcuGlobalization;
+        private static bool SupportRemoteExecutionWithIcu => RemoteExecutor.IsSupported && PlatformDetection.IsIcuGlobalization && PlatformDetection.IsNotWindowsServerCore;
 
         [InlineData("xx-u-XX", "xx-u-xx")]
         [InlineData("xx-u-XX-u-yy", "xx-u-xx-u-yy")]
diff --git a/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoCurrencyGroupSizes.cs b/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoCurrencyGroupSizes.cs
index 34fd7bc00cb2b..079c355bdc594 100644
--- a/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoCurrencyGroupSizes.cs
+++ b/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoCurrencyGroupSizes.cs
@@ -10,20 +10,21 @@ public class NumberFormatInfoCurrencyGroupSizes
     {
         public static IEnumerable<object[]> CurrencyGroupSizes_TestData()
         {
-            yield return new object[] { NumberFormatInfo.InvariantInfo, new int[] { 3 } };
-            yield return new object[] { CultureInfo.GetCultureInfo("en-US").NumberFormat, new int[] { 3 } };
+            yield return new object[] { NumberFormatInfo.InvariantInfo, new int[] { 3 }, null };
+            yield return new object[] { CultureInfo.GetCultureInfo("en-US").NumberFormat, new int[] { 3 }, null };
 
             if (PlatformDetection.IsNotUsingLimitedCultures && !PlatformDetection.IsUbuntu && !PlatformDetection.IsWindows7 && !PlatformDetection.IsWindows8x && !PlatformDetection.IsFedora)
             {
-                yield return new object[] { CultureInfo.GetCultureInfo("ur-IN").NumberFormat, new int[] { 3, 2 } };
+                yield return new object[] { CultureInfo.GetCultureInfo("ur-IN").NumberFormat, new int[] { 3, 2 },  new int[] { 3 }};
             }
         }
 
         [Theory]
         [MemberData(nameof(CurrencyGroupSizes_TestData))]
-        public void CurrencyGroupSizes_Get_ReturnsExpected(NumberFormatInfo format, int[] expected)
+        public void CurrencyGroupSizes_Get_ReturnsExpected(NumberFormatInfo format, int[] expected, int [] expectedAlternative)
         {
-            Assert.Equal(expected, format.CurrencyGroupSizes);
+            Assert.True(format.CurrencyGroupSizes.AsSpan().SequenceEqual(expected.AsSpan()) || format.CurrencyGroupSizes.AsSpan().SequenceEqual(expectedAlternative.AsSpan()),
+            $"Expected {string.Join(", ", expected)} or {string.Join(", ", expectedAlternative ?? Array.Empty<int>())}, got {string.Join(", ", format.CurrencyGroupSizes)}");
         }
 
         [Theory]
diff --git a/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoTests.cs b/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoTests.cs
index 0fe17597a799a..86f74e9f35a91 100644
--- a/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoTests.cs
+++ b/src/libraries/System.Globalization/tests/NumberFormatInfo/NumberFormatInfoTests.cs
@@ -54,8 +54,6 @@ public static IEnumerable<object[]> DigitSubstitution_TestData()
             yield return new object[] { "nqo-GN"    , DigitShapes.NativeNational };
             yield return new object[] { "pa-Arab"   , DigitShapes.NativeNational };
             yield return new object[] { "pa-Arab-PK", DigitShapes.NativeNational };
-            yield return new object[] { "prs"       , DigitShapes.NativeNational };
-            yield return new object[] { "prs-AF"    , DigitShapes.NativeNational };
             yield return new object[] { "ps"        , DigitShapes.NativeNational };
             yield return new object[] { "ps-AF"     , DigitShapes.NativeNational };
             yield return new object[] { "sd"        , DigitShapes.NativeNational };
@@ -115,6 +113,24 @@ public void DigitSubstitutionListTest(string cultureName, DigitShapes shape)
             }
         }
 
+        [Theory]
+        [InlineData("prs")]
+        [InlineData("prs-AF")]
+        public void PrsNativeDigitsTest(string cultureName)
+        {
+            try
+            {
+                CultureInfo ci = CultureInfo.GetCultureInfo(cultureName);
+
+                // Some OS's set the DigitSubstitution to Context for the culture "prs" and "prs-AF". Majority of Os's set it to NativeNational.
+                Assert.True(ci.NumberFormat.DigitSubstitution == DigitShapes.Context || ci.NumberFormat.DigitSubstitution == DigitShapes.NativeNational);
+            }
+            catch (CultureNotFoundException)
+            {
+                // ignore the cultures that we cannot create as it is not supported on the platforms
+            }
+        }
+
         public static IEnumerable<object[]> NativeDigitTestData()
         {
             yield return new object[] { "ccp-Cakm-BD", new string[] { "\U0001E950", "\U0001E951", "\U0001E952", "\U0001E953", "\U0001E954", "\U0001E955", "\U0001E956", "\U0001E957", "\U0001E958", "\U0001E959" }};