diff --git a/tests/ImageSharp.Tests/Formats/Bmp/BmpDecoderTests.cs b/tests/ImageSharp.Tests/Formats/Bmp/BmpDecoderTests.cs
index ef245d4d0d..2b42b65f00 100644
--- a/tests/ImageSharp.Tests/Formats/Bmp/BmpDecoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Bmp/BmpDecoderTests.cs
@@ -138,12 +138,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Bmp
             using (Image<TPixel> image = provider.GetImage(BmpDecoder))
             {
                 image.DebugSave(provider);
-
-                // The Magick Reference Decoder can not decode 4-Bit bitmaps, so only execute this on windows.
-                if (TestEnvironment.IsWindows)
-                {
-                    image.CompareToOriginal(provider);
-                }
+                image.CompareToOriginal(provider);
             }
         }
 
@@ -202,15 +197,11 @@ namespace SixLabors.ImageSharp.Tests.Formats.Bmp
         public void BmpDecoder_CanDecode_RunLengthEncoded_4Bit_WithDelta<TPixel>(TestImageProvider<TPixel> provider)
             where TPixel : unmanaged, IPixel<TPixel>
         {
-            using (Image<TPixel> image = provider.GetImage(new BmpDecoder { RleSkippedPixelHandling = RleSkippedPixelHandling.Black }))
+            RleSkippedPixelHandling skippedPixelHandling = TestEnvironment.IsWindows ? RleSkippedPixelHandling.Black : RleSkippedPixelHandling.FirstColorOfPalette;
+            using (Image<TPixel> image = provider.GetImage(new BmpDecoder { RleSkippedPixelHandling = skippedPixelHandling }))
             {
                 image.DebugSave(provider);
-
-                // The Magick Reference Decoder can not decode 4-Bit bitmaps, so only execute this on windows.
-                if (TestEnvironment.IsWindows)
-                {
-                    image.CompareToOriginal(provider);
-                }
+                image.CompareToOriginal(provider);
             }
         }
 
@@ -219,15 +210,11 @@ namespace SixLabors.ImageSharp.Tests.Formats.Bmp
         public void BmpDecoder_CanDecode_RunLengthEncoded_4Bit<TPixel>(TestImageProvider<TPixel> provider)
             where TPixel : unmanaged, IPixel<TPixel>
         {
-            using (Image<TPixel> image = provider.GetImage(new BmpDecoder { RleSkippedPixelHandling = RleSkippedPixelHandling.Black }))
+            RleSkippedPixelHandling skippedPixelHandling = TestEnvironment.IsWindows ? RleSkippedPixelHandling.Black : RleSkippedPixelHandling.FirstColorOfPalette;
+            using (Image<TPixel> image = provider.GetImage(new BmpDecoder { RleSkippedPixelHandling = skippedPixelHandling }))
             {
                 image.DebugSave(provider);
-
-                // The Magick Reference Decoder can not decode 4-Bit bitmaps, so only execute this on windows.
-                if (TestEnvironment.IsWindows)
-                {
-                    image.CompareToOriginal(provider);
-                }
+                image.CompareToOriginal(provider);
             }
         }
 
diff --git a/tests/ImageSharp.Tests/Formats/Bmp/BmpEncoderTests.cs b/tests/ImageSharp.Tests/Formats/Bmp/BmpEncoderTests.cs
index 864299522e..90e6cf43f3 100644
--- a/tests/ImageSharp.Tests/Formats/Bmp/BmpEncoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Bmp/BmpEncoderTests.cs
@@ -181,17 +181,13 @@ namespace SixLabors.ImageSharp.Tests.Formats.Bmp
             BmpBitsPerPixel bitsPerPixel)
             where TPixel : unmanaged, IPixel<TPixel>
         {
-            // The Magick Reference Decoder can not decode 4-Bit bitmaps, so only execute this on windows.
-            if (TestEnvironment.IsWindows)
-            {
-                // Oddly the difference only happens locally but we'll not test for that.
-                // I suspect the issue is with the reference codec.
-                ImageComparer comparer = TestEnvironment.IsFramework
-                    ? ImageComparer.TolerantPercentage(0.0161F)
-                    : ImageComparer.Exact;
+            // Oddly the difference only happens locally but we'll not test for that.
+            // I suspect the issue is with the reference codec.
+            ImageComparer comparer = TestEnvironment.IsFramework
+                ? ImageComparer.TolerantPercentage(0.0161F)
+                : ImageComparer.Exact;
 
-                TestBmpEncoderCore(provider, bitsPerPixel, supportTransparency: false, customComparer: comparer);
-            }
+            TestBmpEncoderCore(provider, bitsPerPixel, supportTransparency: false, customComparer: comparer);
         }
 
         [Theory]
@@ -201,17 +197,13 @@ namespace SixLabors.ImageSharp.Tests.Formats.Bmp
             BmpBitsPerPixel bitsPerPixel)
             where TPixel : unmanaged, IPixel<TPixel>
         {
-            // The Magick Reference Decoder can not decode 4-Bit bitmaps, so only execute this on windows.
-            if (TestEnvironment.IsWindows)
-            {
-                // Oddly the difference only happens locally but we'll not test for that.
-                // I suspect the issue is with the reference codec.
-                ImageComparer comparer = TestEnvironment.IsFramework
-                    ? ImageComparer.TolerantPercentage(0.0161F)
-                    : ImageComparer.Exact;
+            // Oddly the difference only happens locally but we'll not test for that.
+            // I suspect the issue is with the reference codec.
+            ImageComparer comparer = TestEnvironment.IsFramework
+                ? ImageComparer.TolerantPercentage(0.0161F)
+                : ImageComparer.Exact;
 
-                TestBmpEncoderCore(provider, bitsPerPixel, supportTransparency: true, customComparer: comparer);
-            }
+            TestBmpEncoderCore(provider, bitsPerPixel, supportTransparency: true, customComparer: comparer);
         }
 
         [Theory]
@@ -219,28 +211,14 @@ namespace SixLabors.ImageSharp.Tests.Formats.Bmp
         public void Encode_1Bit_WithV3Header_Works<TPixel>(
             TestImageProvider<TPixel> provider,
             BmpBitsPerPixel bitsPerPixel)
-            where TPixel : unmanaged, IPixel<TPixel>
-        {
-            // The Magick Reference Decoder can not decode 1-Bit bitmaps, so only execute this on windows.
-            if (TestEnvironment.IsWindows)
-            {
-                TestBmpEncoderCore(provider, bitsPerPixel, supportTransparency: false);
-            }
-        }
+            where TPixel : unmanaged, IPixel<TPixel> => TestBmpEncoderCore(provider, bitsPerPixel, supportTransparency: false);
 
         [Theory]
         [WithFile(Bit1, PixelTypes.Rgba32, BmpBitsPerPixel.Pixel1)]
         public void Encode_1Bit_WithV4Header_Works<TPixel>(
             TestImageProvider<TPixel> provider,
             BmpBitsPerPixel bitsPerPixel)
-            where TPixel : unmanaged, IPixel<TPixel>
-        {
-            // The Magick Reference Decoder can not decode 1-Bit bitmaps, so only execute this on windows.
-            if (TestEnvironment.IsWindows)
-            {
-                TestBmpEncoderCore(provider, bitsPerPixel, supportTransparency: true);
-            }
-        }
+            where TPixel : unmanaged, IPixel<TPixel> => TestBmpEncoderCore(provider, bitsPerPixel, supportTransparency: true);
 
         [Theory]
         [WithFile(Bit8Gs, PixelTypes.L8, BmpBitsPerPixel.Pixel8)]