diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
index ac5b635962..d696acf0f2 100644
--- a/tests/Directory.Build.props
+++ b/tests/Directory.Build.props
@@ -18,6 +18,7 @@
 
   <PropertyGroup>
     <CodeAnalysisRuleSet>..\ImageSharp.Tests.ruleset</CodeAnalysisRuleSet>
+    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/tests/Directory.Build.targets b/tests/Directory.Build.targets
index 4e1b9503e1..c05384fcce 100644
--- a/tests/Directory.Build.targets
+++ b/tests/Directory.Build.targets
@@ -21,7 +21,7 @@
     <PackageReference Update="BenchmarkDotNet" Version="0.13.0" />
     <PackageReference Update="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.0" Condition="'$(IsWindows)'=='true'" />
     <PackageReference Update="Colourful" Version="3.0.0" />
-    <PackageReference Update="Magick.NET-Q16-AnyCPU" Version="11.1.2" />
+    <PackageReference Update="Magick.NET-Q16-AnyCPU" Version="12.2.2" />
     <PackageReference Update="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21311.3" />
     <PackageReference Update="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21311.3" />
     <PackageReference Update="Moq" Version="4.14.6" />
@@ -32,7 +32,7 @@
     <PackageReference Update="runtime.osx.10.10-x64.CoreCompat.System.Drawing" Version="5.8.64" Condition="'$(IsOSX)'=='true'" />
     <PackageReference Update="SharpZipLib" Version="1.3.2" />
     <PackageReference Update="SkiaSharp" Version="2.80.2" />
-    <PackageReference Update="System.Drawing.Common" Version="5.0.2" />
+    <PackageReference Update="System.Drawing.Common" Version="6.0.0" />
     <PackageReference Update="System.IO.Compression" Version="4.3.0" />
   </ItemGroup>
 
diff --git a/tests/ImageSharp.Tests/ImageSharp.Tests.csproj b/tests/ImageSharp.Tests/ImageSharp.Tests.csproj
index c6cf347518..a6197b6009 100644
--- a/tests/ImageSharp.Tests/ImageSharp.Tests.csproj
+++ b/tests/ImageSharp.Tests/ImageSharp.Tests.csproj
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <DebugSymbols>True</DebugSymbols>
     <AssemblyName>SixLabors.ImageSharp.Tests</AssemblyName>
-    <Platforms>AnyCPU;x64;x86</Platforms>
+    <Platforms>AnyCPU;x64;x86;ARM64</Platforms>
     <RootNamespace>SixLabors.ImageSharp.Tests</RootNamespace>
     <Configurations>Debug;Release</Configurations>
   </PropertyGroup>
diff --git a/tests/ImageSharp.Tests/TestUtilities/ImageComparison/Exceptions/ImageDifferenceIsOverThresholdException.cs b/tests/ImageSharp.Tests/TestUtilities/ImageComparison/Exceptions/ImageDifferenceIsOverThresholdException.cs
index 33b7228aed..5cc6d22695 100644
--- a/tests/ImageSharp.Tests/TestUtilities/ImageComparison/Exceptions/ImageDifferenceIsOverThresholdException.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/ImageComparison/Exceptions/ImageDifferenceIsOverThresholdException.cs
@@ -50,7 +50,7 @@ public class ImageDifferenceIsOverThresholdException : ImagesSimilarityException
             return "MacOS";
         }
 
-        if (TestEnvironment.IsMacOS)
+        if (TestEnvironment.IsLinux)
         {
             return "Linux";
         }
diff --git a/tests/ImageSharp.Tests/TestUtilities/TestEnvironment.cs b/tests/ImageSharp.Tests/TestUtilities/TestEnvironment.cs
index 113429ead7..8818830351 100644
--- a/tests/ImageSharp.Tests/TestUtilities/TestEnvironment.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/TestEnvironment.cs
@@ -117,6 +117,10 @@ public static partial class TestEnvironment
 
     internal static bool IsFramework => NetCoreVersion == null;
 
+    internal static Architecture OSArchitecture => RuntimeInformation.OSArchitecture;
+
+    internal static Architecture ProcessArchitecture => RuntimeInformation.ProcessArchitecture;
+
     /// <summary>
     /// A dummy operation to enforce the execution of the static constructor.
     /// </summary>
diff --git a/tests/ImageSharp.Tests/runtimeconfig.template.json b/tests/ImageSharp.Tests/runtimeconfig.template.json
new file mode 100644
index 0000000000..4201c8a4ab
--- /dev/null
+++ b/tests/ImageSharp.Tests/runtimeconfig.template.json
@@ -0,0 +1,5 @@
+{
+      "configProperties": {
+         "System.Drawing.EnableUnixSupport": true
+      }
+}
\ No newline at end of file