diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43161.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43161.cs
index 7218c4e1ff9..c651cc0afd0 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43161.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43161.cs
@@ -56,7 +56,7 @@ protected override void Init()
 			Content = new StackLayout { Children = { label, listView, listView2, listView3 } };
 		}
 
-#if (UITEST && __IOS__)
+#if UITEST && __IOS__
 		[Test]
 		public void Bugzilla43161Test()
 		{
@@ -66,4 +66,4 @@ public void Bugzilla43161Test()
 		}
 #endif
 	}
-}
+}
\ No newline at end of file
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue12685.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue12685.cs
index 956160f9d2f..8d0d621f2cc 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue12685.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue12685.cs
@@ -1,7 +1,4 @@
-using System;
-using System.ComponentModel;
-using System.Windows.Input;
-using Xamarin.Forms.CustomAttributes;
+using Xamarin.Forms.CustomAttributes;
 using Xamarin.Forms.Internals;
 using Xamarin.Forms.Shapes;
 
@@ -21,6 +18,9 @@ namespace Xamarin.Forms.Controls.Issues
 #endif
 	public partial class Issue12685 : TestContentPage
 	{
+		const string StatusLabelId = "StatusLabelId";
+		const string PathId = "PathId";
+
 		const string ResetStatus = "Path touch event not fired, touch path above.";
 		const string ClickedStatus = "Path was clicked, click reset button to start over.";
 
@@ -29,7 +29,7 @@ protected override void Init()
 			var layout = new StackLayout();
 			var statusLabel = new Label
 			{
-				AutomationId = "LabelValue",
+				AutomationId = StatusLabelId,
 				Text = ResetStatus,
 			};
 
@@ -42,6 +42,7 @@ protected override void Init()
 
 			var path = new Path
 			{
+				AutomationId = PathId,
 				Data = pathGeometry,
 				Fill = lgb
 			};
@@ -69,11 +70,12 @@ protected override void Init()
 		[Test]
 		public void ShapesPathReceiveGestureRecognizers()
 		{
-			var testLabel = RunningApp.WaitForFirstElement("LabelValue");
+			var testLabel = RunningApp.WaitForFirstElement(StatusLabelId);
 			Assert.AreEqual(ResetStatus, testLabel.ReadText());
-			var pathRect = testLabel.Rect;
-			RunningApp.TapCoordinates(pathRect.X + 100, pathRect.Y-100);
-			Assert.AreEqual(ClickedStatus, RunningApp.WaitForFirstElement("LabelValue").ReadText());
+			var testPath = RunningApp.WaitForFirstElement(PathId);
+			var pathRect = testPath.Rect;
+			RunningApp.TapCoordinates(pathRect.X + 1, pathRect.Y + 1);
+			Assert.AreEqual(ClickedStatus, RunningApp.WaitForFirstElement(StatusLabelId).ReadText());
 		}
 #endif
 	}