diff --git a/tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderTests.cs
index 2dd56f079..166637a70 100644
--- a/tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderTests.cs
@@ -51,7 +51,7 @@ public class TiffDecoderTests : TiffDecoderBaseTester
     [InlineData(RgbLzwNoPredictorMultistripMotorola, ImageSharp.ByteOrder.BigEndian)]
     public void ByteOrder(string imagePath, ByteOrder expectedByteOrder)
     {
-        var testFile = TestFile.Create(imagePath);
+        TestFile testFile = TestFile.Create(imagePath);
         using (var stream = new MemoryStream(testFile.Bytes, false))
         {
             IImageInfo info = Image.Identify(stream);
@@ -61,7 +61,7 @@ public class TiffDecoderTests : TiffDecoderBaseTester
 
             stream.Seek(0, SeekOrigin.Begin);
 
-            using var img = Image.Load(stream);
+            using Image img = Image.Load(stream);
             Assert.Equal(expectedByteOrder, img.Metadata.GetTiffMetadata().ByteOrder);
         }
     }
@@ -80,6 +80,14 @@ public class TiffDecoderTests : TiffDecoderBaseTester
     public void TiffDecoder_CanDecode_Planar<TPixel>(TestImageProvider<TPixel> provider)
         where TPixel : unmanaged, IPixel<TPixel> => TestTiffDecoder(provider);
 
+    [Theory]
+    [WithFile(Tiled, PixelTypes.Rgba32)]
+    [WithFile(QuadTile, PixelTypes.Rgba32)]
+    [WithFile(TiledChunky, PixelTypes.Rgba32)]
+    [WithFile(TiledPlanar, PixelTypes.Rgba32)]
+    public void TiffDecoder_CanDecode_Tiled<TPixel>(TestImageProvider<TPixel> provider)
+        where TPixel : unmanaged, IPixel<TPixel> => TestTiffDecoder(provider);
+
     [Theory]
     [WithFile(Rgba8BitPlanarUnassociatedAlpha, PixelTypes.Rgba32)]
     public void TiffDecoder_CanDecode_Planar_32Bit<TPixel>(TestImageProvider<TPixel> provider)
diff --git a/tests/ImageSharp.Tests/TestImages.cs b/tests/ImageSharp.Tests/TestImages.cs
index d47f1136d..3867bfdbc 100644
--- a/tests/ImageSharp.Tests/TestImages.cs
+++ b/tests/ImageSharp.Tests/TestImages.cs
@@ -889,6 +889,12 @@ public static class TestImages
         public const string Flower32BitGrayPredictorBigEndian = "Tiff/flower-minisblack-32_msb_deflate_predictor.tiff";
         public const string Flower32BitGrayPredictorLittleEndian = "Tiff/flower-minisblack-32_lsb_deflate_predictor.tiff";
 
+        // Tiled images.
+        public const string Tiled = "Tiff/tiled.tiff";
+        public const string QuadTile = "Tiff/quad-tile.tiff";
+        public const string TiledChunky = "Tiff/rgb_uncompressed_tiled_chunky.tiff";
+        public const string TiledPlanar = "Tiff/rgb_uncompressed_tiled_planar.tiff";
+
         // Images with alpha channel.
         public const string Rgba2BitUnassociatedAlpha = "Tiff/RgbaUnassociatedAlpha2bit.tiff";
         public const string Rgba3BitUnassociatedAlpha = "Tiff/RgbaUnassociatedAlpha3bit.tiff";
diff --git a/tests/Images/Input/Tiff/quad-tile.tiff b/tests/Images/Input/Tiff/quad-tile.tiff
new file mode 100644
index 000000000..9f93f25fe
--- /dev/null
+++ b/tests/Images/Input/Tiff/quad-tile.tiff
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ab5e5c87cd575472c6fc3e0d5824ebc818b88bf6e5e4aff3afe66f8725351a09
+size 209220
diff --git a/tests/Images/Input/Tiff/rgb_uncompressed_tiled_chunky.tiff b/tests/Images/Input/Tiff/rgb_uncompressed_tiled_chunky.tiff
new file mode 100644
index 000000000..ef4421b25
--- /dev/null
+++ b/tests/Images/Input/Tiff/rgb_uncompressed_tiled_chunky.tiff
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:42bf0a62b8d5de300c0f284c23b5ac1fc7ae9487beeaa3f2ea5a1f6c0c48ced6
+size 339070
diff --git a/tests/Images/Input/Tiff/rgb_uncompressed_tiled_planar.tiff b/tests/Images/Input/Tiff/rgb_uncompressed_tiled_planar.tiff
new file mode 100644
index 000000000..4eb52b3a4
--- /dev/null
+++ b/tests/Images/Input/Tiff/rgb_uncompressed_tiled_planar.tiff
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1ab10d6714142608d0e003d0de1d9f573af996254772f609107815a938141b57
+size 339178
diff --git a/tests/Images/Input/Tiff/tiled.tiff b/tests/Images/Input/Tiff/tiled.tiff
new file mode 100644
index 000000000..63c1e50a1
--- /dev/null
+++ b/tests/Images/Input/Tiff/tiled.tiff
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f07be69e33985e7bcf6305eb74e3f23b124dc75509d192697df789318913174b
+size 31357