diff --git a/tests/Avalonia.Controls.UnitTests/WindowBaseTests.cs b/tests/Avalonia.Controls.UnitTests/WindowBaseTests.cs
index 51a4d21392..6d00409ae0 100644
--- a/tests/Avalonia.Controls.UnitTests/WindowBaseTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/WindowBaseTests.cs
@@ -199,6 +199,22 @@ namespace Avalonia.Controls.UnitTests
             }
         }
 
+        [Fact]
+        public void Showing_Should_Raise_Opened()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var target = new TestWindowBase();
+                var raised = false;
+
+                target.Opened += (s, e) => raised = true;
+
+                target.Show();
+
+                Assert.True(raised);
+            }
+        }
+
         [Fact]
         public void Hiding_Should_Stop_Renderer()
         {
diff --git a/tests/Avalonia.Controls.UnitTests/WindowTests.cs b/tests/Avalonia.Controls.UnitTests/WindowTests.cs
index c0b5342934..8221dadc86 100644
--- a/tests/Avalonia.Controls.UnitTests/WindowTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/WindowTests.cs
@@ -228,18 +228,35 @@ namespace Avalonia.Controls.UnitTests
         [Fact]
         public void ShowDialog_Should_Start_Renderer()
         {
-
             using (UnitTestApplication.Start(TestServices.StyledWindow))
             {
+                var parent = Mock.Of<IWindowImpl>();
                 var renderer = new Mock<IRenderer>();
                 var target = new Window(CreateImpl(renderer));
 
-                target.Show();
+                target.ShowDialog<object>(parent);
 
                 renderer.Verify(x => x.Start(), Times.Once);
             }
         }
 
+        [Fact]
+        public void ShowDialog_Should_Raise_Opened()
+        {
+            using (UnitTestApplication.Start(TestServices.StyledWindow))
+            {
+                var parent = Mock.Of<IWindowImpl>();
+                var target = new Window();
+                var raised = false;
+
+                target.Opened += (s, e) => raised = true;
+
+                target.ShowDialog<object>(parent);
+
+                Assert.True(raised);
+            }
+        }
+
         [Fact]
         public void Hiding_Should_Stop_Renderer()
         {