diff --git a/samples/RenderTest/Pages/ClippingPage.xaml b/samples/RenderTest/Pages/ClippingPage.xaml
index 0e352c4bec..47e9d51e3c 100644
--- a/samples/RenderTest/Pages/ClippingPage.xaml
+++ b/samples/RenderTest/Pages/ClippingPage.xaml
@@ -1,13 +1,15 @@
 <UserControl xmlns="https://github.com/avaloniaui">
-  <Grid ColumnDefinitions="Auto,*" RowDefinitions="Auto,*">
-    <Border Background="Yellow"
+  <Grid ColumnDefinitions="Auto" RowDefinitions="Auto,Auto">
+    <Border Name="clipped"
+            Background="Yellow"
             Width="100"
             Height="100"
             Clip="M 58.625 0.07421875 C 50.305778 0.26687364 42.411858 7.0346526 41.806641 15.595703 C 42.446442 22.063923 39.707425 13.710754 36.982422 12.683594 C 29.348395 6.1821635 16.419398 8.4359222 11.480469 17.195312 C 6.0935256 25.476803 9.8118851 37.71125 18.8125 41.6875 C 9.1554771 40.62945 -0.070876925 49.146842 0.21679688 58.857422 C 0.21545578 60.872512 0.56758794 62.88911 1.2617188 64.78125 C 4.3821886 74.16708 16.298268 78.921772 25.03125 74.326172 C 28.266843 72.062552 26.298191 74.214838 25.414062 76.398438 C 21.407348 85.589198 27.295992 97.294293 37.097656 99.501953 C 46.864883 102.3541 57.82177 94.726518 58.539062 84.580078 C 58.142158 79.498998 59.307538 83.392694 61.207031 85.433594 C 67.532324 93.056874 80.440232 93.192029 86.882812 85.630859 C 93.836392 78.456939 92.396838 65.538666 84.115234 60.009766 C 79.783641 57.904836 83.569793 58.802369 86.375 58.193359 C 96.383335 56.457569 102.87506 44.824101 99.083984 35.394531 C 95.963498 26.008711 84.047451 21.254079 75.314453 25.849609 C 72.078834 28.113269 74.047517 25.960974 74.931641 23.777344 C 78.93827 14.586564 73.049722 2.8815081 63.248047 0.67382812 C 61.721916 0.22817968 60.165597 0.038541919 58.625 0.07421875 z ">
-      <Border Name="geometryClipped" Background="{StyleResource ThemeAccentBrush}" Margin="4">
+      <Border Name="clipChild" Background="{StyleResource ThemeAccentBrush}" Margin="4">
         <!-- Setting opacity puts the TextBox on a new layer -->
         <TextBox Text="Avalonia" Opacity="0.9" VerticalAlignment="Center"/>
       </Border>
     </Border>
+    <CheckBox Name="useMask" IsChecked="True" Grid.Row="1">Apply Geometry Clip</CheckBox>
   </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/samples/RenderTest/Pages/ClippingPage.xaml.cs b/samples/RenderTest/Pages/ClippingPage.xaml.cs
index 6c419f245c..b416f12943 100644
--- a/samples/RenderTest/Pages/ClippingPage.xaml.cs
+++ b/samples/RenderTest/Pages/ClippingPage.xaml.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Reactive.Linq;
 using Avalonia;
 using Avalonia.Animation;
@@ -10,10 +11,13 @@ namespace RenderTest.Pages
 {
     public class ClippingPage : UserControl
     {
+        private Geometry _clip;
+
         public ClippingPage()
         {
             InitializeComponent();
             CreateAnimations();
+            WireUpCheckbox();
         }
 
         private void InitializeComponent()
@@ -23,7 +27,7 @@ namespace RenderTest.Pages
 
         private void CreateAnimations()
         {
-            var clipped = this.FindControl<Border>("geometryClipped");
+            var clipped = this.FindControl<Border>("clipChild");
             var degrees = Animate.Timer.Select(x => x.TotalMilliseconds / 5);
             clipped.RenderTransform = new RotateTransform();
             clipped.RenderTransform.Bind(RotateTransform.AngleProperty, degrees, BindingPriority.Animation);
@@ -32,5 +36,13 @@ namespace RenderTest.Pages
                 clipped.GetObservable(Control.IsPointerOverProperty)
                     .Select(x => x ? Brushes.Crimson : AvaloniaProperty.UnsetValue));
         }
+
+        private void WireUpCheckbox()
+        {
+            var useMask = this.FindControl<CheckBox>("useMask");
+            var clipped = this.FindControl<Border>("clipped");
+            _clip = clipped.Clip;
+            useMask.Click += (s, e) => clipped.Clip = clipped.Clip == null ? _clip : null;
+        }
     }
 }