diff --git a/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs b/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs
index a9b43a0d64..3ca70f96cc 100644
--- a/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs
@@ -721,45 +721,32 @@ namespace Avalonia.Controls.UnitTests
             target.SelectedItem = item;
             Assert.True(called);
         }
-        
+
         [Fact]
         public void SelectedItem_Should_Be_Valid_When_SelectedItemChanged_Event_Raised()
         {
-            using (Application())
-            {
-                var tree = CreateTestTreeData();
-                var target = new TreeView
-                {
-                    Template = CreateTreeViewTemplate(),
-                    ItemsSource = tree,
-                };
-
-                var visualRoot = new TestRoot();
-                visualRoot.Child = target;
+            using var app = Start();
+            var data = CreateTestTreeData();
+            var target = CreateTarget(data: data);
 
-                CreateNodeDataTemplate(target);
-                ApplyTemplates(target);
-                ExpandAll(target);
+            var item = data[0].Children[1].Children[0];
+            var container = Assert.IsType<TreeViewItem>(target.TreeContainerFromItem(item));
 
-                var item = tree[0].Children[1].Children[0];
-                var container = (TreeViewItem)target.TreeContainerFromItem(item);
+            Assert.NotNull(container);
 
-                Assert.NotNull(container);
-                
-                var called = false;
-                target.SelectionChanged += (s, e) =>
-                {
-                    Assert.Same(item, e.AddedItems[0]);
-                    Assert.Same(item, target.SelectedItem);
-                    called = true;
-                };
+            var called = false;
+            target.SelectionChanged += (s, e) =>
+            {
+                Assert.Same(item, e.AddedItems[0]);
+                Assert.Same(item, target.SelectedItem);
+                called = true;
+            };
 
-                _mouse.Click(container);
+            _mouse.Click(container);
 
-                Assert.Equal(item, target.SelectedItem);
-                Assert.True(container.IsSelected);
-                Assert.True(called);
-            }
+            Assert.Equal(item, target.SelectedItem);
+            Assert.True(container.IsSelected);
+            Assert.True(called);
         }
 
         [Fact]
@@ -796,7 +783,7 @@ namespace Avalonia.Controls.UnitTests
             using var app = Start();
             var data = CreateTestTreeData();
             var target = CreateTarget(data: data, expandAll: false);
-            
+
             target.SelectedItem = data[0].Children[1];
 
             var rootItem = Assert.IsType<TreeViewItem>(target.ContainerFromIndex(0));