diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 694fb90e467030..7bc88e2f038bb8 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -129,6 +129,10 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>4d9945d230fdd8324ce16a31c7dbd74e27a0fc9b</Sha>
     </Dependency>
+    <Dependency Name="Microsoft.DotNet.XUnitAssert" Version="8.0.0-beta.23422.1">
+      <Uri>https://github.com/dotnet/arcade</Uri>
+      <Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
+    </Dependency>
     <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23422.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>4d9945d230fdd8324ce16a31c7dbd74e27a0fc9b</Sha>
diff --git a/eng/Versions.props b/eng/Versions.props
index 7b0ff034f6e135..5e05413674cbed 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -83,10 +83,15 @@
     <!-- SDK dependencies -->
     <MicrosoftDotNetApiCompatTaskVersion>9.0.100-alpha.1.23425.9</MicrosoftDotNetApiCompatTaskVersion>
     <!-- Arcade dependencies -->
+    <MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksFeedVersion>
+    <MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23411.1</MicrosoftDotNetCodeAnalysisVersion>
+    <MicrosoftDotNetGenAPIVersion>8.0.0-beta.23411.1</MicrosoftDotNetGenAPIVersion>
+    <MicrosoftDotNetGenFacadesVersion>8.0.0-beta.23411.1</MicrosoftDotNetGenFacadesVersion>
     <MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23422.1</MicrosoftDotNetBuildTasksFeedVersion>
     <MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23422.1</MicrosoftDotNetCodeAnalysisVersion>
     <MicrosoftDotNetGenAPIVersion>8.0.0-beta.23422.1</MicrosoftDotNetGenAPIVersion>
     <MicrosoftDotNetGenFacadesVersion>8.0.0-beta.23422.1</MicrosoftDotNetGenFacadesVersion>
+    <MicrosoftDotNetXUnitAssertVersion>8.0.0-beta.23422.1</MicrosoftDotNetXUnitAssertVersion>
     <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23422.1</MicrosoftDotNetXUnitExtensionsVersion>
     <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23422.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
     <MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23422.1</MicrosoftDotNetBuildTasksArchivesVersion>
diff --git a/src/libraries/Common/tests/TestUtilities/TestUtilities.csproj b/src/libraries/Common/tests/TestUtilities/TestUtilities.csproj
index cbb1f4ed69be90..2273e3bd088a28 100644
--- a/src/libraries/Common/tests/TestUtilities/TestUtilities.csproj
+++ b/src/libraries/Common/tests/TestUtilities/TestUtilities.csproj
@@ -107,13 +107,15 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsVersion)" />
     <PackageReference Include="xunit.core" Version="$(XUnitVersion)" ExcludeAssets="build" />
-    <PackageReference Include="xunit.assert" Version="$(XUnitVersion)" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
     <!-- Upgrade the NetStandard.Library transitive xunit dependency to avoid 1.x NS dependencies. -->
     <PackageReference Include="NETStandard.Library" Version="$(NetStandardLibraryVersion)" />
+    <!-- Use the arcade fork of xunit.assert for AOT-compat -->
+    <PackageReference Include="Microsoft.DotNet.XUnitAssert" Version="$(MicrosoftDotNetXUnitAssertVersion)" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
     <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
+    <PackageReference Include="xunit.assert" Version="$(XUnitVersion)" />
   </ItemGroup>
 </Project>
diff --git a/src/libraries/System.Linq.Expressions/tests/default.rd.xml b/src/libraries/System.Linq.Expressions/tests/default.rd.xml
index e3505c08f84580..8f9762a7fb7344 100644
--- a/src/libraries/System.Linq.Expressions/tests/default.rd.xml
+++ b/src/libraries/System.Linq.Expressions/tests/default.rd.xml
@@ -4,6 +4,10 @@
       <Type Name="System.Collections.Generic.List`1" Dynamic="Required All" />
     </Assembly>
 
+    <Assembly Name="Xunit.Assert">
+      <Type Name="Xunit.Assert" Dynamic="Required All" />
+    </Assembly>
+
     <Assembly Name="System.Runtime">
       <Type Name="System.Decimal" Dynamic="Required All" />
       <Type Name="System.DateTimeOffset" Dynamic="Required All" />
diff --git a/src/libraries/System.Runtime/tests/System/ArrayTests.cs b/src/libraries/System.Runtime/tests/System/ArrayTests.cs
index 7ef45b6401ad0e..1d1272f8e9e054 100644
--- a/src/libraries/System.Runtime/tests/System/ArrayTests.cs
+++ b/src/libraries/System.Runtime/tests/System/ArrayTests.cs
@@ -7,6 +7,7 @@
 using System.Linq;
 using System.Reflection;
 using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
 using Microsoft.DotNet.XUnitExtensions;
 using Xunit;
 using Xunit.Abstractions;
@@ -4299,6 +4300,8 @@ public class Bar : IEquatable<Bar>
             public string Value { get; set; }
 
             public bool Equals(Bar other) => string.Equals(Value, other.Value);
+            public override bool Equals(object other) => Equals(other as Bar);
+            public override int GetHashCode() => Value.GetHashCode();
         }
 
         public class Foo
diff --git a/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/NewtonsoftTests/ImmutableCollectionsTests.cs b/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/NewtonsoftTests/ImmutableCollectionsTests.cs
index 26226b2bc1e6bf..946b4c14352088 100644
--- a/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/NewtonsoftTests/ImmutableCollectionsTests.cs
+++ b/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/NewtonsoftTests/ImmutableCollectionsTests.cs
@@ -250,7 +250,8 @@ public void SerializeHashSet()
 
             string json = JsonSerializer.Serialize(data, s_indentedOption);
 
-            ImmutableHashSet<string> a = JsonSerializer.Deserialize<ImmutableHashSet<string>>(json);
+            // Use ISet to disambiguate between ISet and IReadOnlySet overloads below
+            ISet<string> a = JsonSerializer.Deserialize<ImmutableHashSet<string>>(json);
             Assert.Equal(3, a.Count);
             Assert.Contains("One", a);
             Assert.Contains("II", a);
@@ -266,7 +267,8 @@ public void DeserializeHashSet()
   ""3""
 ]";
 
-            ImmutableHashSet<string> data = JsonSerializer.Deserialize<ImmutableHashSet<string>>(json);
+            // Use ISet to disambiguate between ISet and IReadOnlySet overloads below
+            ISet<string> data = JsonSerializer.Deserialize<ImmutableHashSet<string>>(json);
 
             Assert.Equal(3, data.Count);
             Assert.Contains("3", data);
@@ -316,7 +318,8 @@ public void DeserializeSortedSet()
   ""3""
 ]";
 
-            ImmutableSortedSet<string> data = JsonSerializer.Deserialize<ImmutableSortedSet<string>>(json);
+            // Use ISet to disambiguate between ISet and IReadOnlySet overloads below
+            ISet<string> data = JsonSerializer.Deserialize<ImmutableSortedSet<string>>(json);
 
             Assert.Equal(3, data.Count);
             Assert.Contains("3", data);