diff --git a/src/Avalonia.Controls/Shapes/Shape.cs b/src/Avalonia.Controls/Shapes/Shape.cs
index 688d507c8e..427749263a 100644
--- a/src/Avalonia.Controls/Shapes/Shape.cs
+++ b/src/Avalonia.Controls/Shapes/Shape.cs
@@ -64,7 +64,7 @@ namespace Avalonia.Controls.Shapes
                     if (DefiningGeometry != null)
                     {
                         _renderedGeometry = DefiningGeometry.Clone();
-                        ////_renderedGeometry.Transform = new MatrixTransform(_transform);
+                        _renderedGeometry.Transform = new MatrixTransform(_transform);
                     }
                 }
 
diff --git a/tests/Avalonia.Visuals.UnitTests/VisualTree/MockRenderInterface.cs b/tests/Avalonia.Visuals.UnitTests/VisualTree/MockRenderInterface.cs
index ee85867f7d..5f033f4c53 100644
--- a/tests/Avalonia.Visuals.UnitTests/VisualTree/MockRenderInterface.cs
+++ b/tests/Avalonia.Visuals.UnitTests/VisualTree/MockRenderInterface.cs
@@ -51,18 +51,7 @@ namespace Avalonia.Visuals.UnitTests.VisualTree
 
             public Rect Bounds => _impl.CalculateBounds();
 
-            public Matrix Transform
-            {
-                get
-                {
-                    throw new NotImplementedException();
-                }
-
-                set
-                {
-                    throw new NotImplementedException();
-                }
-            }
+            public Matrix Transform { get; set; }
 
             public IStreamGeometryImpl Clone()
             {