diff --git a/tests/Avalonia.RenderTests/Controls/TextBlockTests.cs b/tests/Avalonia.RenderTests/Controls/TextBlockTests.cs
index ab769e4ff0..53a2959848 100644
--- a/tests/Avalonia.RenderTests/Controls/TextBlockTests.cs
+++ b/tests/Avalonia.RenderTests/Controls/TextBlockTests.cs
@@ -40,5 +40,59 @@ namespace Avalonia.Direct2D1.RenderTests.Controls
             await RenderToFile(target);
             CompareImages();
         }
+
+
+        [Win32Fact("Has text")]
+        public async Task RestrictedHeight_VerticalAlign()
+        {
+            IControl text(VerticalAlignment verticalAlingnment, bool clip = true, bool restrictHeight = true)
+            {
+                return new Border()
+                {
+                    BorderBrush = Brushes.Blue,
+                    BorderThickness = new Thickness(1),
+                    VerticalAlignment = VerticalAlignment.Center,
+                    HorizontalAlignment = HorizontalAlignment.Center,
+                    Height = restrictHeight ? 20 : double.NaN,
+                    Margin = new Thickness(1),
+                    Child = new TextBlock
+                    {
+                        FontFamily = new FontFamily("Courier New"),
+                        Background = Brushes.Red,
+                        FontSize = 24,
+                        Foreground = Brushes.Black,
+                        Text = "L",
+                        VerticalAlignment = verticalAlingnment,
+                        ClipToBounds = clip
+                    }
+                };
+            }
+            Decorator target = new Decorator
+            {
+                Padding = new Thickness(8),
+                Width = 180,
+                Height = 80,
+
+                Child = new StackPanel()
+                {
+                    Orientation = Orientation.Horizontal,
+                    Children =
+                    {
+                        text(VerticalAlignment.Stretch, restrictHeight: false),
+                        text(VerticalAlignment.Center),
+                        text(VerticalAlignment.Stretch),
+                        text(VerticalAlignment.Top),
+                        text(VerticalAlignment.Bottom),
+                        text(VerticalAlignment.Center, clip:false),
+                        text(VerticalAlignment.Stretch, clip:false),
+                        text(VerticalAlignment.Top, clip:false),
+                        text(VerticalAlignment.Bottom, clip:false),
+                    }
+                }
+            };
+
+            await RenderToFile(target);
+            CompareImages();
+        }
     }
 }
diff --git a/tests/TestFiles/Direct2D1/Controls/TextBlock/RestrictedHeight_VerticalAlign.expected.png b/tests/TestFiles/Direct2D1/Controls/TextBlock/RestrictedHeight_VerticalAlign.expected.png
new file mode 100644
index 0000000000..c5a0a14e52
Binary files /dev/null and b/tests/TestFiles/Direct2D1/Controls/TextBlock/RestrictedHeight_VerticalAlign.expected.png differ
diff --git a/tests/TestFiles/Skia/Controls/TextBlock/RestrictedHeight_VerticalAlign.expected.png b/tests/TestFiles/Skia/Controls/TextBlock/RestrictedHeight_VerticalAlign.expected.png
new file mode 100644
index 0000000000..c5a0a14e52
Binary files /dev/null and b/tests/TestFiles/Skia/Controls/TextBlock/RestrictedHeight_VerticalAlign.expected.png differ