diff --git a/samples/IntegrationTestApp/MainWindow.axaml b/samples/IntegrationTestApp/MainWindow.axaml
index 4db06a2f53..49f597a74d 100644
--- a/samples/IntegrationTestApp/MainWindow.axaml
+++ b/samples/IntegrationTestApp/MainWindow.axaml
@@ -1,98 +1,139 @@
-
-
-
-
+
+
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
- TextBlockWithName
-
- TextBlockWithNameAndAutomationId
-
- Label for TextBox
-
- Foo
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
- Unchecked
- Checked
- ThreeState
-
-
+
+
+
+ TextBlockWithName
+
+ TextBlockWithNameAndAutomationId
+
+ Label for TextBox
+
+ Foo
+
+
+
-
-
-
- Item 0
- Item 1
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
- None
-
-
-
-
+
+
+ Unchecked
+ Checked
+
+ ThreeState
+
+
+
+
+
+
+
+ Item 0
+ Item 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ None
+
+
+
+
diff --git a/tests/Avalonia.IntegrationTests.Appium/ButtonTests.cs b/tests/Avalonia.IntegrationTests.Appium/ButtonTests.cs
index 64cc461cb5..da06195539 100644
--- a/tests/Avalonia.IntegrationTests.Appium/ButtonTests.cs
+++ b/tests/Avalonia.IntegrationTests.Appium/ButtonTests.cs
@@ -1,5 +1,4 @@
-using System.Runtime.InteropServices;
-using OpenQA.Selenium.Appium;
+using OpenQA.Selenium.Appium;
using Xunit;
namespace Avalonia.IntegrationTests.Appium
diff --git a/tests/Avalonia.IntegrationTests.Appium/ContextMenuTests.cs b/tests/Avalonia.IntegrationTests.Appium/ContextMenuTests.cs
new file mode 100644
index 0000000000..addcb5c32f
--- /dev/null
+++ b/tests/Avalonia.IntegrationTests.Appium/ContextMenuTests.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Threading.Tasks;
+using OpenQA.Selenium.Appium;
+using OpenQA.Selenium.Interactions;
+using Xunit;
+
+namespace Avalonia.IntegrationTests.Appium
+{
+ [Collection("Default")]
+ public class ContextMenuTests
+ {
+ private readonly AppiumDriver _session;
+
+ public ContextMenuTests(TestAppFixture fixture)
+ {
+ _session = fixture.Session;
+
+ var tabs = _session.FindElementByAccessibilityId("MainTabs");
+ var tab = tabs.FindElementByName("ContextMenu");
+ tab.Click();
+ }
+
+ [Fact]
+ public void ContextMenu_Click()
+ {
+ var rootMenuItem = _session.FindElementByAccessibilityId("ContextMenuTb");
+ rootMenuItem.Click();
+ new Actions(rootMenuItem.WrappedDriver).ContextClick().Perform();
+ }
+ }
+}