diff --git a/src/libraries/System.Buffers/tests/ArrayPool/UnitTests.cs b/src/libraries/System.Buffers/tests/ArrayPool/UnitTests.cs
index 87b8005e9b468..cc704c68fac13 100644
--- a/src/libraries/System.Buffers/tests/ArrayPool/UnitTests.cs
+++ b/src/libraries/System.Buffers/tests/ArrayPool/UnitTests.cs
@@ -18,6 +18,7 @@ namespace System.Buffers.ArrayPool.Tests
     public partial class ArrayPoolUnitTests : ArrayPoolTest
     {
         private const int MaxEventWaitTimeoutInMs = 200;
+        private const string MaxArraysPerPartitionDefault = "32";
 
         private struct TestStruct
         {
@@ -602,14 +603,14 @@ private static void ConfigurablePool_AllocatedArraysAreCleared<T>()
         public static IEnumerable<object[]> BytePoolInstances()
         {
             yield return new object[] { ArrayPool<byte>.Create() };
-            yield return new object[] { ArrayPool<byte>.Create(1024*1024, 50) };
-            yield return new object[] { ArrayPool<byte>.Create(1024*1024, 1) };
+            yield return new object[] { ArrayPool<byte>.Create(1024 * 1024, 50) };
+            yield return new object[] { ArrayPool<byte>.Create(1024 * 1024, 1) };
             yield return new object[] { ArrayPool<byte>.Shared };
         }
 
         [ConditionalTheory(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
-        [InlineData("", "", "2147483647", "8")]
-        [InlineData("0", "0", "2147483647", "8")]
+        [InlineData("", "", "2147483647", MaxArraysPerPartitionDefault)]
+        [InlineData("0", "0", "2147483647", MaxArraysPerPartitionDefault)]
         [InlineData("1", "2", "1", "2")]
         [InlineData("2", "1", "2", "1")]
         [InlineData("4", "123", "4", "123")]
@@ -623,7 +624,7 @@ public static IEnumerable<object[]> BytePoolInstances()
             "                                                                                                                     " +
             "                                                                                                                     " +
             "                                                                                                                     " +
-            "2" + 
+            "2" +
             "                                                                                                                     " +
             "                                                                                                                     " +
             "                                                                                                                     " +
@@ -638,7 +639,7 @@ public static IEnumerable<object[]> BytePoolInstances()
             "                                                                                                                     " +
             "                                                                                                                     " +
             "                                                                                                                     ",
-            "2147483647", "8")]
+            "2147483647", MaxArraysPerPartitionDefault)]
         public void SharedPool_SetEnvironmentVariables_ValuesRespected(
             string partitionCount, string maxArraysPerPartition, string expectedPartitionCount, string expectedMaxArraysPerPartition)
         {
@@ -669,14 +670,7 @@ public void SharedPool_SetEnvironmentVariables_ValuesRespected(
                 FieldInfo maxArraysPerPartitionField = staticsType.GetField("s_maxArraysPerPartition", BindingFlags.NonPublic | BindingFlags.Static);
                 Assert.NotNull(maxArraysPerPartitionField);
                 int maxArraysPerPartitionValue = (int)maxArraysPerPartitionField.GetValue(null);
-                if (int.Parse(expectedMaxArraysPerPartition) > 0)
-                {
-                    Assert.Equal(int.Parse(expectedMaxArraysPerPartition), maxArraysPerPartitionValue);
-                }
-                else
-                {
-                    Assert.Equal(8, maxArraysPerPartitionValue);
-                }
+                Assert.Equal(int.Parse(int.Parse(expectedMaxArraysPerPartition) > 0 ? expectedMaxArraysPerPartition : MaxArraysPerPartitionDefault), maxArraysPerPartitionValue);
 
                 // Make sure the pool is still usable
                 for (int i = 0; i < 2; i++)
diff --git a/src/libraries/System.Private.CoreLib/src/System/Buffers/SharedArrayPool.cs b/src/libraries/System.Private.CoreLib/src/System/Buffers/SharedArrayPool.cs
index 47115b431efc3..bfa50207dc3df 100644
--- a/src/libraries/System.Private.CoreLib/src/System/Buffers/SharedArrayPool.cs
+++ b/src/libraries/System.Private.CoreLib/src/System/Buffers/SharedArrayPool.cs
@@ -536,12 +536,12 @@ private static int GetPartitionCount()
         }
 
         /// <summary>Gets the maximum number of arrays of a given size allowed to be cached per partition.</summary>
-        /// <returns>Defaults to 8. This does not factor in or impact the number of arrays cached per thread in TLS (currently only 1).</returns>
+        /// <returns>Defaults to 32. This does not factor in or impact the number of arrays cached per thread in TLS (currently only 1).</returns>
         private static int GetMaxArraysPerPartition()
         {
             return TryGetInt32EnvironmentVariable("DOTNET_SYSTEM_BUFFERS_SHAREDARRAYPOOL_MAXARRAYSPERPARTITION", out int result) && result > 0 ?
                 result :
-                8; // arbitrary limit
+                32; // arbitrary limit
         }
 
         /// <summary>Look up an environment variable and try to parse it as an Int32.</summary>