diff --git a/src/contrib/cluster/Akka.Cluster.Sharding/PersistentShard.cs b/src/contrib/cluster/Akka.Cluster.Sharding/PersistentShard.cs
index 1a8edab8411..fc56ca72ff0 100644
--- a/src/contrib/cluster/Akka.Cluster.Sharding/PersistentShard.cs
+++ b/src/contrib/cluster/Akka.Cluster.Sharding/PersistentShard.cs
@@ -20,7 +20,7 @@ namespace Akka.Cluster.Sharding
     using ShardId = String;
     using EntryId = String;
     using Msg = Object;
-
+    
     /// <summary>
     /// This actor creates children entity actors on demand that it is told to be
     /// responsible for. It is used when `rememberEntities` is enabled.
diff --git a/src/core/Akka.API.Tests/Akka.API.Tests.csproj b/src/core/Akka.API.Tests/Akka.API.Tests.csproj
index 04d32720f8d..c4c9cb18e72 100644
--- a/src/core/Akka.API.Tests/Akka.API.Tests.csproj
+++ b/src/core/Akka.API.Tests/Akka.API.Tests.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <AssemblyTitle>Akka.API.Tests</AssemblyTitle>
-    <TargetFrameworks>$(NetFrameworkTestVersion)</TargetFrameworks>
+    <TargetFrameworks>$(NetFrameworkTestVersion);$(NetTestVersion);$(NetCoreTestVersion)</TargetFrameworks>
     <UserSecretsId>93253ee8-0410-4483-9809-9bb2d32860fa</UserSecretsId>
   </PropertyGroup>
 
@@ -28,14 +28,11 @@
   <ItemGroup>
       <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
     <PackageReference Include="xunit" Version="$(XunitVersion)" />
+    <PackageReference Include="xunit.assert" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
     <PackageReference Include="ApiApprover" Version="9.3.0" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="App_Packages\" />
-  </ItemGroup>
-
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
   </PropertyGroup>
diff --git a/src/core/Akka.API.Tests/CoreAPISpec.cs b/src/core/Akka.API.Tests/CoreAPISpec.cs
index 13ff8fd1196..d0ce44fdafb 100644
--- a/src/core/Akka.API.Tests/CoreAPISpec.cs
+++ b/src/core/Akka.API.Tests/CoreAPISpec.cs
@@ -31,6 +31,12 @@ namespace Akka.API.Tests
 {
     public class CoreAPISpec
     {
+        public CoreAPISpec()
+        {
+            // force xunit.assert to be loaded into context, to fix https://github.com/akkadotnet/akka.net/issues/4765
+            var ass = AppDomain.CurrentDomain.Load("xunit.assert");
+        }
+        
         [Fact]
         [MethodImpl(MethodImplOptions.NoInlining)]
         public void ApproveCore()