diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 3387294..5f45f51 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -20,7 +20,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 3.1.x
+        dotnet-version: 8.0.x
 
     - name: Build
       run: dotnet build src -c Release -p:ContinuousIntegrationBuild=true
@@ -29,7 +29,7 @@ jobs:
       run: |
         .\net40\Iesi.Collections.Test.exe
         .\net461\Iesi.Collections.Test.exe
-        .\netcoreapp3.1\Iesi.Collections.Test.exe
+        .\net8.0\Iesi.Collections.Test.exe
       working-directory: src\Iesi.Collections.Test\bin\Release
 
     - name: Pack
diff --git a/default.build b/default.build
index a030fe2..5e13136 100644
--- a/default.build
+++ b/default.build
@@ -48,7 +48,7 @@
 		<call target="run-tests" />
 		<property name="test.file" value="${tests.basedir}/net461/Iesi.Collections.Test.exe" />
 		<call target="run-tests" />
-		<property name="test.file" value="${tests.basedir}/netcoreapp3.1/Iesi.Collections.Test.dll" />
+		<property name="test.file" value="${tests.basedir}/net8.0/Iesi.Collections.Test.dll" />
 		<call target="run-core-tests" />
 	</target>
 
diff --git a/src/Iesi.Collections.Test/Generic/LinkedHashSetFixture.cs b/src/Iesi.Collections.Test/Generic/LinkedHashSetFixture.cs
index 4953508..42c3d37 100644
--- a/src/Iesi.Collections.Test/Generic/LinkedHashSetFixture.cs
+++ b/src/Iesi.Collections.Test/Generic/LinkedHashSetFixture.cs
@@ -105,6 +105,7 @@ public void ShouldPreserveOrderingOnSymmetricExcept()
 
 #if !NETCOREAPP1_0
 		[Test(Description = "ES-1")]
+		[Obsolete("BinaryFormatter is obsolete")]
 		public void DoesNotThrowWhenTryToSerializeWithBinaryFormatter()
 		{
 			var set = new LinkedHashSet<int> { 1, 10, 5 };
@@ -120,6 +121,7 @@ public void DoesNotThrowWhenTryToSerializeWithBinaryFormatter()
 		}
 
 		[Test(Description = "ES-1")]
+		[Obsolete("BinaryFormatter is obsolete")]
 		public void ShouldBeAbleToDeserializeBinarySerialized()
 		{
 			var set = new LinkedHashSet<int> { 1, 10, 5 };
diff --git a/src/Iesi.Collections.Test/Generic/ReadOnlySetFixture.cs b/src/Iesi.Collections.Test/Generic/ReadOnlySetFixture.cs
index 4be4e5f..abe5841 100644
--- a/src/Iesi.Collections.Test/Generic/ReadOnlySetFixture.cs
+++ b/src/Iesi.Collections.Test/Generic/ReadOnlySetFixture.cs
@@ -31,6 +31,7 @@ protected override Type ExpectedType
 
 #if !NETCOREAPP1_0
 		[Test(Description = "ES-1")]
+		[Obsolete("BinaryFormatter is obsolete")]
 		public void ShouldBeAbleToDeserializeBinarySerialized()
 		{
 			var set = new ReadOnlySet<int>(new HashSet<int> { 1, 10, 5 });
@@ -48,4 +49,4 @@ public void ShouldBeAbleToDeserializeBinarySerialized()
 #endif
 
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Iesi.Collections.Test/Generic/SynchronizedSetFixture.cs b/src/Iesi.Collections.Test/Generic/SynchronizedSetFixture.cs
index 0fa336c..df7fa55 100644
--- a/src/Iesi.Collections.Test/Generic/SynchronizedSetFixture.cs
+++ b/src/Iesi.Collections.Test/Generic/SynchronizedSetFixture.cs
@@ -29,6 +29,7 @@ protected override ISet<string> CreateInstance(ICollection<string> init)
 
 #if !NETCOREAPP1_0
 		[Test(Description = "ES-1")]
+		[Obsolete("BinaryFormatter is obsolete")]
 		public void ShouldBeAbleToDeserializeBinarySerialized()
 		{
 			var set = new SynchronizedSet<int>(new HashSet<int> { 1, 10, 5 });
diff --git a/src/Iesi.Collections.Test/Iesi.Collections.Test.csproj b/src/Iesi.Collections.Test/Iesi.Collections.Test.csproj
index 5b3ee1c..38b75e3 100644
--- a/src/Iesi.Collections.Test/Iesi.Collections.Test.csproj
+++ b/src/Iesi.Collections.Test/Iesi.Collections.Test.csproj
@@ -1,11 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net40;net461;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net40;net461;net8.0</TargetFrameworks>
     <Company>NHibernate community</Company>
     <Description>The Unit Tests for Iesi.Collections.</Description>
     <OutputType>exe</OutputType>
     <GenerateProgramFile>false</GenerateProgramFile>
     <IsTestProject>true</IsTestProject>
+    <EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
   </PropertyGroup>
 
   <ItemGroup>