diff --git a/NET/Mbc.Pcs.Net.DataRecorder.Test/FileRingBufferTest.cs b/NET/Mbc.Pcs.Net.DataRecorder.Test/FileRingBufferTest.cs
index 23ac7e0..2efad1d 100644
--- a/NET/Mbc.Pcs.Net.DataRecorder.Test/FileRingBufferTest.cs
+++ b/NET/Mbc.Pcs.Net.DataRecorder.Test/FileRingBufferTest.cs
@@ -9,13 +9,6 @@ namespace Mbc.Pcs.Net.Test.DataRecorder
 {
     public class FileRingBufferTest
     {
-        public FileRingBufferTest()
-        {
-#if NET8_0_OR_GREATER
-            // Enable BinaryFormatter, because in .NET 8.0 it is disabled by default
-            AppContext.SetSwitch("System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization", true);
-#endif
-        }
 
         [Fact]
         public void SmokeTest()
diff --git a/NET/Mbc.Pcs.Net.DataRecorder.Test/Mbc.Pcs.Net.DataRecorder.Test.csproj b/NET/Mbc.Pcs.Net.DataRecorder.Test/Mbc.Pcs.Net.DataRecorder.Test.csproj
index 50a1740..7d7e0b1 100644
--- a/NET/Mbc.Pcs.Net.DataRecorder.Test/Mbc.Pcs.Net.DataRecorder.Test.csproj
+++ b/NET/Mbc.Pcs.Net.DataRecorder.Test/Mbc.Pcs.Net.DataRecorder.Test.csproj
@@ -5,6 +5,7 @@
     <Product>Mbc.Pcs.Net.DataRecorder.Test</Product>
 
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+    <EnableUnsafeBinaryFormatterSerialization Condition="'$(TargetFramework)' == 'net8.0'">true</EnableUnsafeBinaryFormatterSerialization>
   </PropertyGroup>
   <PropertyGroup>
         <NoWarn>NU1702;CS7022</NoWarn>
@@ -23,6 +24,9 @@
     <!--Requires the HDF package reference to find the hdf5.dll-->
     <PackageReference Include="HDF.PInvoke" Version="1.10.6.1" Condition="'$(TargetFramework)' == 'net471' OR '$(TargetFramework)' == 'net48'" />
     <PackageReference Include="HDF.PInvoke.1.10" Version="1.10.610" Condition="'$(TargetFramework)' == 'netstandard2.0' " />
+    
+    <!--Use NuGet package for BinaryFormatter on .NET 8.0-->
+    <PackageReference Include="System.Runtime.Serialization.Formatters" Version="10.0.1" Condition="'$(TargetFramework)' == 'net8.0'" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/NET/Mbc.Pcs.Net.DataRecorder/Mbc.Pcs.Net.DataRecorder.csproj b/NET/Mbc.Pcs.Net.DataRecorder/Mbc.Pcs.Net.DataRecorder.csproj
index ba3b0f9..c19a235 100644
--- a/NET/Mbc.Pcs.Net.DataRecorder/Mbc.Pcs.Net.DataRecorder.csproj
+++ b/NET/Mbc.Pcs.Net.DataRecorder/Mbc.Pcs.Net.DataRecorder.csproj
@@ -6,7 +6,7 @@
     
     <Product>Mbc.Pcs.Net.DataRecorder</Product>
 
-    <EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
+    <EnableUnsafeBinaryFormatterSerialization Condition="'$(TargetFramework)' != 'net8.0'">true</EnableUnsafeBinaryFormatterSerialization>
   </PropertyGroup>
   <PropertyGroup>
         <NoWarn>NU1702</NoWarn>
@@ -16,5 +16,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Mbc.Hdf5Utils" Version="0.7.0" />
+    <PackageReference Include="System.Runtime.Serialization.Formatters" Version="10.0.1" Condition="'$(TargetFramework)' == 'net8.0'" />
   </ItemGroup>
 </Project>
\ No newline at end of file