diff --git a/src/Avalonia.Controls/Window.cs b/src/Avalonia.Controls/Window.cs
index 6554237b3a..0c37858223 100644
--- a/src/Avalonia.Controls/Window.cs
+++ b/src/Avalonia.Controls/Window.cs
@@ -529,7 +529,7 @@ namespace Avalonia.Controls
         {
             var sizeToContent = SizeToContent;
             var clientSize = ClientSize;
-            var constraint = availableSize;
+            Size constraint = clientSize;
 
             if ((sizeToContent & SizeToContent.Width) != 0)
             {
diff --git a/tests/Avalonia.Controls.UnitTests/WindowTests.cs b/tests/Avalonia.Controls.UnitTests/WindowTests.cs
index 81699b075c..0508edd92f 100644
--- a/tests/Avalonia.Controls.UnitTests/WindowTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/WindowTests.cs
@@ -341,62 +341,11 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
-        [Fact]
-        public void Child_Should_Be_Measured_With_Width_And_Height_If_SizeToContent_Is_Manual()
-        {
-            using (UnitTestApplication.Start(TestServices.StyledWindow))
-            {
-                var child = new ChildControl();
-                var target = new Window 
-                { 
-                    Width = 100,
-                    Height = 50,
-                    SizeToContent = SizeToContent.Manual,
-                    Content = child 
-                };
-
-                target.Show();
-
-                Assert.Equal(new Size(100, 50), child.MeasureSize);
-            }
-        }
-
-        [Fact]
-        public void Child_Should_Be_Measured_With_Infinity_If_SizeToContent_Is_WidthAndHeight()
-        {
-            using (UnitTestApplication.Start(TestServices.StyledWindow))
-            {
-                var child = new ChildControl();
-                var target = new Window
-                {
-                    Width = 100,
-                    Height = 50,
-                    SizeToContent = SizeToContent.WidthAndHeight,
-                    Content = child
-                };
-
-                target.Show();
-
-                Assert.Equal(Size.Infinity, child.MeasureSize);
-            }
-        }
-
         private IWindowImpl CreateImpl(Mock<IRenderer> renderer)
         {
             return Mock.Of<IWindowImpl>(x =>
                 x.Scaling == 1 &&
                 x.CreateRenderer(It.IsAny<IRenderRoot>()) == renderer.Object);
         }
-
-        private class ChildControl : Control
-        {
-            public Size MeasureSize { get; private set; }
-
-            protected override Size MeasureOverride(Size availableSize)
-            {
-                MeasureSize = availableSize;
-                return base.MeasureOverride(availableSize);
-            }
-        }
     }
 }