diff --git a/samples/IntegrationTestApp/MainWindow.axaml b/samples/IntegrationTestApp/MainWindow.axaml
index 801ff765c8..54c0cb0655 100644
--- a/samples/IntegrationTestApp/MainWindow.axaml
+++ b/samples/IntegrationTestApp/MainWindow.axaml
@@ -24,7 +24,7 @@
     <NativeMenuBar DockPanel.Dock="Top"/>
     <StackPanel DockPanel.Dock="Bottom" Margin="4" Orientation="Horizontal">
       <TextBlock Margin="0,0,4,0">WindowState:</TextBlock>
-      <TextBlock Name="WindowState" Text="{Binding WindowState}"/>
+      <TextBlock Name="MainWindowState" Text="{Binding WindowState}"/>
     </StackPanel>
     
     <TabControl TabStripPlacement="Left" Name="MainTabs">
@@ -133,10 +133,10 @@
             <ComboBoxItem>CenterOwner</ComboBoxItem>
           </ComboBox>
           <ComboBox Name="ShowWindowState" SelectedIndex="0">
-            <ComboBoxItem>Normal</ComboBoxItem>
-            <ComboBoxItem>Minimized</ComboBoxItem>
-            <ComboBoxItem>Maximized</ComboBoxItem>
-            <ComboBoxItem>FullScreen</ComboBoxItem>
+            <ComboBoxItem Name="ShowWindowStateNormal">Normal</ComboBoxItem>
+            <ComboBoxItem Name="ShowWindowStateMinimized">Minimized</ComboBoxItem>
+            <ComboBoxItem Name="ShowWindowStateMaximized">Maximized</ComboBoxItem>
+            <ComboBoxItem Name="ShowWindowStateFullScreen">FullScreen</ComboBoxItem>
           </ComboBox>
           <Button Name="ShowWindow">Show Window</Button>
           <Button Name="SendToBack">Send to Back</Button>
diff --git a/samples/IntegrationTestApp/ShowWindowTest.axaml b/samples/IntegrationTestApp/ShowWindowTest.axaml
index c3a0d8d2e2..00987429d0 100644
--- a/samples/IntegrationTestApp/ShowWindowTest.axaml
+++ b/samples/IntegrationTestApp/ShowWindowTest.axaml
@@ -27,10 +27,10 @@
     
     <Label Grid.Column="0" Grid.Row="7">WindowState</Label>
     <ComboBox Name="WindowState" Grid.Column="1" Grid.Row="7" SelectedIndex="{Binding WindowState}">
-      <ComboBoxItem>Normal</ComboBoxItem>
-      <ComboBoxItem>Minimized</ComboBoxItem>
-      <ComboBoxItem>Maximized</ComboBoxItem>
-      <ComboBoxItem>FullScreen</ComboBoxItem>
+      <ComboBoxItem Name="WindowStateNormal">Normal</ComboBoxItem>
+      <ComboBoxItem Name="WindowStateMinimized">Minimized</ComboBoxItem>
+      <ComboBoxItem Name="WindowStateMaximized">Maximized</ComboBoxItem>
+      <ComboBoxItem Name="WindowStateFullScreen">FullScreen</ComboBoxItem>
     </ComboBox>
 
     <Label Grid.Column="0" Grid.Row="8">Order (mac)</Label>
diff --git a/tests/Avalonia.IntegrationTests.Appium/WindowTests.cs b/tests/Avalonia.IntegrationTests.Appium/WindowTests.cs
index b6ac75b78e..4d833cdb1f 100644
--- a/tests/Avalonia.IntegrationTests.Appium/WindowTests.cs
+++ b/tests/Avalonia.IntegrationTests.Appium/WindowTests.cs
@@ -90,7 +90,7 @@ namespace Avalonia.IntegrationTests.Appium
                     try
                     {
                         _session.FindElementByAccessibilityId("WindowState").SendClick();
-                        _session.FindElementByName("Normal").SendClick();
+                        _session.FindElementByAccessibilityId("WindowStateNormal").SendClick();
 
                         // Wait for animations to run.
                         if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
@@ -155,11 +155,11 @@ namespace Avalonia.IntegrationTests.Appium
             Assert.Equal("Normal", windowState.GetComboBoxValue());
 
             windowState.Click();
-            _session.FindElementByName("Maximized").SendClick();
+            _session.FindElementByAccessibilityId("WindowStateMaximized").SendClick();
             Assert.Equal("Maximized", windowState.GetComboBoxValue());
 
             windowState.Click();
-            _session.FindElementByName("Normal").SendClick();
+            _session.FindElementByAccessibilityId("WindowStateNormal").SendClick();
 
             var current = GetWindowInfo();
             Assert.Equal(original.Position, current.Position);
@@ -169,7 +169,7 @@ namespace Avalonia.IntegrationTests.Appium
             if (!RuntimeInformation.IsOSPlatform(OSPlatform.OSX) || mode == ShowWindowMode.NonOwned)
             {
                 windowState.Click();
-                _session.FindElementByName("FullScreen").SendClick();
+                _session.FindElementByAccessibilityId("WindowStateFullScreen").SendClick();
                 Assert.Equal("FullScreen", windowState.GetComboBoxValue());
 
                 current = GetWindowInfo();
@@ -179,7 +179,7 @@ namespace Avalonia.IntegrationTests.Appium
 
                 windowState.SendClick();
                 
-                _session.FindElementByName("Normal").SendClick();
+                _session.FindElementByAccessibilityId("WindowStateNormal").SendClick();
 
                 current = GetWindowInfo();
                 Assert.Equal(original.Position, current.Position);
@@ -223,13 +223,13 @@ namespace Avalonia.IntegrationTests.Appium
                         // Not sure how to handle testing minimized windows currently.
                         if (state == Controls.WindowState.Minimized)
                             continue;
-                        
+
                         // Child/Modal windows cannot be fullscreen on macOS.
                         if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) &&
                             state == Controls.WindowState.FullScreen &&
                             mode != ShowWindowMode.NonOwned)
                             continue;
-                        
+
                         data.Add(size, mode, state);
                     }
                 }
@@ -286,7 +286,7 @@ namespace Avalonia.IntegrationTests.Appium
             _session.FindElementByName(location.ToString()).SendClick();
 
             stateComboBox.Click();
-            _session.FindElementByName(state.ToString()).SendClick();
+            _session.FindElementByAccessibilityId($"ShowWindowState{state}").SendClick();
 
             return showButton.OpenWindowWithClick();
         }