diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Baseline.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Baseline.cs
index 778459775a..f178c29c0a 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Baseline.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Baseline.cs
@@ -42,7 +42,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
         public void DecodeBaselineJpeg_PdfJs<TPixel>(TestImageProvider<TPixel> provider)
             where TPixel : struct, IPixel<TPixel>
         {
-            if (TestEnvironment.RunsOnCI && !TestEnvironment.Is64BitProcess)
+            if (SkipTest(provider))
             {
                 // skipping to avoid OutOfMemoryException on CI
                 return;
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Progressive.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Progressive.cs
index 83983691e2..c988f8f054 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Progressive.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Progressive.cs
@@ -18,7 +18,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
         public void DecodeProgressiveJpeg_Orig<TPixel>(TestImageProvider<TPixel> provider)
             where TPixel : struct, IPixel<TPixel>
         {
-            if (TestEnvironment.RunsOnCI && !TestEnvironment.Is64BitProcess)
+            if (SkipTest(provider))
             {
                 // skipping to avoid OutOfMemoryException on CI
                 return;
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
index cfd5989f58..3667790a2c 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
@@ -48,11 +48,13 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
             string[] largeImagesToSkipOn32Bit =
                 {
                     TestImages.Jpeg.Baseline.Jpeg420Exif,
-                    TestImages.Jpeg.Issues.BadZigZagProgressive385
+                    TestImages.Jpeg.Issues.MissingFF00ProgressiveBedroom159,
+                    TestImages.Jpeg.Issues.BadZigZagProgressive385,
+                    TestImages.Jpeg.Issues.NoEoiProgressive517,
+                    TestImages.Jpeg.Issues.BadRstProgressive518,
                 };
 
-            return TestEnvironment.RunsOnCI && !TestEnvironment.Is64BitProcess
-                                            && largeImagesToSkipOn32Bit.Contains(provider.SourceFileOrDescription);
+            return !TestEnvironment.Is64BitProcess && largeImagesToSkipOn32Bit.Contains(provider.SourceFileOrDescription);
         }
 
         public JpegDecoderTests(ITestOutputHelper output)