diff --git a/tests/ImageSharp.Tests/TestUtilities/TestEnvironment.Formats.cs b/tests/ImageSharp.Tests/TestUtilities/TestEnvironment.Formats.cs
index ccda71613d..90c999f7cd 100644
--- a/tests/ImageSharp.Tests/TestUtilities/TestEnvironment.Formats.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/TestEnvironment.Formats.cs
@@ -58,16 +58,19 @@ namespace SixLabors.ImageSharp.Tests
             );
 
             // Magick codecs should work on all platforms
+            IImageEncoder pngEncoder = IsWindows ? (IImageEncoder)SystemDrawingReferenceEncoder.Png : new PngEncoder();
+            IImageEncoder bmpEncoder = IsWindows ? (IImageEncoder)SystemDrawingReferenceEncoder.Bmp : new BmpEncoder();
+
             cfg.ConfigureCodecs(
                 ImageFormats.Png,
                 MagickReferenceDecoder.Instance,
-                SystemDrawingReferenceEncoder.Png,
+                pngEncoder,
                 new PngImageFormatDetector());
 
             cfg.ConfigureCodecs(
                 ImageFormats.Bmp,
                 SystemDrawingReferenceDecoder.Instance,
-                SystemDrawingReferenceEncoder.Bmp,
+                bmpEncoder,
                 new BmpImageFormatDetector());
 
             return cfg;
diff --git a/tests/ImageSharp.Tests/TestUtilities/Tests/TestEnvironmentTests.cs b/tests/ImageSharp.Tests/TestUtilities/Tests/TestEnvironmentTests.cs
index 2c824729c2..8a3e69059f 100644
--- a/tests/ImageSharp.Tests/TestUtilities/Tests/TestEnvironmentTests.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/Tests/TestEnvironmentTests.cs
@@ -18,7 +18,6 @@ using Xunit.Abstractions;
 
 namespace SixLabors.ImageSharp.Tests
 {
-    
     public class TestEnvironmentTests
     {
         public TestEnvironmentTests(ITestOutputHelper output)