diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml
index 33d0ea5aa9dbdd..bb025f3ae7958b 100644
--- a/eng/pipelines/libraries/helix-queues-setup.yml
+++ b/eng/pipelines/libraries/helix-queues-setup.yml
@@ -78,12 +78,10 @@ jobs:
       - ${{ if eq(parameters.jobParameters.isFullMatrix, true) }}:
         - OSX.1013.Amd64.Open
         - OSX.1014.Amd64.Open
-        # The 10.15 machines aren't in the same configuration, see
-        # https://github.com/dotnet/runtime/issues/24736
-        #- OSX.1015.Amd64.Open
+        - OSX.1015.Amd64.Open
       - ${{ if eq(parameters.jobParameters.isFullMatrix, false) }}:
-        - OSX.1013.Amd64.Open
         - OSX.1014.Amd64.Open
+        - OSX.1015.Amd64.Open
 
     # Windows_NT x64
     - ${{ if eq(parameters.platform, 'Windows_NT_x64') }}:
diff --git a/src/libraries/System.Drawing.Common/tests/FontFamilyTests.cs b/src/libraries/System.Drawing.Common/tests/FontFamilyTests.cs
index 5e801458355529..a87895ba21303f 100644
--- a/src/libraries/System.Drawing.Common/tests/FontFamilyTests.cs
+++ b/src/libraries/System.Drawing.Common/tests/FontFamilyTests.cs
@@ -100,6 +100,10 @@ public void Equals_Object_ReturnsExpected(FontFamily fontFamily, object other, b
             }
         }
 
+        // This will fail on any platform we use libgdiplus, with any
+        // installed system fonts whose name is longer than 31 chars.
+        // macOS 10.15+ ships out of the box with a problem font
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/40937", TestPlatforms.AnyUnix)]
         [ConditionalFact(Helpers.IsDrawingSupported)]
         public void Families_Get_ReturnsExpected()
         {