diff --git a/tests/Avalonia.RenderTests/Media/CombinedGeometryTests.cs b/tests/Avalonia.RenderTests/Media/CombinedGeometryTests.cs
index 0469dec651..d927b96dd0 100644
--- a/tests/Avalonia.RenderTests/Media/CombinedGeometryTests.cs
+++ b/tests/Avalonia.RenderTests/Media/CombinedGeometryTests.cs
@@ -48,7 +48,7 @@ namespace Avalonia.Direct2D1.RenderTests.Media
                 }
             };
 
-            var testName = $"GeometryCombineMode_{mode}";
+            var testName = $"{nameof(GeometryCombineMode)}_{mode}";
             await RenderToFile(target, testName);
             CompareImages(testName);
         }
diff --git a/tests/Avalonia.RenderTests/Media/GeometryGroupTests.cs b/tests/Avalonia.RenderTests/Media/GeometryGroupTests.cs
index 6201c2c55e..f90a441d41 100644
--- a/tests/Avalonia.RenderTests/Media/GeometryGroupTests.cs
+++ b/tests/Avalonia.RenderTests/Media/GeometryGroupTests.cs
@@ -19,8 +19,10 @@ namespace Avalonia.Direct2D1.RenderTests.Media
         {
         }
 
-        [Fact]
-        public async Task FillRule_EvenOdd()
+        [Theory]
+        [InlineData(FillRule.EvenOdd)]
+        [InlineData(FillRule.NonZero)]
+        public async Task FillRule_Stroke(FillRule fillRule)
         {
             var target = new Border
             {
@@ -31,105 +33,7 @@ namespace Avalonia.Direct2D1.RenderTests.Media
                 {
                     Data = new GeometryGroup
                     {
-                        FillRule = FillRule.EvenOdd,
-                        Children =
-                        {
-                            new RectangleGeometry(new Rect(25, 25, 100, 100)),
-                            new EllipseGeometry
-                            {
-                                Center = new Point(125, 125),
-                                RadiusX = 50,
-                                RadiusY = 50,
-                            },
-                        }
-                    },
-                    Fill = Brushes.Blue,
-                }
-            };
-
-            await RenderToFile(target);
-            CompareImages();
-        }
-
-        [Fact]
-        public async Task FillRule_NonZero()
-        {
-            var target = new Border
-            {
-                Width = 200,
-                Height = 200,
-                Background = Brushes.White,
-                Child = new Path
-                {
-                    Data = new GeometryGroup
-                    {
-                        FillRule = FillRule.NonZero,
-                        Children =
-                        {
-                            new RectangleGeometry(new Rect(25, 25, 100, 100)),
-                            new EllipseGeometry
-                            {
-                                Center = new Point(125, 125),
-                                RadiusX = 50,
-                                RadiusY = 50,
-                            },
-                        }
-                    },
-                    Fill = Brushes.Blue,
-                }
-            };
-
-            await RenderToFile(target);
-            CompareImages();
-        }
-
-        [Fact]
-        public async Task FillRule_EvenOdd_Stroke()
-        {
-            var target = new Border
-            {
-                Width = 200,
-                Height = 200,
-                Background = Brushes.White,
-                Child = new Path
-                {
-                    Data = new GeometryGroup
-                    {
-                        FillRule = FillRule.EvenOdd,
-                        Children =
-                        {
-                            new RectangleGeometry(new Rect(25, 25, 100, 100)),
-                            new EllipseGeometry
-                            {
-                                Center = new Point(125, 125),
-                                RadiusX = 50,
-                                RadiusY = 50,
-                            },
-                        }
-                    },
-                    Fill = Brushes.Blue,
-                    Stroke = Brushes.Red,
-                    StrokeThickness = 1,
-                }
-            };
-
-            await RenderToFile(target);
-            CompareImages();
-        }
-
-        [Fact]
-        public async Task FillRule_NonZero_Stroke()
-        {
-            var target = new Border
-            {
-                Width = 200,
-                Height = 200,
-                Background = Brushes.White,
-                Child = new Path
-                {
-                    Data = new GeometryGroup
-                    {
-                        FillRule = FillRule.NonZero,
+                        FillRule = fillRule,
                         Children =
                         {
                             new RectangleGeometry(new Rect(25, 25, 100, 100)),
@@ -147,8 +51,9 @@ namespace Avalonia.Direct2D1.RenderTests.Media
                 }
             };
 
-            await RenderToFile(target);
-            CompareImages();
+            var testName = $"{nameof(FillRule_Stroke)}_{fillRule}";
+            await RenderToFile(target, testName);
+            CompareImages(testName);
         }
     }
 }
diff --git a/tests/TestFiles/Direct2D1/Media/GeometryGroup/FillRule_EvenOdd.expected.png b/tests/TestFiles/Direct2D1/Media/GeometryGroup/FillRule_EvenOdd.expected.png
deleted file mode 100644
index ad8eb36158..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/GeometryGroup/FillRule_EvenOdd.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/GeometryGroup/FillRule_NonZero.expected.png b/tests/TestFiles/Direct2D1/Media/GeometryGroup/FillRule_NonZero.expected.png
deleted file mode 100644
index bf1f49c36c..0000000000
Binary files a/tests/TestFiles/Direct2D1/Media/GeometryGroup/FillRule_NonZero.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Direct2D1/Media/GeometryGroup/FillRule_EvenOdd_Stroke.expected.png b/tests/TestFiles/Direct2D1/Media/GeometryGroup/FillRule_Stroke_EvenOdd.expected.png
similarity index 100%
rename from tests/TestFiles/Direct2D1/Media/GeometryGroup/FillRule_EvenOdd_Stroke.expected.png
rename to tests/TestFiles/Direct2D1/Media/GeometryGroup/FillRule_Stroke_EvenOdd.expected.png
diff --git a/tests/TestFiles/Direct2D1/Media/GeometryGroup/FillRule_NonZero_Stroke.expected.png b/tests/TestFiles/Direct2D1/Media/GeometryGroup/FillRule_Stroke_NonZero.expected.png
similarity index 100%
rename from tests/TestFiles/Direct2D1/Media/GeometryGroup/FillRule_NonZero_Stroke.expected.png
rename to tests/TestFiles/Direct2D1/Media/GeometryGroup/FillRule_Stroke_NonZero.expected.png
diff --git a/tests/TestFiles/Skia/Media/GeometryGroup/FillRule_EvenOdd.expected.png b/tests/TestFiles/Skia/Media/GeometryGroup/FillRule_EvenOdd.expected.png
deleted file mode 100644
index 23e326f66a..0000000000
Binary files a/tests/TestFiles/Skia/Media/GeometryGroup/FillRule_EvenOdd.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Skia/Media/GeometryGroup/FillRule_NonZero.expected.png b/tests/TestFiles/Skia/Media/GeometryGroup/FillRule_NonZero.expected.png
deleted file mode 100644
index 8e156e7d06..0000000000
Binary files a/tests/TestFiles/Skia/Media/GeometryGroup/FillRule_NonZero.expected.png and /dev/null differ
diff --git a/tests/TestFiles/Skia/Media/GeometryGroup/FillRule_EvenOdd_Stroke.expected.png b/tests/TestFiles/Skia/Media/GeometryGroup/FillRule_Stroke_EvenOdd.expected.png
similarity index 100%
rename from tests/TestFiles/Skia/Media/GeometryGroup/FillRule_EvenOdd_Stroke.expected.png
rename to tests/TestFiles/Skia/Media/GeometryGroup/FillRule_Stroke_EvenOdd.expected.png
diff --git a/tests/TestFiles/Skia/Media/GeometryGroup/FillRule_NonZero_Stroke.expected.png b/tests/TestFiles/Skia/Media/GeometryGroup/FillRule_Stroke_NonZero.expected.png
similarity index 100%
rename from tests/TestFiles/Skia/Media/GeometryGroup/FillRule_NonZero_Stroke.expected.png
rename to tests/TestFiles/Skia/Media/GeometryGroup/FillRule_Stroke_NonZero.expected.png