diff --git a/tests/Avalonia.RenderTests/Controls/CustomRenderTests.cs b/tests/Avalonia.RenderTests/Controls/CustomRenderTests.cs
index 8002b572bd..14f5b7c6c7 100644
--- a/tests/Avalonia.RenderTests/Controls/CustomRenderTests.cs
+++ b/tests/Avalonia.RenderTests/Controls/CustomRenderTests.cs
@@ -78,6 +78,54 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
             CompareImages();
         }
 
+        [Fact]
+        public async Task GeometryClip_With_Transform()
+        {
+            var target = new Border
+            {
+                Background = Brushes.White,
+                Width = 200,
+                Height = 200,
+                Child = new CustomRenderer((control, context) =>
+                {
+                    using (var transform = context.PushPreTransform(Matrix.CreateTranslation(100, 100)))
+                    using (var clip = context.PushClip(new Rect(0, 0, 100, 100)))
+                    {
+                        context.FillRectangle(Brushes.Blue, new Rect(0, 0, 200, 200));
+                    }
+
+                    context.FillRectangle(Brushes.Red, new Rect(0, 0, 100, 100));
+                }),
+            };
+
+            await RenderToFile(target);
+            CompareImages();
+        }
+
+        [Fact]
+        public async Task Clip_With_Transform()
+        {
+            var target = new Border
+            {
+                Background = Brushes.White,
+                Width = 200,
+                Height = 200,
+                Child = new CustomRenderer((control, context) =>
+                {
+                    using (var transform = context.PushPreTransform(Matrix.CreateTranslation(100, 100)))
+                    using (var clip = context.PushClip(new Rect(0, 0, 100, 100)))
+                    {
+                        context.FillRectangle(Brushes.Blue, new Rect(0, 0, 200, 200));
+                    }
+
+                    context.FillRectangle(Brushes.Red, new Rect(0, 0, 100, 100));
+                }),
+            };
+
+            await RenderToFile(target);
+            CompareImages();
+        }
+
         [Fact]
         public async Task Opacity()
         {
diff --git a/tests/TestFiles/Skia/Controls/CustomRender/Clip_With_Transform.expected.png b/tests/TestFiles/Skia/Controls/CustomRender/Clip_With_Transform.expected.png
new file mode 100644
index 0000000000..7c0bfa6fdc
Binary files /dev/null and b/tests/TestFiles/Skia/Controls/CustomRender/Clip_With_Transform.expected.png differ
diff --git a/tests/TestFiles/Skia/Controls/CustomRender/GeometryClip_With_Transform.expected.png b/tests/TestFiles/Skia/Controls/CustomRender/GeometryClip_With_Transform.expected.png
new file mode 100644
index 0000000000..7c0bfa6fdc
Binary files /dev/null and b/tests/TestFiles/Skia/Controls/CustomRender/GeometryClip_With_Transform.expected.png differ