diff --git a/tests/Avalonia.RenderTests/Media/ImageBrushTests.cs b/tests/Avalonia.RenderTests/Media/ImageBrushTests.cs
index 5f0b1f50e6..f4e44a81f0 100644
--- a/tests/Avalonia.RenderTests/Media/ImageBrushTests.cs
+++ b/tests/Avalonia.RenderTests/Media/ImageBrushTests.cs
@@ -28,6 +28,11 @@ namespace Avalonia.Direct2D1.RenderTests.Media
             get { return System.IO.Path.Combine(OutputPath, "github_icon.png"); }
         }
 
+        private string SmallBitmapPath
+        {
+            get { return System.IO.Path.Combine(OutputPath, "github_icon_small.png"); }
+        }
+
         [Fact]
         public void ImageBrush_Tile_Fill()
         {
@@ -76,6 +81,29 @@ namespace Avalonia.Direct2D1.RenderTests.Media
             CompareImages();
         }
 
+        [Fact]
+        public void ImageBrush_Tile_Small_Image()
+        {
+            Decorator target = new Decorator
+            {
+                Width = 200,
+                Height = 200,
+                Child = new Rectangle
+                {
+                    Margin = new Thickness(8),
+                    Fill = new ImageBrush
+                    {
+                        Stretch = Stretch.None,
+                        TileMode = TileMode.Tile,
+                        Source = new Bitmap(SmallBitmapPath),
+                    }
+                }
+            };
+
+            RenderToFile(target);
+            CompareImages();
+        }
+
         [Fact]
         public void ImageBrush_NoStretch_NoTile_Alignment_TopLeft()
         {
diff --git a/tests/TestFiles/Cairo/Media/ImageBrush/ImageBrush_Tile_Small_Image.expected.png b/tests/TestFiles/Cairo/Media/ImageBrush/ImageBrush_Tile_Small_Image.expected.png
new file mode 100644
index 0000000000..669da6ca1a
Binary files /dev/null and b/tests/TestFiles/Cairo/Media/ImageBrush/ImageBrush_Tile_Small_Image.expected.png differ
diff --git a/tests/TestFiles/Cairo/Media/ImageBrush/github_icon_small.png b/tests/TestFiles/Cairo/Media/ImageBrush/github_icon_small.png
new file mode 100644
index 0000000000..5799bdfdce
Binary files /dev/null and b/tests/TestFiles/Cairo/Media/ImageBrush/github_icon_small.png differ
diff --git a/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_Tile_Small_Image.expected.png b/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_Tile_Small_Image.expected.png
new file mode 100644
index 0000000000..669da6ca1a
Binary files /dev/null and b/tests/TestFiles/Direct2D1/Media/ImageBrush/ImageBrush_Tile_Small_Image.expected.png differ
diff --git a/tests/TestFiles/Direct2D1/Media/ImageBrush/github_icon_small.png b/tests/TestFiles/Direct2D1/Media/ImageBrush/github_icon_small.png
new file mode 100644
index 0000000000..5799bdfdce
Binary files /dev/null and b/tests/TestFiles/Direct2D1/Media/ImageBrush/github_icon_small.png differ
diff --git a/tests/TestFiles/Skia/Media/ImageBrush/ImageBrush_Tile_Small_Image.expected.png b/tests/TestFiles/Skia/Media/ImageBrush/ImageBrush_Tile_Small_Image.expected.png
new file mode 100644
index 0000000000..669da6ca1a
Binary files /dev/null and b/tests/TestFiles/Skia/Media/ImageBrush/ImageBrush_Tile_Small_Image.expected.png differ
diff --git a/tests/TestFiles/Skia/Media/ImageBrush/github_icon_small.png b/tests/TestFiles/Skia/Media/ImageBrush/github_icon_small.png
new file mode 100644
index 0000000000..5799bdfdce
Binary files /dev/null and b/tests/TestFiles/Skia/Media/ImageBrush/github_icon_small.png differ