diff --git a/src/Samples/Common/Views/FeatureSamples/Validation/ValidationPropertyPathResolving.dothtml b/src/Samples/Common/Views/FeatureSamples/Validation/ValidationPropertyPathResolving.dothtml
index af8ec4e282..b24a15f626 100644
--- a/src/Samples/Common/Views/FeatureSamples/Validation/ValidationPropertyPathResolving.dothtml
+++ b/src/Samples/Common/Views/FeatureSamples/Validation/ValidationPropertyPathResolving.dothtml
@@ -9,22 +9,23 @@
 </head>
 <body>
     <div data-ui="root">
-        <dot:TextBox Text="{value: Text}" />
+        <label>Text: <dot:TextBox Text="{value: Text}" placeholder="fill in anything" /></label>
         <dot:Validator Value="{value: Text}">*</dot:Validator>
     </div>
 
     <div data-ui="innerProp">
-        <dot:TextBox Text="{value: Data.Text}" />
+        <label> Data.Text: <dot:TextBox Text="{value: Data.Text}" placeholder="validation will always fail" /></label>
         <dot:Validator Value="{value: Data.Text}">*</dot:Validator>
     </div>
 
     <div data-ui="dataContext" DataContext="{value: Data2}">
-        <dot:TextBox Text="{value: Text}" />
+        <label>Data2 / Text: <dot:TextBox Text="{value: Text}" placeholder="in all of these textboxes" /></label>
         <dot:Validator Value="{value: Text}">*</dot:Validator>
     </div>
 
     <dot:Repeater data-ui="repeater" DataSource="{value: Col}">
-        <dot:TextBox Text="{value: Text}" />
+        <SeparatorTemplate> | </SeparatorTemplate>
+        {{value: $"Col[{_index}].Text: "}}<dot:TextBox Text="{value: Text}" placeholder="even here" />
         <dot:Validator Value="{value: Text}">
             *
         </dot:Validator>
diff --git a/src/Samples/Tests/Tests/Feature/ValidationTests.cs b/src/Samples/Tests/Tests/Feature/ValidationTests.cs
index acbe2d52fa..f22fd7254e 100644
--- a/src/Samples/Tests/Tests/Feature/ValidationTests.cs
+++ b/src/Samples/Tests/Tests/Feature/ValidationTests.cs
@@ -808,10 +808,13 @@ public void Feature_Validation_ValidationPaths(string validationPath)
 
                 button.Click();
 
-                var validationPaths = validationPathsList.FindElements("li").Select(t => t.GetInnerText()).ToList();
+                browser.WaitFor(() => {
+
+                    var validationPaths = validationPathsList.FindElements("li").Select(t => t.GetInnerText()).ToList();
 
-                bool hasCorrectValidationPath = validationPaths.Any(t => t == validationPath);
-                Assert.True(hasCorrectValidationPath,"None of the errors has expected validation path.");
+                    bool hasCorrectValidationPath = validationPaths.Any(t => t == validationPath);
+                    Assert.True(hasCorrectValidationPath, $"None of the errors has expected validation path ({validationPath}).");
+                }, timeout: 2_000);
             });
         }
 
