diff --git a/Uno.Gallery/Uno.Gallery.Shared/Views/SamplePages/ToggleSwitchSamplePage.xaml b/Uno.Gallery/Uno.Gallery.Shared/Views/SamplePages/ToggleSwitchSamplePage.xaml
index 8438c5012..c429371d6 100644
--- a/Uno.Gallery/Uno.Gallery.Shared/Views/SamplePages/ToggleSwitchSamplePage.xaml
+++ b/Uno.Gallery/Uno.Gallery.Shared/Views/SamplePages/ToggleSwitchSamplePage.xaml
@@ -18,14 +18,18 @@
 						<StackPanel Spacing="20">
 
 							<ToggleSwitch Header="OFF"
+										  AutomationProperties.AutomationId="fluent_Off"
 										  Foreground="{ThemeResource OnBackgroundBrush}" />
 							<ToggleSwitch Header="ON"
+										  AutomationProperties.AutomationId="fluent_On"
 										  Foreground="{ThemeResource OnBackgroundBrush}"
 										  IsOn="True" />
 
 							<ToggleSwitch Header="DISABLED OFF"
+										  AutomationProperties.AutomationId="fluent_Disabled_Off"
 										  IsEnabled="False" />
 							<ToggleSwitch Header="DISABLED ON"
+										  AutomationProperties.AutomationId="fluent_Disabled_On"
 										  IsEnabled="False"
 										  IsOn="True" />
 						</StackPanel>
diff --git a/Uno.Gallery/Uno.Gallery.UITest/Given_ToggleSwitch_Fluent.cs b/Uno.Gallery/Uno.Gallery.UITest/Given_ToggleSwitch_Fluent.cs
new file mode 100644
index 000000000..2d737586f
--- /dev/null
+++ b/Uno.Gallery/Uno.Gallery.UITest/Given_ToggleSwitch_Fluent.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using NUnit.Framework;
+using Uno.UITest.Helpers.Queries;
+using Uno.UITests.Helpers;
+
+namespace Uno.Gallery.UITests
+{
+
+	public class Given_ToggleSwitch_Fluent : TestBase
+	{
+
+		[Test]
+		public void WhenToggleSwitchOff()
+		{
+			NavigateToSample("ToggleSwitch", "Fluent");
+
+			TakeScreenshot("Before On");
+			var offToggleSwitch = new QueryEx(x => x.All().Marked("fluent_Off"));
+			App.ScrollDownTo("fluent_Off");
+			offToggleSwitch.Tap();
+			TakeScreenshot("After On");
+			Assert.IsTrue(offToggleSwitch.GetDependencyPropertyValue<bool>("IsOn"));
+
+
+
+
+
+		}
+
+	}
+}