diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
index 158cc2d42c8d..8f47410c5fb1 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
@@ -526,13 +526,21 @@ public void NavigationManagerUriGetsUpdatedOnEnhancedNavigation_BothServerAndWeb
 
         Browser.Exists(By.TagName("nav")).FindElement(By.LinkText("LocationChanged/LocationChanging event (server-and-wasm)")).Click();
         Browser.Equal("Page with location changed components", () => Browser.Exists(By.TagName("h1")).Text);
-        Assert.EndsWith("/nav/location-changed/server-and-wasm", Browser.Exists(By.Id("nav-uri-server")).Text);
-        Assert.EndsWith("/nav/location-changed/server-and-wasm", Browser.Exists(By.Id("nav-uri-wasm")).Text);
+        Browser.True(() => Browser.Exists(By.Id("nav-uri-server")).Text.EndsWith(
+            "/nav/location-changed/server-and-wasm",
+            StringComparison.Ordinal));
+        Browser.True(() => Browser.Exists(By.Id("nav-uri-wasm")).Text.EndsWith(
+            "/nav/location-changed/server-and-wasm",
+            StringComparison.Ordinal));
 
         Browser.Exists(By.Id($"update-query-string-{runtimeThatInvokedNavigation}")).Click();
 
-        Assert.EndsWith($"/nav/location-changed/server-and-wasm?query=1", Browser.Exists(By.Id($"nav-uri-server")).Text);
-        Assert.EndsWith($"/nav/location-changed/server-and-wasm?query=1", Browser.Exists(By.Id($"nav-uri-wasm")).Text);
+        Browser.True(() => Browser.Exists(By.Id("nav-uri-server")).Text.EndsWith(
+            "/nav/location-changed/server-and-wasm?query=1",
+            StringComparison.Ordinal));
+        Browser.True(() => Browser.Exists(By.Id("nav-uri-wasm")).Text.EndsWith(
+            "/nav/location-changed/server-and-wasm?query=1",
+            StringComparison.Ordinal));
     }
 
     [Theory]