diff --git a/tests/ImageSharp.Tests/Formats/Jpg/ComponentUtilsTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/ComponentUtilsTests.cs
index b547993b5..cdaf5fa3b 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/ComponentUtilsTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/ComponentUtilsTests.cs
@@ -84,12 +84,13 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
         }
 
         [Theory]
-        [InlineData(TestImages.Jpeg.Baseline.Calliphora, 1)]
-        [InlineData(TestImages.Jpeg.Baseline.Jpeg444, 1)]
-        [InlineData(TestImages.Jpeg.Baseline.Jpeg420, 2)]
+        [InlineData(TestImages.Jpeg.Baseline.Jpeg444, 1, 1)]
+        [InlineData(TestImages.Jpeg.Baseline.Jpeg420Exif, 2, 2)]
+        [InlineData(TestImages.Jpeg.Baseline.Jpeg420Small, 2, 2)]
         public void CalculateJpegChannelSizes_YCbCr(
             string imageFile,
-            int chromaDiv)
+            int hDiv,
+            int vDiv)
         {
             using (OrigJpegDecoderCore decoder = JpegFixture.ParseStream(imageFile))
             {
@@ -98,7 +99,9 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
                 Assert.Equal(3, s.Length);
 
                 Size ySize = decoder.Components[0].SizeInBlocks() * 8;
-                Size cSize = ySize / chromaDiv;
+                Size cSize = ySize;
+                cSize.Width /= hDiv;
+                cSize.Height /= vDiv;
 
                 Assert.Equal(ySize, s[0]);
                 Assert.Equal(cSize, s[1]);
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
index 6dd1da351..098fc1c77 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
@@ -28,6 +28,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
                 TestImages.Jpeg.Baseline.Cmyk,
                 TestImages.Jpeg.Baseline.Ycck,
                 TestImages.Jpeg.Baseline.Jpeg400,
+                TestImages.Jpeg.Baseline.Jpeg420Small,
                 TestImages.Jpeg.Baseline.Jpeg444,
                 TestImages.Jpeg.Baseline.Testimgorig,
                 TestImages.Jpeg.Baseline.Bad.BadEOF,
@@ -255,7 +256,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
         [Fact]
         public void Decoder_Reads_Correct_Resolution_From_Exif()
         {
-            using (Image<Rgba32> image = TestFile.Create(TestImages.Jpeg.Baseline.Jpeg420).CreateImage())
+            using (Image<Rgba32> image = TestFile.Create(TestImages.Jpeg.Baseline.Jpeg420Exif).CreateImage())
             {
                 Assert.Equal(72, image.MetaData.HorizontalResolution);
                 Assert.Equal(72, image.MetaData.VerticalResolution);
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegProfilingBenchmarks.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegProfilingBenchmarks.cs
index 113596ee8..792836cf8 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegProfilingBenchmarks.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegProfilingBenchmarks.cs
@@ -26,7 +26,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
             TestImages.Jpeg.Baseline.Ycck,
             TestImages.Jpeg.Baseline.Calliphora,
             TestImages.Jpeg.Baseline.Jpeg400,
-            TestImages.Jpeg.Baseline.Jpeg420,
+            TestImages.Jpeg.Baseline.Jpeg420Exif,
             TestImages.Jpeg.Baseline.Jpeg444,
         };
 
diff --git a/tests/ImageSharp.Tests/TestImages.cs b/tests/ImageSharp.Tests/TestImages.cs
index 3fdbecf50..ba082fe56 100644
--- a/tests/ImageSharp.Tests/TestImages.cs
+++ b/tests/ImageSharp.Tests/TestImages.cs
@@ -99,15 +99,16 @@ namespace SixLabors.ImageSharp.Tests
                 public const string Snake = "Jpg/baseline/Snake.jpg";
                 public const string Lake = "Jpg/baseline/Lake.jpg";
                 public const string Jpeg400 = "Jpg/baseline/jpeg400jfif.jpg";
-                public const string Jpeg420 = "Jpg/baseline/jpeg420exif.jpg";
+                public const string Jpeg420Exif = "Jpg/baseline/jpeg420exif.jpg";
                 public const string Jpeg444 = "Jpg/baseline/jpeg444.jpg";
+                public const string Jpeg420Small = "Jpg/baseline/jpeg420small.jpg";
                 public const string Testimgorig = "Jpg/baseline/testorig.jpg";
 
                 public static readonly string[] All =
                     {
                         Cmyk, Ycck, Exif, Floorplan,
                         Calliphora, Turtle, GammaDalaiLamaGray,
-                        Hiyamugi, Jpeg400, Jpeg420, Jpeg444,
+                        Hiyamugi, Jpeg400, Jpeg420Exif, Jpeg444,
                     };
             }
 
diff --git a/tests/Images/External b/tests/Images/External
index 2f6b226b9..d91054b0e 160000
--- a/tests/Images/External
+++ b/tests/Images/External
@@ -1 +1 @@
-Subproject commit 2f6b226b9fbaf8b23808755bd7e7752a0560644e
+Subproject commit d91054b0e00001ea90e3098f7057c741893365c4
diff --git a/tests/Images/Input/Jpg/baseline/jpeg420small.jpg b/tests/Images/Input/Jpg/baseline/jpeg420small.jpg
new file mode 100644
index 000000000..8e5d1c7bd
--- /dev/null
+++ b/tests/Images/Input/Jpg/baseline/jpeg420small.jpg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ac2cbbe4e6240cff33468e780eaf3de8a1800e5b8cdce5a9959268c17d566e92
+size 5276