From f2fe4d55a1743fd6147ba1e4deb2f8e989ef53fb Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Tue, 5 Aug 2025 15:48:16 +0200
Subject: [PATCH 01/39] Supress enhanced nav per test.

---
 .../EnhancedNavigationTest.cs                 | 36 +++++++++++++------
 .../EnhancedNavigationTestUtil.cs             | 13 +++++--
 .../RazorComponents/App.razor                 |  4 +--
 .../RazorComponents/Root.razor                |  4 +--
 4 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
index 7dfaf3523287..f68805604514 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
@@ -677,11 +677,10 @@ public void CanUpdateHrefOnLinkTagWithIntegrity()
     }
 
     [Theory]
-    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/60875")]
-    // [InlineData(false, false, false)] // https://github.com/dotnet/aspnetcore/issues/60875
+    [InlineData(false, false, false)]
     [InlineData(false, true, false)]
     [InlineData(true, true, false)]
-    // [InlineData(true, false, false)] // https://github.com/dotnet/aspnetcore/issues/60875
+    [InlineData(true, false, false)]
     // [InlineData(false, false, true)] programmatic navigation doesn't work without enhanced navigation
     [InlineData(false, true, true)]
     [InlineData(true, true, true)]
@@ -692,8 +691,8 @@ public void EnhancedNavigationScrollBehavesSameAsBrowserOnNavigation(bool enable
         // or to the beginning of a fragment, regardless of the previous scroll position
         string landingPageSuffix = enableStreaming ? "" : "-no-streaming";
         string buttonKeyword = programmaticNavigation ? "-programmatic" : "";
-        Navigate($"{ServerPathBase}/nav/scroll-test{landingPageSuffix}");
         EnhancedNavigationTestUtil.SuppressEnhancedNavigation(this, shouldSuppress: !useEnhancedNavigation, skipNavigation: true);
+        Navigate($"{ServerPathBase}/nav/scroll-test{landingPageSuffix}");
 
         // "landing" page: scroll maximally down and go to "next" page - we should land at the top of that page
         AssertWeAreOnLandingPage();
@@ -732,10 +731,10 @@ public void EnhancedNavigationScrollBehavesSameAsBrowserOnNavigation(bool enable
     }
 
     [Theory]
-    // [InlineData(false, false, false)] // https://github.com/dotnet/aspnetcore/issues/60875
+    [InlineData(false, false, false)] // https://github.com/dotnet/aspnetcore/issues/60875
     [InlineData(false, true, false)]
     [InlineData(true, true, false)]
-    // [InlineData(true, false, false)] // https://github.com/dotnet/aspnetcore/issues/60875
+    [InlineData(true, false, false)] // https://github.com/dotnet/aspnetcore/issues/60875
     // [InlineData(false, false, true)] programmatic navigation doesn't work without enhanced navigation
     [InlineData(false, true, true)]
     [InlineData(true, true, true)]
@@ -745,8 +744,8 @@ public void EnhancedNavigationScrollBehavesSameAsBrowserOnBackwardsForwardsActio
         // This test checks if the scroll position is preserved after backwards/forwards action
         string landingPageSuffix = enableStreaming ? "" : "-no-streaming";
         string buttonKeyword = programmaticNavigation ? "-programmatic" : "";
-        Navigate($"{ServerPathBase}/nav/scroll-test{landingPageSuffix}");
         EnhancedNavigationTestUtil.SuppressEnhancedNavigation(this, shouldSuppress: !useEnhancedNavigation, skipNavigation: true);
+        Navigate($"{ServerPathBase}/nav/scroll-test{landingPageSuffix}");
 
         // "landing" page: scroll to pos1, navigate away
         AssertWeAreOnLandingPage();
@@ -831,6 +830,7 @@ private void AssertScrollPositionCorrect(bool useEnhancedNavigation, long previo
     private void AssertEnhancedNavigation(bool useEnhancedNavigation, IWebElement elementForStalenessCheck, int retryCount = 3, int delayBetweenRetriesMs = 1000)
     {
         bool enhancedNavigationDetected = false;
+        string logging = "";
         for (int i = 0; i < retryCount; i++)
         {
             try
@@ -841,15 +841,31 @@ private void AssertEnhancedNavigation(bool useEnhancedNavigation, IWebElement el
             }
             catch (XunitException)
             {
+                var logs = Browser.GetBrowserLogs(LogLevel.Warning);
+                logging += $"{string.Join(", ", logs.Select(l => l.Message))}\n";
+
+                var testId = ((IJavaScriptExecutor)Browser).ExecuteScript("return sessionStorage.getItem('test-id');");
+                logging += $"  testId: {testId}\n";
+                if (testId is null)
+                {
+                    continue;
+                }
+                var suppressKey = $"suppress-enhanced-navigation-{testId}";
+
+                var enhancedNavAttached = ((IJavaScriptExecutor)Browser).ExecuteScript("return sessionStorage.getItem('blazor-enhanced-nav-attached');");
+                var suppressEnhancedNavigation = ((IJavaScriptExecutor)Browser).ExecuteScript($"return sessionStorage.getItem('{suppressKey}');");
+
+                logging += $"  suppressKey: {suppressKey}\n";
+                logging += $"  {suppressKey}: {suppressEnhancedNavigation}\n";
                 // Maybe the check was done too early to change the DOM ref, retry
             }
 
             Thread.Sleep(delayBetweenRetriesMs);
         }
-        string expectedNavigation = useEnhancedNavigation ? "enhanced navigation" : "browser navigation";
+        string expectedNavigation = useEnhancedNavigation ? "enhanced navigation" : "full page load";
         string isStale = enhancedNavigationDetected ? "is not stale" : "is stale";
-        var isNavigationSupressed = (string)((IJavaScriptExecutor)Browser).ExecuteScript("return sessionStorage.getItem('suppress-enhanced-navigation');");
-        throw new Exception($"Expected to use {expectedNavigation} because 'suppress-enhanced-navigation' is set to {isNavigationSupressed} but the element from previous path {isStale}");
+        var isNavigationSuppressed = (string)((IJavaScriptExecutor)Browser).ExecuteScript("return sessionStorage.getItem('suppress-enhanced-navigation');");
+        throw new Exception($"Expected to use {expectedNavigation} because 'suppress-enhanced-navigation' is set to {isNavigationSuppressed} but the element from previous path {isStale}. logging={logging}");
     }
 
     private void AssertWeAreOnLandingPage()
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
index 799b915f8fdd..1c3444f3a030 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
@@ -6,6 +6,7 @@
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.E2ETesting;
 using OpenQA.Selenium;
+using OpenQA.Selenium.BiDi.Communication;
 
 namespace Microsoft.AspNetCore.Components.E2ETests.ServerRenderingTests;
 
@@ -21,12 +22,20 @@ public static void SuppressEnhancedNavigation<TServerFixture>(ServerTestBase<TSe
             if (!skipNavigation)
             {
                 // Normally we need to navigate here first otherwise the browser isn't on the correct origin to access
-                // localStorage. But some tests are already in the right place and need to avoid extra navigation.
+                // sessionStorage. But some tests are already in the right place and need to avoid extra navigation.
                 fixture.Navigate($"{fixture.ServerPathBase}/");
                 browser.Equal("Hello", () => browser.Exists(By.TagName("h1")).Text);
             }
 
-            ((IJavaScriptExecutor)browser).ExecuteScript("sessionStorage.setItem('suppress-enhanced-navigation', 'true')");
+            // Set the suppression flag - this will prevent enhanced navigation from being attached on the next navigation
+            // and trigger detachment of currently attached enhanced navigation via the periodic check
+            var testId = Guid.NewGuid().ToString("N")[..8];
+            ((IJavaScriptExecutor)browser).ExecuteScript($"sessionStorage.setItem('test-id', '{testId}')");
+            ((IJavaScriptExecutor)browser).ExecuteScript($"sessionStorage.setItem('suppress-enhanced-navigation-{testId}', 'true')");
+
+            var suppressEnhancedNavigation = ((IJavaScriptExecutor)browser).ExecuteScript($"return sessionStorage.getItem('suppress-enhanced-navigation-{testId}');");
+            Assert.True(suppressEnhancedNavigation is not null && (string)suppressEnhancedNavigation == "true",
+                "Expected 'suppress-enhanced-navigation' to be set in sessionStorage.");
         }
     }
 
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/App.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/App.razor
index 012dcc5547f8..7b8af1442eea 100644
--- a/src/Components/test/testassets/Components.TestServer/RazorComponents/App.razor
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/App.razor
@@ -137,10 +137,10 @@
             }
 
             const enableClassicInitializers = sessionStorage.getItem('enable-classic-initializers') === 'true';
-            const suppressEnhancedNavigation = sessionStorage.getItem('suppress-enhanced-navigation') === 'true';
+            const testId = sessionStorage.getItem('test-id');
+            const suppressEnhancedNavigation = testId ? sessionStorage.getItem(`suppress-enhanced-navigation-${testId}`) === 'true' : false;
             const blockLoadBootResource = sessionStorage.getItem('block-load-boot-resource') === 'true';
             const blockWebassemblySettings = sessionStorage.getItem('block-webassembly-settings') === 'true';
-            sessionStorage.removeItem('suppress-enhanced-navigation');
             sessionStorage.removeItem('block-load-boot-resource');
             sessionStorage.removeItem('enable-classic-initializers');
             sessionStorage.removeItem('block-webassembly-settings');
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Root.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/Root.razor
index 07a5daa32bde..098813212786 100644
--- a/src/Components/test/testassets/Components.TestServer/RazorComponents/Root.razor
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/Root.razor
@@ -14,7 +14,8 @@
 
     <script src="@Assets["_framework/blazor.web.js"]" autostart="false"></script>
     <script>
-        const suppressEnhancedNavigation = sessionStorage.getItem('suppress-enhanced-navigation') === 'true';
+        const testId = sessionStorage.getItem('test-id');
+        const suppressEnhancedNavigation = testId ? sessionStorage.getItem(`suppress-enhanced-navigation-${testId}`) === 'true' : false;
 
         let pwr = Promise.withResolvers();
         let reconnectPromise = pwr.promise;
@@ -40,7 +41,6 @@
             };
         }
 
-        sessionStorage.removeItem('suppress-enhanced-navigation');
         function callBlazorStart() {
             Blazor.start({
                 ssr: {

From 4576df345576e73d95ee6c78cb1d352b8d63b741 Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Tue, 5 Aug 2025 16:05:29 +0200
Subject: [PATCH 02/39] Each test should have a testId.

---
 .../ServerRenderingTests/EnhancedNavigationTest.cs    | 11 ++++++++---
 .../EnhancedNavigationTestUtil.cs                     |  7 +++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
index f68805604514..a859f388469f 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
@@ -31,7 +31,12 @@ public EnhancedNavigationTest(
     // One of the tests here makes use of the streaming rendering page, which uses global state
     // so we can't run at the same time as other such tests
     public override Task InitializeAsync()
-        => InitializeAsync(BrowserFixture.StreamingContext);
+    {
+        var initTask =  InitializeAsync(BrowserFixture.StreamingContext);
+        var testId = Guid.NewGuid().ToString("N")[..8];
+        ((IJavaScriptExecutor)Browser).ExecuteScript($"sessionStorage.setItem('test-id', '{testId}')");
+        return initTask;
+    }
 
     [Fact]
     public void CanNavigateToAnotherPageWhilePreservingCommonDOMElements()
@@ -731,10 +736,10 @@ public void EnhancedNavigationScrollBehavesSameAsBrowserOnNavigation(bool enable
     }
 
     [Theory]
-    [InlineData(false, false, false)] // https://github.com/dotnet/aspnetcore/issues/60875
+    [InlineData(false, false, false)]
     [InlineData(false, true, false)]
     [InlineData(true, true, false)]
-    [InlineData(true, false, false)] // https://github.com/dotnet/aspnetcore/issues/60875
+    [InlineData(true, false, false)]
     // [InlineData(false, false, true)] programmatic navigation doesn't work without enhanced navigation
     [InlineData(false, true, true)]
     [InlineData(true, true, true)]
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
index 1c3444f3a030..edf3245ccf56 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
@@ -29,8 +29,11 @@ public static void SuppressEnhancedNavigation<TServerFixture>(ServerTestBase<TSe
 
             // Set the suppression flag - this will prevent enhanced navigation from being attached on the next navigation
             // and trigger detachment of currently attached enhanced navigation via the periodic check
-            var testId = Guid.NewGuid().ToString("N")[..8];
-            ((IJavaScriptExecutor)browser).ExecuteScript($"sessionStorage.setItem('test-id', '{testId}')");
+            var testId = ((IJavaScriptExecutor)browser).ExecuteScript($"return sessionStorage.getItem('test-id')");
+            if (testId == null)
+            {
+                throw new InvalidOperationException("Test ID not found in sessionStorage. Ensure that the test ID is set in InitializeAsync before calling this method.");
+            }
             ((IJavaScriptExecutor)browser).ExecuteScript($"sessionStorage.setItem('suppress-enhanced-navigation-{testId}', 'true')");
 
             var suppressEnhancedNavigation = ((IJavaScriptExecutor)browser).ExecuteScript($"return sessionStorage.getItem('suppress-enhanced-navigation-{testId}');");

From e154da5fbcdf897fe426bfaadc1b3281d86e3bf6 Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Wed, 6 Aug 2025 09:01:08 +0200
Subject: [PATCH 03/39] Move granting test id to the base class.

---
 .../E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs | 7 +------
 src/Shared/E2ETesting/BrowserTestBase.cs                   | 7 +++++++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
index a859f388469f..4e1e8733262d 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
@@ -31,12 +31,7 @@ public EnhancedNavigationTest(
     // One of the tests here makes use of the streaming rendering page, which uses global state
     // so we can't run at the same time as other such tests
     public override Task InitializeAsync()
-    {
-        var initTask =  InitializeAsync(BrowserFixture.StreamingContext);
-        var testId = Guid.NewGuid().ToString("N")[..8];
-        ((IJavaScriptExecutor)Browser).ExecuteScript($"sessionStorage.setItem('test-id', '{testId}')");
-        return initTask;
-    }
+        => InitializeAsync(BrowserFixture.StreamingContext);
 
     [Fact]
     public void CanNavigateToAnotherPageWhilePreservingCommonDOMElements()
diff --git a/src/Shared/E2ETesting/BrowserTestBase.cs b/src/Shared/E2ETesting/BrowserTestBase.cs
index 7a1927fe22cf..009c81e002c6 100644
--- a/src/Shared/E2ETesting/BrowserTestBase.cs
+++ b/src/Shared/E2ETesting/BrowserTestBase.cs
@@ -63,9 +63,16 @@ public virtual Task InitializeAsync(string isolationContext)
     {
         InitializeBrowser(isolationContext);
         InitializeAsyncCore();
+        GrantTestId();
         return Task.CompletedTask;
     }
 
+    private void GrantTestId()
+    {
+        var testId = Guid.NewGuid().ToString("N")[..8];
+        ((IJavaScriptExecutor)Browser).ExecuteScript($"sessionStorage.setItem('test-id', '{testId}')");
+    }
+
     protected virtual void InitializeAsyncCore()
     {
     }

From fb9352a204ff7f7762da7f747896b55e53b4a55d Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Wed, 6 Aug 2025 09:03:39 +0200
Subject: [PATCH 04/39] Remove unused namespace.

---
 .../E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
index edf3245ccf56..16c1e23302c5 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
@@ -6,7 +6,6 @@
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.E2ETesting;
 using OpenQA.Selenium;
-using OpenQA.Selenium.BiDi.Communication;
 
 namespace Microsoft.AspNetCore.Components.E2ETests.ServerRenderingTests;
 

From edd7b9d71b03f704516b499e68751770f3a3c067 Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Wed, 6 Aug 2025 11:53:28 +0200
Subject: [PATCH 05/39] Not all tests can use session storage.

---
 .../ServerRenderingTests/EnhancedNavigationTest.cs    |  2 +-
 .../FormWithParentBindingContextTest.cs               |  2 +-
 .../ServerRenderingTests/NoInteractivityTest.cs       |  2 +-
 .../E2ETest/ServerRenderingTests/RedirectionTest.cs   |  4 ++--
 .../ServerRenderingTests/StreamingRenderingTest.cs    |  2 +-
 .../test/E2ETest/Tests/StatePersistenceTest.cs        |  2 +-
 src/Shared/E2ETesting/BrowserTestBase.cs              | 11 +++++++----
 7 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
index 4e1e8733262d..197976cb6334 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
@@ -31,7 +31,7 @@ public EnhancedNavigationTest(
     // One of the tests here makes use of the streaming rendering page, which uses global state
     // so we can't run at the same time as other such tests
     public override Task InitializeAsync()
-        => InitializeAsync(BrowserFixture.StreamingContext);
+        => InitializeAsync(BrowserFixture.StreamingContext, supportEnhancedNavigationSuppression: true);
 
     [Fact]
     public void CanNavigateToAnotherPageWhilePreservingCommonDOMElements()
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs
index d6dc438db468..78f90c202c72 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs
@@ -32,7 +32,7 @@ public override Task InitializeAsync()
         _tempDirectory = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString("N"));
         Directory.CreateDirectory(_tempDirectory);
 
-        return InitializeAsync(BrowserFixture.StreamingContext);
+        return InitializeAsync(BrowserFixture.StreamingContext, supportEnhancedNavigationSuppression: true);
     }
 
     [Theory]
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/NoInteractivityTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/NoInteractivityTest.cs
index a6421eb94689..7ab92ec99951 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/NoInteractivityTest.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/NoInteractivityTest.cs
@@ -25,7 +25,7 @@ public NoInteractivityTest(
     }
 
     public override Task InitializeAsync()
-        => InitializeAsync(BrowserFixture.StreamingContext);
+        => InitializeAsync(BrowserFixture.StreamingContext, supportEnhancedNavigationSuppression: true);
 
     [Fact]
     public void NavigationManagerCanRefreshSSRPageWhenInteractivityNotPresent()
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/RedirectionTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/RedirectionTest.cs
index 0f9b419fb847..bbae1dd89845 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/RedirectionTest.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/RedirectionTest.cs
@@ -25,7 +25,7 @@ public RedirectionTest(
 
     public override async Task InitializeAsync()
     {
-        await base.InitializeAsync();
+        await base.InitializeAsync(supportEnhancedNavigationSuppression: true);
         Navigate($"{ServerPathBase}/redirect");
 
         _originalH1Element = Browser.Exists(By.TagName("h1"));
@@ -179,7 +179,7 @@ public void RedirectStreamingEnhancedGetToExternal(bool disableThrowNavigationEx
         Browser.Exists(By.LinkText("Streaming enhanced GET with external redirection")).Click();
         Browser.Contains("microsoft.com", () => Browser.Url);
     }
-    
+
 
     [Theory]
     [InlineData(true)]
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/StreamingRenderingTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/StreamingRenderingTest.cs
index 5fcf6d2a3813..5918173d145a 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/StreamingRenderingTest.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/StreamingRenderingTest.cs
@@ -27,7 +27,7 @@ public StreamingRenderingTest(
     }
 
     public override Task InitializeAsync()
-        => InitializeAsync(BrowserFixture.StreamingContext);
+        => InitializeAsync(BrowserFixture.StreamingContext, supportEnhancedNavigationSuppression: true);
 
     [Fact]
     public async Task CanRenderNonstreamingPageWithoutInjectingStreamingMarkersOrHeaders()
diff --git a/src/Components/test/E2ETest/Tests/StatePersistenceTest.cs b/src/Components/test/E2ETest/Tests/StatePersistenceTest.cs
index 007c7ce5de16..9b98c5500520 100644
--- a/src/Components/test/E2ETest/Tests/StatePersistenceTest.cs
+++ b/src/Components/test/E2ETest/Tests/StatePersistenceTest.cs
@@ -29,7 +29,7 @@ public StatePersistenceTest(
 
     // Separate contexts to ensure that caches and other state don't interfere across tests.
     public override Task InitializeAsync()
-        => InitializeAsync(BrowserFixture.StreamingContext + _nextStreamingIdContext++);
+        => InitializeAsync(BrowserFixture.StreamingContext + _nextStreamingIdContext++, supportEnhancedNavigationSuppression: true);
 
     // Validates that we can use persisted state across server, webassembly, and auto modes, with and without
     // streaming rendering.
diff --git a/src/Shared/E2ETesting/BrowserTestBase.cs b/src/Shared/E2ETesting/BrowserTestBase.cs
index 009c81e002c6..ce88ac4a9986 100644
--- a/src/Shared/E2ETesting/BrowserTestBase.cs
+++ b/src/Shared/E2ETesting/BrowserTestBase.cs
@@ -54,16 +54,19 @@ public Task DisposeAsync()
         return Task.CompletedTask;
     }
 
-    public virtual Task InitializeAsync()
+    public virtual Task InitializeAsync(bool supportEnhancedNavigationSuppression = false)
     {
-        return InitializeAsync("");
+        return InitializeAsync("", supportEnhancedNavigationSuppression);
     }
 
-    public virtual Task InitializeAsync(string isolationContext)
+    public virtual Task InitializeAsync(string isolationContext, bool supportEnhancedNavigationSuppression = false)
     {
         InitializeBrowser(isolationContext);
         InitializeAsyncCore();
-        GrantTestId();
+        if (supportEnhancedNavigationSuppression)
+        {
+            GrantTestId();
+        }
         return Task.CompletedTask;
     }
 

From 09f4518f5e065f829be3caa444dca2171c70c21a Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Wed, 6 Aug 2025 11:56:47 +0200
Subject: [PATCH 06/39] Improve exception message.

---
 .../E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
index 16c1e23302c5..d9ae64630472 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
@@ -31,7 +31,7 @@ public static void SuppressEnhancedNavigation<TServerFixture>(ServerTestBase<TSe
             var testId = ((IJavaScriptExecutor)browser).ExecuteScript($"return sessionStorage.getItem('test-id')");
             if (testId == null)
             {
-                throw new InvalidOperationException("Test ID not found in sessionStorage. Ensure that the test ID is set in InitializeAsync before calling this method.");
+                throw new InvalidOperationException("Test ID not found in sessionStorage. Ensure that suppression is enabled by passing `supportEnhancedNavigationSuppression: true` to InitializeAsync.");
             }
             ((IJavaScriptExecutor)browser).ExecuteScript($"sessionStorage.setItem('suppress-enhanced-navigation-{testId}', 'true')");
 

From e89ae0922b6ce1d3653c8558cf5913d47babbb82 Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Wed, 6 Aug 2025 12:20:52 +0200
Subject: [PATCH 07/39] Fix build + fix multiple blank lines.

---
 .../test/E2ETest/ServerRenderingTests/RedirectionTest.cs      | 1 -
 src/Shared/E2ETesting/BrowserTestBase.cs                      | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Components/test/E2ETest/ServerRenderingTests/RedirectionTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/RedirectionTest.cs
index bbae1dd89845..d42690c041c6 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/RedirectionTest.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/RedirectionTest.cs
@@ -180,7 +180,6 @@ public void RedirectStreamingEnhancedGetToExternal(bool disableThrowNavigationEx
         Browser.Contains("microsoft.com", () => Browser.Url);
     }
 
-
     [Theory]
     [InlineData(true)]
     [InlineData(false)]
diff --git a/src/Shared/E2ETesting/BrowserTestBase.cs b/src/Shared/E2ETesting/BrowserTestBase.cs
index ce88ac4a9986..9c4bb9a9a92e 100644
--- a/src/Shared/E2ETesting/BrowserTestBase.cs
+++ b/src/Shared/E2ETesting/BrowserTestBase.cs
@@ -53,6 +53,10 @@ public Task DisposeAsync()
     {
         return Task.CompletedTask;
     }
+    public virtual Task InitializeAsync()
+    {
+        return InitializeAsync("", supportEnhancedNavigationSuppression: false);
+    }
 
     public virtual Task InitializeAsync(bool supportEnhancedNavigationSuppression = false)
     {

From 8903a36cc14799ec979ba3b248773d2831a0a9fb Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Wed, 6 Aug 2025 12:27:21 +0200
Subject: [PATCH 08/39] redirection tests do not ned supression.

---
 .../test/E2ETest/ServerRenderingTests/RedirectionTest.cs   | 3 ++-
 src/Shared/E2ETesting/BrowserTestBase.cs                   | 7 +------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/Components/test/E2ETest/ServerRenderingTests/RedirectionTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/RedirectionTest.cs
index d42690c041c6..0f9b419fb847 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/RedirectionTest.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/RedirectionTest.cs
@@ -25,7 +25,7 @@ public RedirectionTest(
 
     public override async Task InitializeAsync()
     {
-        await base.InitializeAsync(supportEnhancedNavigationSuppression: true);
+        await base.InitializeAsync();
         Navigate($"{ServerPathBase}/redirect");
 
         _originalH1Element = Browser.Exists(By.TagName("h1"));
@@ -179,6 +179,7 @@ public void RedirectStreamingEnhancedGetToExternal(bool disableThrowNavigationEx
         Browser.Exists(By.LinkText("Streaming enhanced GET with external redirection")).Click();
         Browser.Contains("microsoft.com", () => Browser.Url);
     }
+    
 
     [Theory]
     [InlineData(true)]
diff --git a/src/Shared/E2ETesting/BrowserTestBase.cs b/src/Shared/E2ETesting/BrowserTestBase.cs
index 9c4bb9a9a92e..b7193813a35e 100644
--- a/src/Shared/E2ETesting/BrowserTestBase.cs
+++ b/src/Shared/E2ETesting/BrowserTestBase.cs
@@ -55,12 +55,7 @@ public Task DisposeAsync()
     }
     public virtual Task InitializeAsync()
     {
-        return InitializeAsync("", supportEnhancedNavigationSuppression: false);
-    }
-
-    public virtual Task InitializeAsync(bool supportEnhancedNavigationSuppression = false)
-    {
-        return InitializeAsync("", supportEnhancedNavigationSuppression);
+        return InitializeAsync("");
     }
 
     public virtual Task InitializeAsync(string isolationContext, bool supportEnhancedNavigationSuppression = false)

From 62d4473bd674e92b876b022e5a180e0fab019a48 Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Wed, 6 Aug 2025 13:35:55 +0200
Subject: [PATCH 09/39] `fixture.Navigate` clears the storage, reading testId
 has to be done first.

---
 .../EnhancedNavigationTestUtil.cs                 | 15 ++++++++-------
 .../ServerRenderingTests/NoInteractivityTest.cs   |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
index d9ae64630472..0ab7471bcd14 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
@@ -18,6 +18,14 @@ public static void SuppressEnhancedNavigation<TServerFixture>(ServerTestBase<TSe
         {
             var browser = fixture.Browser;
 
+            // Set the suppression flag - this will prevent enhanced navigation from being attached on the next navigation
+            // and trigger detachment of currently attached enhanced navigation via the periodic check
+            var testId = ((IJavaScriptExecutor)browser).ExecuteScript($"return sessionStorage.getItem('test-id')");
+            if (testId == null)
+            {
+                throw new InvalidOperationException("Test ID not found in sessionStorage. Ensure that suppression is enabled by passing `supportEnhancedNavigationSuppression: true` to InitializeAsync.");
+            }
+
             if (!skipNavigation)
             {
                 // Normally we need to navigate here first otherwise the browser isn't on the correct origin to access
@@ -26,13 +34,6 @@ public static void SuppressEnhancedNavigation<TServerFixture>(ServerTestBase<TSe
                 browser.Equal("Hello", () => browser.Exists(By.TagName("h1")).Text);
             }
 
-            // Set the suppression flag - this will prevent enhanced navigation from being attached on the next navigation
-            // and trigger detachment of currently attached enhanced navigation via the periodic check
-            var testId = ((IJavaScriptExecutor)browser).ExecuteScript($"return sessionStorage.getItem('test-id')");
-            if (testId == null)
-            {
-                throw new InvalidOperationException("Test ID not found in sessionStorage. Ensure that suppression is enabled by passing `supportEnhancedNavigationSuppression: true` to InitializeAsync.");
-            }
             ((IJavaScriptExecutor)browser).ExecuteScript($"sessionStorage.setItem('suppress-enhanced-navigation-{testId}', 'true')");
 
             var suppressEnhancedNavigation = ((IJavaScriptExecutor)browser).ExecuteScript($"return sessionStorage.getItem('suppress-enhanced-navigation-{testId}');");
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/NoInteractivityTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/NoInteractivityTest.cs
index 7ab92ec99951..a6421eb94689 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/NoInteractivityTest.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/NoInteractivityTest.cs
@@ -25,7 +25,7 @@ public NoInteractivityTest(
     }
 
     public override Task InitializeAsync()
-        => InitializeAsync(BrowserFixture.StreamingContext, supportEnhancedNavigationSuppression: true);
+        => InitializeAsync(BrowserFixture.StreamingContext);
 
     [Fact]
     public void NavigationManagerCanRefreshSSRPageWhenInteractivityNotPresent()

From 6c54aeb8dc496edba1cb748e9cd8177f269c7df4 Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Wed, 6 Aug 2025 13:55:07 +0200
Subject: [PATCH 10/39] NonInteractivityTests contain tests that require
 supression and tests that don't support session storage at the same time.
 Allow single tests to request id assignment.

---
 .../E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs  | 2 +-
 .../test/E2ETest/ServerRenderingTests/NoInteractivityTest.cs    | 1 +
 src/Shared/E2ETesting/BrowserTestBase.cs                        | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
index 0ab7471bcd14..4b6b2524207a 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
@@ -23,7 +23,7 @@ public static void SuppressEnhancedNavigation<TServerFixture>(ServerTestBase<TSe
             var testId = ((IJavaScriptExecutor)browser).ExecuteScript($"return sessionStorage.getItem('test-id')");
             if (testId == null)
             {
-                throw new InvalidOperationException("Test ID not found in sessionStorage. Ensure that suppression is enabled by passing `supportEnhancedNavigationSuppression: true` to InitializeAsync.");
+                throw new InvalidOperationException("Test ID not found in sessionStorage. Ensure that suppression is enabled for test class by passing `supportEnhancedNavigationSuppression: true` to InitializeAsync or for a given test by calling `GrantTestId()` in the beginning of the test.");
             }
 
             if (!skipNavigation)
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/NoInteractivityTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/NoInteractivityTest.cs
index a6421eb94689..722bdce57676 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/NoInteractivityTest.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/NoInteractivityTest.cs
@@ -285,6 +285,7 @@ public void NotFoundSetOnInitialization_ResponseStarted_SSR(bool hasReExecutionM
     [InlineData(false, true)]
     public void NotFoundSetOnInitialization_ResponseStarted_EnhancedNavigationDisabled_SSR(bool hasReExecutionMiddleware, bool hasCustomNotFoundPageSet)
     {
+        GrantTestId();
         EnhancedNavigationTestUtil.SuppressEnhancedNavigation(this, true, skipNavigation: true);
         string reexecution = hasReExecutionMiddleware ? "/reexecution" : "";
         string testUrl = $"{ServerPathBase}{reexecution}/set-not-found-ssr-streaming?useCustomNotFoundPage={hasCustomNotFoundPageSet}";
diff --git a/src/Shared/E2ETesting/BrowserTestBase.cs b/src/Shared/E2ETesting/BrowserTestBase.cs
index b7193813a35e..ed7c6ae54ead 100644
--- a/src/Shared/E2ETesting/BrowserTestBase.cs
+++ b/src/Shared/E2ETesting/BrowserTestBase.cs
@@ -69,7 +69,7 @@ public virtual Task InitializeAsync(string isolationContext, bool supportEnhance
         return Task.CompletedTask;
     }
 
-    private void GrantTestId()
+    protected void GrantTestId()
     {
         var testId = Guid.NewGuid().ToString("N")[..8];
         ((IJavaScriptExecutor)Browser).ExecuteScript($"sessionStorage.setItem('test-id', '{testId}')");

From 843d4e84ab2567f4be0fc37ca5baf3b84e3eda4c Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Wed, 20 Aug 2025 16:04:22 +0200
Subject: [PATCH 11/39] Wait for the base page to be loaded to make sure
 session storage is available.

---
 .../E2ETest/Infrastructure/ServerTestBase.cs  | 41 ++++++++++++++++++-
 .../NoInteractivityTest.cs                    |  1 -
 src/Shared/E2ETesting/BrowserTestBase.cs      | 11 ++---
 3 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs b/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs
index 841cecb32695..4178ae0e78f8 100644
--- a/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs
+++ b/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs
@@ -4,6 +4,7 @@
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.E2ETesting;
 using OpenQA.Selenium;
+using OpenQA.Selenium.Support.UI;
 using Xunit.Abstractions;
 
 namespace Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
@@ -31,10 +32,48 @@ public void Navigate(string relativeUrl)
         Browser.Navigate(_serverFixture.RootUri, relativeUrl);
     }
 
-    protected override void InitializeAsyncCore()
+    protected override void InitializeAsyncCore(bool supportEnhancedNavigationSuppression = false)
     {
+        if (supportEnhancedNavigationSuppression)
+        {
+            GrantTestId();
+        }
+
         // Clear logs - we check these during tests in some cases.
         // Make sure each test starts clean.
         ((IJavaScriptExecutor)Browser).ExecuteScript("console.clear()");
+
+        InitializeAsyncCore();
+    }
+
+    protected override void InitializeAsyncCore()
+    {
+    }
+
+    private void GrantTestId()
+    {
+        // We have to be on any page to ensure session storage is available
+        // Since PageLoadStrategy can be set to None, we need to manually wait for page load
+        Navigate(ServerPathBase);
+
+        // Wait for the page to be completely loaded (equivalent to PageLoadStrategy.Normal)
+        var wait = new OpenQA.Selenium.Support.UI.WebDriverWait(Browser, TimeSpan.FromSeconds(10));
+        wait.Until(driver =>
+        {
+            try
+            {
+                // Check if document is ready and load event has fired
+                var loadComplete = ((IJavaScriptExecutor)driver).ExecuteScript(
+                    "return document.readyState === 'complete' && performance.timing.loadEventEnd > 0");
+                return (bool)loadComplete;
+            }
+            catch
+            {
+                return false;
+            }
+        });
+
+        var testId = Guid.NewGuid().ToString("N")[..8];
+        ((IJavaScriptExecutor)Browser).ExecuteScript($"sessionStorage.setItem('test-id', '{testId}')");
     }
 }
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/NoInteractivityTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/NoInteractivityTest.cs
index 722bdce57676..a6421eb94689 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/NoInteractivityTest.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/NoInteractivityTest.cs
@@ -285,7 +285,6 @@ public void NotFoundSetOnInitialization_ResponseStarted_SSR(bool hasReExecutionM
     [InlineData(false, true)]
     public void NotFoundSetOnInitialization_ResponseStarted_EnhancedNavigationDisabled_SSR(bool hasReExecutionMiddleware, bool hasCustomNotFoundPageSet)
     {
-        GrantTestId();
         EnhancedNavigationTestUtil.SuppressEnhancedNavigation(this, true, skipNavigation: true);
         string reexecution = hasReExecutionMiddleware ? "/reexecution" : "";
         string testUrl = $"{ServerPathBase}{reexecution}/set-not-found-ssr-streaming?useCustomNotFoundPage={hasCustomNotFoundPageSet}";
diff --git a/src/Shared/E2ETesting/BrowserTestBase.cs b/src/Shared/E2ETesting/BrowserTestBase.cs
index ed7c6ae54ead..9e132c010447 100644
--- a/src/Shared/E2ETesting/BrowserTestBase.cs
+++ b/src/Shared/E2ETesting/BrowserTestBase.cs
@@ -61,18 +61,13 @@ public virtual Task InitializeAsync()
     public virtual Task InitializeAsync(string isolationContext, bool supportEnhancedNavigationSuppression = false)
     {
         InitializeBrowser(isolationContext);
-        InitializeAsyncCore();
-        if (supportEnhancedNavigationSuppression)
-        {
-            GrantTestId();
-        }
+        InitializeAsyncCore(supportEnhancedNavigationSuppression);
         return Task.CompletedTask;
     }
 
-    protected void GrantTestId()
+    protected virtual void InitializeAsyncCore(bool supportEnhancedNavigationSuppression = false)
     {
-        var testId = Guid.NewGuid().ToString("N")[..8];
-        ((IJavaScriptExecutor)Browser).ExecuteScript($"sessionStorage.setItem('test-id', '{testId}')");
+        InitializeAsyncCore();
     }
 
     protected virtual void InitializeAsyncCore()

From ff01e2c9ef28349b354f83a7d5c4370798e81d7d Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Wed, 20 Aug 2025 16:38:54 +0200
Subject: [PATCH 12/39] Move the id initialization to the enhanced nav
 supression method.

---
 .../E2ETest/Infrastructure/ServerTestBase.cs  | 40 +------------------
 .../EnhancedNavigationTest.cs                 |  2 +-
 .../EnhancedNavigationTestUtil.cs             | 28 +++++++++----
 .../FormWithParentBindingContextTest.cs       |  2 +-
 .../StreamingRenderingTest.cs                 |  2 +-
 .../E2ETest/Tests/StatePersistenceTest.cs     |  2 +-
 src/Shared/E2ETesting/BrowserTestBase.cs      |  9 +----
 7 files changed, 27 insertions(+), 58 deletions(-)

diff --git a/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs b/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs
index 4178ae0e78f8..e7dc6f0d3841 100644
--- a/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs
+++ b/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs
@@ -32,48 +32,10 @@ public void Navigate(string relativeUrl)
         Browser.Navigate(_serverFixture.RootUri, relativeUrl);
     }
 
-    protected override void InitializeAsyncCore(bool supportEnhancedNavigationSuppression = false)
+    protected override void InitializeAsyncCore()
     {
-        if (supportEnhancedNavigationSuppression)
-        {
-            GrantTestId();
-        }
-
         // Clear logs - we check these during tests in some cases.
         // Make sure each test starts clean.
         ((IJavaScriptExecutor)Browser).ExecuteScript("console.clear()");
-
-        InitializeAsyncCore();
-    }
-
-    protected override void InitializeAsyncCore()
-    {
-    }
-
-    private void GrantTestId()
-    {
-        // We have to be on any page to ensure session storage is available
-        // Since PageLoadStrategy can be set to None, we need to manually wait for page load
-        Navigate(ServerPathBase);
-
-        // Wait for the page to be completely loaded (equivalent to PageLoadStrategy.Normal)
-        var wait = new OpenQA.Selenium.Support.UI.WebDriverWait(Browser, TimeSpan.FromSeconds(10));
-        wait.Until(driver =>
-        {
-            try
-            {
-                // Check if document is ready and load event has fired
-                var loadComplete = ((IJavaScriptExecutor)driver).ExecuteScript(
-                    "return document.readyState === 'complete' && performance.timing.loadEventEnd > 0");
-                return (bool)loadComplete;
-            }
-            catch
-            {
-                return false;
-            }
-        });
-
-        var testId = Guid.NewGuid().ToString("N")[..8];
-        ((IJavaScriptExecutor)Browser).ExecuteScript($"sessionStorage.setItem('test-id', '{testId}')");
     }
 }
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
index 197976cb6334..4e1e8733262d 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
@@ -31,7 +31,7 @@ public EnhancedNavigationTest(
     // One of the tests here makes use of the streaming rendering page, which uses global state
     // so we can't run at the same time as other such tests
     public override Task InitializeAsync()
-        => InitializeAsync(BrowserFixture.StreamingContext, supportEnhancedNavigationSuppression: true);
+        => InitializeAsync(BrowserFixture.StreamingContext);
 
     [Fact]
     public void CanNavigateToAnotherPageWhilePreservingCommonDOMElements()
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
index 4b6b2524207a..68a3d9171d64 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
@@ -18,14 +18,6 @@ public static void SuppressEnhancedNavigation<TServerFixture>(ServerTestBase<TSe
         {
             var browser = fixture.Browser;
 
-            // Set the suppression flag - this will prevent enhanced navigation from being attached on the next navigation
-            // and trigger detachment of currently attached enhanced navigation via the periodic check
-            var testId = ((IJavaScriptExecutor)browser).ExecuteScript($"return sessionStorage.getItem('test-id')");
-            if (testId == null)
-            {
-                throw new InvalidOperationException("Test ID not found in sessionStorage. Ensure that suppression is enabled for test class by passing `supportEnhancedNavigationSuppression: true` to InitializeAsync or for a given test by calling `GrantTestId()` in the beginning of the test.");
-            }
-
             if (!skipNavigation)
             {
                 // Normally we need to navigate here first otherwise the browser isn't on the correct origin to access
@@ -34,6 +26,20 @@ public static void SuppressEnhancedNavigation<TServerFixture>(ServerTestBase<TSe
                 browser.Equal("Hello", () => browser.Exists(By.TagName("h1")).Text);
             }
 
+            try
+            {
+                ((IJavaScriptExecutor)browser).ExecuteScript("sessionStorage.length");
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException("Session storage not found. Ensure that the browser is on the correct origin by navigating to a page or by setting skipNavigation to false.", ex);
+            }
+            var testId = ((IJavaScriptExecutor)browser).ExecuteScript($"return sessionStorage.getItem('test-id')");
+            if (testId == null)
+            {
+                testId = GrantTestId(browser);
+            }
+
             ((IJavaScriptExecutor)browser).ExecuteScript($"sessionStorage.setItem('suppress-enhanced-navigation-{testId}', 'true')");
 
             var suppressEnhancedNavigation = ((IJavaScriptExecutor)browser).ExecuteScript($"return sessionStorage.getItem('suppress-enhanced-navigation-{testId}');");
@@ -41,6 +47,12 @@ public static void SuppressEnhancedNavigation<TServerFixture>(ServerTestBase<TSe
                 "Expected 'suppress-enhanced-navigation' to be set in sessionStorage.");
         }
     }
+    private static string GrantTestId(IWebDriver browser)
+    {
+        var testId = Guid.NewGuid().ToString("N")[..8];
+        ((IJavaScriptExecutor)browser).ExecuteScript($"sessionStorage.setItem('test-id', '{testId}')");
+        return testId;
+    }
 
     public static long GetScrollY(this IWebDriver browser)
         => Convert.ToInt64(((IJavaScriptExecutor)browser).ExecuteScript("return window.scrollY"), CultureInfo.CurrentCulture);
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs
index 78f90c202c72..d6dc438db468 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs
@@ -32,7 +32,7 @@ public override Task InitializeAsync()
         _tempDirectory = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString("N"));
         Directory.CreateDirectory(_tempDirectory);
 
-        return InitializeAsync(BrowserFixture.StreamingContext, supportEnhancedNavigationSuppression: true);
+        return InitializeAsync(BrowserFixture.StreamingContext);
     }
 
     [Theory]
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/StreamingRenderingTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/StreamingRenderingTest.cs
index 5918173d145a..5fcf6d2a3813 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/StreamingRenderingTest.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/StreamingRenderingTest.cs
@@ -27,7 +27,7 @@ public StreamingRenderingTest(
     }
 
     public override Task InitializeAsync()
-        => InitializeAsync(BrowserFixture.StreamingContext, supportEnhancedNavigationSuppression: true);
+        => InitializeAsync(BrowserFixture.StreamingContext);
 
     [Fact]
     public async Task CanRenderNonstreamingPageWithoutInjectingStreamingMarkersOrHeaders()
diff --git a/src/Components/test/E2ETest/Tests/StatePersistenceTest.cs b/src/Components/test/E2ETest/Tests/StatePersistenceTest.cs
index 9b98c5500520..007c7ce5de16 100644
--- a/src/Components/test/E2ETest/Tests/StatePersistenceTest.cs
+++ b/src/Components/test/E2ETest/Tests/StatePersistenceTest.cs
@@ -29,7 +29,7 @@ public StatePersistenceTest(
 
     // Separate contexts to ensure that caches and other state don't interfere across tests.
     public override Task InitializeAsync()
-        => InitializeAsync(BrowserFixture.StreamingContext + _nextStreamingIdContext++, supportEnhancedNavigationSuppression: true);
+        => InitializeAsync(BrowserFixture.StreamingContext + _nextStreamingIdContext++);
 
     // Validates that we can use persisted state across server, webassembly, and auto modes, with and without
     // streaming rendering.
diff --git a/src/Shared/E2ETesting/BrowserTestBase.cs b/src/Shared/E2ETesting/BrowserTestBase.cs
index 9e132c010447..9cf3d5ac0ef5 100644
--- a/src/Shared/E2ETesting/BrowserTestBase.cs
+++ b/src/Shared/E2ETesting/BrowserTestBase.cs
@@ -58,16 +58,11 @@ public virtual Task InitializeAsync()
         return InitializeAsync("");
     }
 
-    public virtual Task InitializeAsync(string isolationContext, bool supportEnhancedNavigationSuppression = false)
+    public virtual Task InitializeAsync(string isolationContext)
     {
         InitializeBrowser(isolationContext);
-        InitializeAsyncCore(supportEnhancedNavigationSuppression);
-        return Task.CompletedTask;
-    }
-
-    protected virtual void InitializeAsyncCore(bool supportEnhancedNavigationSuppression = false)
-    {
         InitializeAsyncCore();
+        return Task.CompletedTask;
     }
 
     protected virtual void InitializeAsyncCore()

From 8244b55d6b11a4d088963a439456df0feac504cb Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Wed, 20 Aug 2025 16:44:36 +0200
Subject: [PATCH 13/39] Cleanup.

---
 src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs  | 1 -
 .../E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs    | 4 ++--
 src/Shared/E2ETesting/BrowserTestBase.cs                      | 1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs b/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs
index e7dc6f0d3841..841cecb32695 100644
--- a/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs
+++ b/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs
@@ -4,7 +4,6 @@
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.E2ETesting;
 using OpenQA.Selenium;
-using OpenQA.Selenium.Support.UI;
 using Xunit.Abstractions;
 
 namespace Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
index 4e1e8733262d..49b542b608fc 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
@@ -691,7 +691,7 @@ public void EnhancedNavigationScrollBehavesSameAsBrowserOnNavigation(bool enable
         // or to the beginning of a fragment, regardless of the previous scroll position
         string landingPageSuffix = enableStreaming ? "" : "-no-streaming";
         string buttonKeyword = programmaticNavigation ? "-programmatic" : "";
-        EnhancedNavigationTestUtil.SuppressEnhancedNavigation(this, shouldSuppress: !useEnhancedNavigation, skipNavigation: true);
+        EnhancedNavigationTestUtil.SuppressEnhancedNavigation(this, shouldSuppress: !useEnhancedNavigation);
         Navigate($"{ServerPathBase}/nav/scroll-test{landingPageSuffix}");
 
         // "landing" page: scroll maximally down and go to "next" page - we should land at the top of that page
@@ -744,7 +744,7 @@ public void EnhancedNavigationScrollBehavesSameAsBrowserOnBackwardsForwardsActio
         // This test checks if the scroll position is preserved after backwards/forwards action
         string landingPageSuffix = enableStreaming ? "" : "-no-streaming";
         string buttonKeyword = programmaticNavigation ? "-programmatic" : "";
-        EnhancedNavigationTestUtil.SuppressEnhancedNavigation(this, shouldSuppress: !useEnhancedNavigation, skipNavigation: true);
+        EnhancedNavigationTestUtil.SuppressEnhancedNavigation(this, shouldSuppress: !useEnhancedNavigation);
         Navigate($"{ServerPathBase}/nav/scroll-test{landingPageSuffix}");
 
         // "landing" page: scroll to pos1, navigate away
diff --git a/src/Shared/E2ETesting/BrowserTestBase.cs b/src/Shared/E2ETesting/BrowserTestBase.cs
index 9cf3d5ac0ef5..7a1927fe22cf 100644
--- a/src/Shared/E2ETesting/BrowserTestBase.cs
+++ b/src/Shared/E2ETesting/BrowserTestBase.cs
@@ -53,6 +53,7 @@ public Task DisposeAsync()
     {
         return Task.CompletedTask;
     }
+
     public virtual Task InitializeAsync()
     {
         return InitializeAsync("");

From 57365d167a25612750f00addbea70ed1fb0dff01 Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Thu, 21 Aug 2025 09:57:41 +0200
Subject: [PATCH 14/39] Go back to setting test id only when supression happens
 but try to clean it after each test.

---
 .../E2ETest/Infrastructure/ServerTestBase.cs  | 20 +++++++++++++++++++
 src/Shared/E2ETesting/BrowserTestBase.cs      |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs b/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs
index 841cecb32695..fc44aa75774f 100644
--- a/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs
+++ b/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs
@@ -31,10 +31,30 @@ public void Navigate(string relativeUrl)
         Browser.Navigate(_serverFixture.RootUri, relativeUrl);
     }
 
+    public override async Task DisposeAsync()
+    {
+        TryCleanupTestId();
+
+        await base.DisposeAsync();
+    }
+
     protected override void InitializeAsyncCore()
     {
         // Clear logs - we check these during tests in some cases.
         // Make sure each test starts clean.
         ((IJavaScriptExecutor)Browser).ExecuteScript("console.clear()");
     }
+
+    private void TryCleanupTestId()
+    {
+        try
+        {
+            ((IJavaScriptExecutor)Browser).ExecuteScript($"sessionStorage.removeItem('test-id')");
+        }
+        catch (Exception ex)
+        {
+            // exception here most probably means session storage is not available - no cleanup needed
+            Output?.WriteLine("Error when removing test id from session storage: " + ex.Message);
+        }
+    }
 }
diff --git a/src/Shared/E2ETesting/BrowserTestBase.cs b/src/Shared/E2ETesting/BrowserTestBase.cs
index 7a1927fe22cf..dcd840cc6d10 100644
--- a/src/Shared/E2ETesting/BrowserTestBase.cs
+++ b/src/Shared/E2ETesting/BrowserTestBase.cs
@@ -49,7 +49,7 @@ public IWebDriver Browser
 
     public BrowserFixture BrowserFixture { get; }
 
-    public Task DisposeAsync()
+    public virtual Task DisposeAsync()
     {
         return Task.CompletedTask;
     }

From 4f894a743b4c5f43c81d2701a46391891d729800 Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Thu, 21 Aug 2025 10:06:00 +0200
Subject: [PATCH 15/39] Improve cleanup - supression flag can also get removed.

---
 .../test/E2ETest/Infrastructure/ServerTestBase.cs    | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs b/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs
index fc44aa75774f..32bc3da966f3 100644
--- a/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs
+++ b/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs
@@ -33,7 +33,7 @@ public void Navigate(string relativeUrl)
 
     public override async Task DisposeAsync()
     {
-        TryCleanupTestId();
+        TryCleanSessionStorage();
 
         await base.DisposeAsync();
     }
@@ -45,11 +45,19 @@ protected override void InitializeAsyncCore()
         ((IJavaScriptExecutor)Browser).ExecuteScript("console.clear()");
     }
 
-    private void TryCleanupTestId()
+    private void TryCleanSessionStorage()
     {
         try
         {
+            // only tests that suppress enhanced navigation will have these items set
+            var testId = ((IJavaScriptExecutor)browser).ExecuteScript($"return sessionStorage.getItem('test-id')");
+            if (testId == null)
+            {
+                return;
+            }
+
             ((IJavaScriptExecutor)Browser).ExecuteScript($"sessionStorage.removeItem('test-id')");
+            ((IJavaScriptExecutor)Browser).ExecuteScript($"sessionStorage.removeItem('suppress-enhanced-navigation-{testId}')");
         }
         catch (Exception ex)
         {

From a727aeb324c19fe2ac79ec47ba8b05ad76189294 Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Thu, 21 Aug 2025 10:36:31 +0200
Subject: [PATCH 16/39] Fix

---
 src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs b/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs
index 32bc3da966f3..1f622f47e43a 100644
--- a/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs
+++ b/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs
@@ -50,7 +50,7 @@ private void TryCleanSessionStorage()
         try
         {
             // only tests that suppress enhanced navigation will have these items set
-            var testId = ((IJavaScriptExecutor)browser).ExecuteScript($"return sessionStorage.getItem('test-id')");
+            var testId = ((IJavaScriptExecutor)Browser).ExecuteScript($"return sessionStorage.getItem('test-id')");
             if (testId == null)
             {
                 return;

From acd74445cd367cd031fa3553987eae8052593cff Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Thu, 21 Aug 2025 13:42:57 +0200
Subject: [PATCH 17/39] Fix `RefreshCanFallBackOnFullPageReload`

---
 .../E2ETest/Infrastructure/ServerTestBase.cs    | 11 ++---------
 .../EnhancedNavigationTest.cs                   |  3 +++
 .../EnhancedNavigationTestUtil.cs               | 17 +++++++++++++++++
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs b/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs
index 1f622f47e43a..19355acb6097 100644
--- a/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs
+++ b/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
+using Microsoft.AspNetCore.Components.E2ETests.ServerRenderingTests;
 using Microsoft.AspNetCore.E2ETesting;
 using OpenQA.Selenium;
 using Xunit.Abstractions;
@@ -49,15 +50,7 @@ private void TryCleanSessionStorage()
     {
         try
         {
-            // only tests that suppress enhanced navigation will have these items set
-            var testId = ((IJavaScriptExecutor)Browser).ExecuteScript($"return sessionStorage.getItem('test-id')");
-            if (testId == null)
-            {
-                return;
-            }
-
-            ((IJavaScriptExecutor)Browser).ExecuteScript($"sessionStorage.removeItem('test-id')");
-            ((IJavaScriptExecutor)Browser).ExecuteScript($"sessionStorage.removeItem('suppress-enhanced-navigation-{testId}')");
+            EnhancedNavigationTestUtil.CleanEnhancedNavigationSuppression(this);
         }
         catch (Exception ex)
         {
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
index 49b542b608fc..e6f108c04663 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
@@ -317,6 +317,9 @@ public void RefreshCanFallBackOnFullPageReload(string renderMode)
         Browser.Navigate().Refresh();
         Browser.Equal("Page with interactive components that navigate", () => Browser.Exists(By.TagName("h1")).Text);
 
+        // if we don't clean up the suppression, all subsequent navigations will be suppressed by default
+        EnhancedNavigationTestUtil.CleanEnhancedNavigationSuppression(this);
+
         // Normally, you shouldn't store references to elements because they could become stale references
         // after the page re-renders. However, we want to explicitly test that the element becomes stale
         // across renders to ensure that a full page reload occurs.
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
index 68a3d9171d64..9ea99633a34c 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
@@ -47,6 +47,23 @@ public static void SuppressEnhancedNavigation<TServerFixture>(ServerTestBase<TSe
                 "Expected 'suppress-enhanced-navigation' to be set in sessionStorage.");
         }
     }
+
+    public static void CleanEnhancedNavigationSuppression<TServerFixture>(ServerTestBase<TServerFixture> fixture)
+        where TServerFixture : ServerFixture
+    {
+        var browser = fixture.Browser;
+
+        // only tests that suppress enhanced navigation will have these items set, so it can throw
+        var testId = ((IJavaScriptExecutor)browser).ExecuteScript($"return sessionStorage.getItem('test-id')");
+        if (testId == null)
+        {
+            return;
+        }
+
+        ((IJavaScriptExecutor)browser).ExecuteScript($"sessionStorage.removeItem('test-id')");
+        ((IJavaScriptExecutor)browser).ExecuteScript($"sessionStorage.removeItem('suppress-enhanced-navigation-{testId}')");
+    }
+
     private static string GrantTestId(IWebDriver browser)
     {
         var testId = Guid.NewGuid().ToString("N")[..8];

From a6de6045534ec49ade75ef63abaaed8e7eb4f8af Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Mon, 25 Aug 2025 10:48:51 +0200
Subject: [PATCH 18/39] Fix tests.

---
 .../EnhancedNavigationTestUtil.cs             | 41 ++++++++++---------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
index 9ea99633a34c..00cd930c4666 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
@@ -14,28 +14,31 @@ public static class EnhancedNavigationTestUtil
     public static void SuppressEnhancedNavigation<TServerFixture>(ServerTestBase<TServerFixture> fixture, bool shouldSuppress, bool skipNavigation = false)
         where TServerFixture : ServerFixture
     {
-        if (shouldSuppress)
+        var browser = fixture.Browser;
+
+        if (!skipNavigation)
         {
-            var browser = fixture.Browser;
+            // Navigate here first to ensure the browser is on the correct origin to access sessionStorage
+            fixture.Navigate($"{fixture.ServerPathBase}/");
+            browser.Equal("Hello", () => browser.Exists(By.TagName("h1")).Text);
+        }
 
-            if (!skipNavigation)
-            {
-                // Normally we need to navigate here first otherwise the browser isn't on the correct origin to access
-                // sessionStorage. But some tests are already in the right place and need to avoid extra navigation.
-                fixture.Navigate($"{fixture.ServerPathBase}/");
-                browser.Equal("Hello", () => browser.Exists(By.TagName("h1")).Text);
-            }
+        try
+        {
+            ((IJavaScriptExecutor)browser).ExecuteScript("sessionStorage.length");
+        }
+        catch (Exception ex)
+        {
+            throw new InvalidOperationException("Session storage not found. Ensure that the browser is on the correct origin by navigating to a page or by setting skipNavigation to false.", ex);
+        }
 
-            try
-            {
-                ((IJavaScriptExecutor)browser).ExecuteScript("sessionStorage.length");
-            }
-            catch (Exception ex)
-            {
-                throw new InvalidOperationException("Session storage not found. Ensure that the browser is on the correct origin by navigating to a page or by setting skipNavigation to false.", ex);
-            }
+        // This prevents test interference where suppression state from previous tests persists
+        CleanEnhancedNavigationSuppression(fixture);
+
+        if (shouldSuppress)
+        {
             var testId = ((IJavaScriptExecutor)browser).ExecuteScript($"return sessionStorage.getItem('test-id')");
-            if (testId == null)
+            if (testId is null || string.IsNullOrEmpty(testId as string))
             {
                 testId = GrantTestId(browser);
             }
@@ -55,7 +58,7 @@ public static void CleanEnhancedNavigationSuppression<TServerFixture>(ServerTest
 
         // only tests that suppress enhanced navigation will have these items set, so it can throw
         var testId = ((IJavaScriptExecutor)browser).ExecuteScript($"return sessionStorage.getItem('test-id')");
-        if (testId == null)
+        if (testId is null || string.IsNullOrEmpty(testId as string))
         {
             return;
         }

From ec6c13dedfb9f9d7aff20850990637e11d7468a4 Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Mon, 25 Aug 2025 11:59:29 +0200
Subject: [PATCH 19/39] Cleanup - removal of storage items can be done once, on
 disposal.

---
 .../E2ETest/Infrastructure/ServerTestBase.cs  | 16 +----
 .../EnhancedNavigationTest.cs                 |  2 +-
 .../EnhancedNavigationTestUtil.cs             | 59 ++++++++++++-------
 3 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs b/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs
index 19355acb6097..315b80cd2248 100644
--- a/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs
+++ b/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs
@@ -34,8 +34,7 @@ public void Navigate(string relativeUrl)
 
     public override async Task DisposeAsync()
     {
-        TryCleanSessionStorage();
-
+        EnhancedNavigationTestUtil.CleanEnhancedNavigationSuppression(this);
         await base.DisposeAsync();
     }
 
@@ -45,17 +44,4 @@ protected override void InitializeAsyncCore()
         // Make sure each test starts clean.
         ((IJavaScriptExecutor)Browser).ExecuteScript("console.clear()");
     }
-
-    private void TryCleanSessionStorage()
-    {
-        try
-        {
-            EnhancedNavigationTestUtil.CleanEnhancedNavigationSuppression(this);
-        }
-        catch (Exception ex)
-        {
-            // exception here most probably means session storage is not available - no cleanup needed
-            Output?.WriteLine("Error when removing test id from session storage: " + ex.Message);
-        }
-    }
 }
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
index e6f108c04663..d937c1972705 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
@@ -318,7 +318,7 @@ public void RefreshCanFallBackOnFullPageReload(string renderMode)
         Browser.Equal("Page with interactive components that navigate", () => Browser.Exists(By.TagName("h1")).Text);
 
         // if we don't clean up the suppression, all subsequent navigations will be suppressed by default
-        EnhancedNavigationTestUtil.CleanEnhancedNavigationSuppression(this);
+        EnhancedNavigationTestUtil.CleanEnhancedNavigationSuppression(this, skipNavigation: true);
 
         // Normally, you shouldn't store references to elements because they could become stale references
         // after the page re-renders. However, we want to explicitly test that the element becomes stale
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
index 00cd930c4666..41548893aa4a 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
@@ -14,29 +14,24 @@ public static class EnhancedNavigationTestUtil
     public static void SuppressEnhancedNavigation<TServerFixture>(ServerTestBase<TServerFixture> fixture, bool shouldSuppress, bool skipNavigation = false)
         where TServerFixture : ServerFixture
     {
-        var browser = fixture.Browser;
-
-        if (!skipNavigation)
+        if (shouldSuppress)
         {
-            // Navigate here first to ensure the browser is on the correct origin to access sessionStorage
-            fixture.Navigate($"{fixture.ServerPathBase}/");
-            browser.Equal("Hello", () => browser.Exists(By.TagName("h1")).Text);
-        }
+            var browser = fixture.Browser;
 
-        try
-        {
-            ((IJavaScriptExecutor)browser).ExecuteScript("sessionStorage.length");
-        }
-        catch (Exception ex)
-        {
-            throw new InvalidOperationException("Session storage not found. Ensure that the browser is on the correct origin by navigating to a page or by setting skipNavigation to false.", ex);
-        }
+            if (!skipNavigation)
+            {
+                NavigateToOrigin(fixture);
+            }
 
-        // This prevents test interference where suppression state from previous tests persists
-        CleanEnhancedNavigationSuppression(fixture);
+            try
+            {
+                ((IJavaScriptExecutor)browser).ExecuteScript("sessionStorage.length");
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException("Session storage not found. Ensure that the browser is on the correct origin by navigating to a page or by setting skipNavigation to false.", ex);
+            }
 
-        if (shouldSuppress)
-        {
             var testId = ((IJavaScriptExecutor)browser).ExecuteScript($"return sessionStorage.getItem('test-id')");
             if (testId is null || string.IsNullOrEmpty(testId as string))
             {
@@ -51,12 +46,26 @@ public static void SuppressEnhancedNavigation<TServerFixture>(ServerTestBase<TSe
         }
     }
 
-    public static void CleanEnhancedNavigationSuppression<TServerFixture>(ServerTestBase<TServerFixture> fixture)
+    public static void CleanEnhancedNavigationSuppression<TServerFixture>(ServerTestBase<TServerFixture> fixture, bool skipNavigation = false)
         where TServerFixture : ServerFixture
     {
         var browser = fixture.Browser;
 
-        // only tests that suppress enhanced navigation will have these items set, so it can throw
+        // First, ensure we're on the correct origin to access sessionStorage
+        try
+        {
+            // Check if we can access sessionStorage from current location
+            ((IJavaScriptExecutor)browser).ExecuteScript("sessionStorage.length");
+        }
+        catch
+        {
+            if (skipNavigation)
+            {
+                throw new InvalidOperationException("Session storage not found. Ensure that the browser is on the correct origin by navigating to a page or by setting skipNavigation to false.");
+            }
+            NavigateToOrigin(fixture);
+        }
+
         var testId = ((IJavaScriptExecutor)browser).ExecuteScript($"return sessionStorage.getItem('test-id')");
         if (testId is null || string.IsNullOrEmpty(testId as string))
         {
@@ -67,6 +76,14 @@ public static void CleanEnhancedNavigationSuppression<TServerFixture>(ServerTest
         ((IJavaScriptExecutor)browser).ExecuteScript($"sessionStorage.removeItem('suppress-enhanced-navigation-{testId}')");
     }
 
+    private static void NavigateToOrigin<TServerFixture>(ServerTestBase<TServerFixture> fixture)
+        where TServerFixture : ServerFixture
+    {
+        // Navigate to the test origin to ensure the browser is on the correct state to access sessionStorage
+        fixture.Navigate($"{fixture.ServerPathBase}/");
+        fixture.Browser.Equal("Hello", () => fixture.Browser.Exists(By.TagName("h1")).Text);
+    }
+
     private static string GrantTestId(IWebDriver browser)
     {
         var testId = Guid.NewGuid().ToString("N")[..8];

From d6eddc61b8ec5a759cd29a280bbdccfcb4b4de0d Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Mon, 25 Aug 2025 13:45:03 +0200
Subject: [PATCH 20/39] Feedback.

---
 .../E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
index d937c1972705..66d0c202a283 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
@@ -834,6 +834,7 @@ private void AssertEnhancedNavigation(bool useEnhancedNavigation, IWebElement el
     {
         bool enhancedNavigationDetected = false;
         string logging = "";
+        string isNavigationSuppressed = "";
         for (int i = 0; i < retryCount; i++)
         {
             try
@@ -856,10 +857,10 @@ private void AssertEnhancedNavigation(bool useEnhancedNavigation, IWebElement el
                 var suppressKey = $"suppress-enhanced-navigation-{testId}";
 
                 var enhancedNavAttached = ((IJavaScriptExecutor)Browser).ExecuteScript("return sessionStorage.getItem('blazor-enhanced-nav-attached');");
-                var suppressEnhancedNavigation = ((IJavaScriptExecutor)Browser).ExecuteScript($"return sessionStorage.getItem('{suppressKey}');");
+                isNavigationSuppressed = (string)((IJavaScriptExecutor)Browser).ExecuteScript($"return sessionStorage.getItem('{suppressKey}');");
 
                 logging += $"  suppressKey: {suppressKey}\n";
-                logging += $"  {suppressKey}: {suppressEnhancedNavigation}\n";
+                logging += $"  {suppressKey}: {isNavigationSuppressed}\n";
                 // Maybe the check was done too early to change the DOM ref, retry
             }
 
@@ -867,7 +868,6 @@ private void AssertEnhancedNavigation(bool useEnhancedNavigation, IWebElement el
         }
         string expectedNavigation = useEnhancedNavigation ? "enhanced navigation" : "full page load";
         string isStale = enhancedNavigationDetected ? "is not stale" : "is stale";
-        var isNavigationSuppressed = (string)((IJavaScriptExecutor)Browser).ExecuteScript("return sessionStorage.getItem('suppress-enhanced-navigation');");
         throw new Exception($"Expected to use {expectedNavigation} because 'suppress-enhanced-navigation' is set to {isNavigationSuppressed} but the element from previous path {isStale}. logging={logging}");
     }
 

From d5fae4b6f9bbdd1d0fe3da6986dfd2a0b1d8a8ec Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Mon, 25 Aug 2025 14:59:59 +0200
Subject: [PATCH 21/39] BasicTestApp did not have h1 "Hello" that we expect on
 cleanup. Fix it.

---
 .../ServerExecutionTests/CircuitGracefulTerminationTests.cs    | 2 +-
 src/Components/test/testassets/BasicTestApp/Index.razor        | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Components/test/E2ETest/ServerExecutionTests/CircuitGracefulTerminationTests.cs b/src/Components/test/E2ETest/ServerExecutionTests/CircuitGracefulTerminationTests.cs
index ff7e56f9a363..fb4eebb19427 100644
--- a/src/Components/test/E2ETest/ServerExecutionTests/CircuitGracefulTerminationTests.cs
+++ b/src/Components/test/E2ETest/ServerExecutionTests/CircuitGracefulTerminationTests.cs
@@ -40,7 +40,7 @@ protected override void InitializeAsyncCore()
     {
         Navigate(ServerPathBase);
         Browser.MountTestComponent<GracefulTermination>();
-        Browser.Equal("Graceful Termination", () => Browser.Exists(By.TagName("h1")).Text);
+        Browser.Equal("Graceful Termination", () => Browser.Exists(By.CssSelector("app h1")).Text);
 
         GracefulDisconnectCompletionSource = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
         Sink = _serverFixture.Host.Services.GetRequiredService<TestSink>();
diff --git a/src/Components/test/testassets/BasicTestApp/Index.razor b/src/Components/test/testassets/BasicTestApp/Index.razor
index 6e8d20b391a2..51537a0dbbaf 100644
--- a/src/Components/test/testassets/BasicTestApp/Index.razor
+++ b/src/Components/test/testassets/BasicTestApp/Index.razor
@@ -1,6 +1,9 @@
 @using Microsoft.AspNetCore.Components.Rendering
 @using System.Web
 @inject NavigationManager NavigationManager
+
+<h1>Hello</h1>
+
 <div id="test-selector">
     Select test:
     <select id="test-selector-select" @bind=SelectedComponentTypeName>

From b40fd892725c6db85b31f8ab82135f31aa039aa5 Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Mon, 25 Aug 2025 15:43:11 +0200
Subject: [PATCH 22/39] Tests that closed the browser do not have to clean the
 session storage.

---
 .../EnhancedNavigationTestUtil.cs             | 40 ++++++++++++-------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
index 41548893aa4a..3adb7bc937c2 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
@@ -51,29 +51,39 @@ public static void CleanEnhancedNavigationSuppression<TServerFixture>(ServerTest
     {
         var browser = fixture.Browser;
 
-        // First, ensure we're on the correct origin to access sessionStorage
         try
         {
-            // Check if we can access sessionStorage from current location
-            ((IJavaScriptExecutor)browser).ExecuteScript("sessionStorage.length");
-        }
-        catch
-        {
-            if (skipNavigation)
+            // First, ensure we're on the correct origin to access sessionStorage
+            try
+            {
+                // Check if we can access sessionStorage from current location
+                ((IJavaScriptExecutor)browser).ExecuteScript("sessionStorage.length");
+            }
+            catch
             {
-                throw new InvalidOperationException("Session storage not found. Ensure that the browser is on the correct origin by navigating to a page or by setting skipNavigation to false.");
+                if (skipNavigation)
+                {
+                    throw new InvalidOperationException("Session storage not found. Ensure that the browser is on the correct origin by navigating to a page or by setting skipNavigation to false.");
+                }
+                NavigateToOrigin(fixture);
             }
-            NavigateToOrigin(fixture);
-        }
 
-        var testId = ((IJavaScriptExecutor)browser).ExecuteScript($"return sessionStorage.getItem('test-id')");
-        if (testId is null || string.IsNullOrEmpty(testId as string))
+            var testId = ((IJavaScriptExecutor)browser).ExecuteScript($"return sessionStorage.getItem('test-id')");
+            if (testId is null || string.IsNullOrEmpty(testId as string))
+            {
+                return;
+            }
+
+            ((IJavaScriptExecutor)browser).ExecuteScript($"sessionStorage.removeItem('test-id')");
+            ((IJavaScriptExecutor)browser).ExecuteScript($"sessionStorage.removeItem('suppress-enhanced-navigation-{testId}')");
+        }
+        catch (WebDriverException ex) when (ex.Message.Contains("invalid session id"))
         {
+            // Browser session is no longer valid (e.g., browser was closed)
+            // Session storage is automatically cleared when browser closes, so cleanup is already done
+            // This is expected in some tests, so we silently return
             return;
         }
-
-        ((IJavaScriptExecutor)browser).ExecuteScript($"sessionStorage.removeItem('test-id')");
-        ((IJavaScriptExecutor)browser).ExecuteScript($"sessionStorage.removeItem('suppress-enhanced-navigation-{testId}')");
     }
 
     private static void NavigateToOrigin<TServerFixture>(ServerTestBase<TServerFixture> fixture)

From 20e56f4e7dd6b95e31b33eafc40471ced2e2d1f1 Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Mon, 25 Aug 2025 16:22:50 +0200
Subject: [PATCH 23/39] Another test needs a more specific selector.

---
 .../test/E2ETest/ServerExecutionTests/CircuitContextTest.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Components/test/E2ETest/ServerExecutionTests/CircuitContextTest.cs b/src/Components/test/E2ETest/ServerExecutionTests/CircuitContextTest.cs
index 91c2b580fe60..5ea32680e007 100644
--- a/src/Components/test/E2ETest/ServerExecutionTests/CircuitContextTest.cs
+++ b/src/Components/test/E2ETest/ServerExecutionTests/CircuitContextTest.cs
@@ -41,7 +41,7 @@ public void ComponentMethods_HaveCircuitContext_OnInitialPageLoad()
     // Internal for reuse in Blazor Web tests
     internal static void TestCircuitContextCore(IWebDriver browser)
     {
-        browser.Equal("Circuit Context", () => browser.Exists(By.TagName("h1")).Text);
+        browser.Equal("Circuit Context", () => browser.Exists(By.CssSelector("app h1")).Text);
 
         browser.Click(By.Id("trigger-click-event-button"));
 

From 57aedfb765cb8ee4f4740ae1701a70667fbcfe2d Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Mon, 25 Aug 2025 16:59:41 +0200
Subject: [PATCH 24/39] Fix `DragDrop_CanTrigger` that requires specific layout
 of elements on the index page.

---
 src/Components/test/testassets/BasicTestApp/Index.razor | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Components/test/testassets/BasicTestApp/Index.razor b/src/Components/test/testassets/BasicTestApp/Index.razor
index 51537a0dbbaf..bbe6fe794d69 100644
--- a/src/Components/test/testassets/BasicTestApp/Index.razor
+++ b/src/Components/test/testassets/BasicTestApp/Index.razor
@@ -2,9 +2,8 @@
 @using System.Web
 @inject NavigationManager NavigationManager
 
-<h1>Hello</h1>
-
 <div id="test-selector">
+    <h1 style="margin: 0; padding: 0; line-height: 1;">Hello</h1>
     Select test:
     <select id="test-selector-select" @bind=SelectedComponentTypeName>
         <option value="none">Choose...</option>

From 9a9a913e64f4ea4450f7d8f597fce12e4ccab521 Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Mon, 25 Aug 2025 17:00:26 +0200
Subject: [PATCH 25/39] Add logs in case of "Failed to execute script after 3
 retries." error.

---
 .../WebDriverExtensions/WebDriverExtensions.cs           | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/Components/test/E2ETest/Infrastructure/WebDriverExtensions/WebDriverExtensions.cs b/src/Components/test/E2ETest/Infrastructure/WebDriverExtensions/WebDriverExtensions.cs
index 34276e78613e..a5788a130a72 100644
--- a/src/Components/test/E2ETest/Infrastructure/WebDriverExtensions/WebDriverExtensions.cs
+++ b/src/Components/test/E2ETest/Infrastructure/WebDriverExtensions/WebDriverExtensions.cs
@@ -48,6 +48,8 @@ public static long GetElementPositionWithRetry(this IWebDriver browser, string e
         var jsExecutor = (IJavaScriptExecutor)browser;
         string script = GetFindPositionScript(elementId);
         browser.WaitForElementToBeVisible(By.Id(elementId));
+        string log = "";
+
         for (int i = 0; i < retryCount; i++)
         {
             try
@@ -57,15 +59,18 @@ public static long GetElementPositionWithRetry(this IWebDriver browser, string e
                 {
                     return (long)result;
                 }
+
+                log += $"Attempt {i + 1}: Script returned null. ";
             }
-            catch (OpenQA.Selenium.JavaScriptException)
+            catch (OpenQA.Selenium.JavaScriptException ex)
             {
                 // JavaScript execution failed, retry
+                log += $"Attempt {i + 1}: JavaScriptException - {ex.Message}. ";
             }
 
             Thread.Sleep(delayBetweenRetriesMs);
         }
 
-        throw new Exception($"Failed to execute script after {retryCount} retries.");
+        throw new Exception($"Failed to execute script to get position for element '{elementId}' after {retryCount} retries. Debug log: {log}");
     }
 }

From ea933f72a585adcd1383b6f965b2c9db35b1cc8f Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Mon, 25 Aug 2025 18:26:43 +0200
Subject: [PATCH 26/39] Avoid searching for just h1 tag, use specific ids.

---
 .../test/E2ETest/ServerExecutionTests/CircuitContextTest.cs     | 2 +-
 .../ServerExecutionTests/CircuitGracefulTerminationTests.cs     | 2 +-
 .../test/testassets/BasicTestApp/GracefulTermination.razor      | 2 +-
 .../Components.TestServer/CircuitContextComponent.razor         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Components/test/E2ETest/ServerExecutionTests/CircuitContextTest.cs b/src/Components/test/E2ETest/ServerExecutionTests/CircuitContextTest.cs
index 5ea32680e007..5fe0f8a2ee37 100644
--- a/src/Components/test/E2ETest/ServerExecutionTests/CircuitContextTest.cs
+++ b/src/Components/test/E2ETest/ServerExecutionTests/CircuitContextTest.cs
@@ -41,7 +41,7 @@ public void ComponentMethods_HaveCircuitContext_OnInitialPageLoad()
     // Internal for reuse in Blazor Web tests
     internal static void TestCircuitContextCore(IWebDriver browser)
     {
-        browser.Equal("Circuit Context", () => browser.Exists(By.CssSelector("app h1")).Text);
+        browser.Equal("Circuit Context", () => browser.Exists(By.Id("circuit-context-title")).Text);
 
         browser.Click(By.Id("trigger-click-event-button"));
 
diff --git a/src/Components/test/E2ETest/ServerExecutionTests/CircuitGracefulTerminationTests.cs b/src/Components/test/E2ETest/ServerExecutionTests/CircuitGracefulTerminationTests.cs
index fb4eebb19427..37ecf327872a 100644
--- a/src/Components/test/E2ETest/ServerExecutionTests/CircuitGracefulTerminationTests.cs
+++ b/src/Components/test/E2ETest/ServerExecutionTests/CircuitGracefulTerminationTests.cs
@@ -40,7 +40,7 @@ protected override void InitializeAsyncCore()
     {
         Navigate(ServerPathBase);
         Browser.MountTestComponent<GracefulTermination>();
-        Browser.Equal("Graceful Termination", () => Browser.Exists(By.CssSelector("app h1")).Text);
+        Browser.Equal("Graceful Termination", () => Browser.Exists(By.Id("graceful-termination-title")).Text);
 
         GracefulDisconnectCompletionSource = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
         Sink = _serverFixture.Host.Services.GetRequiredService<TestSink>();
diff --git a/src/Components/test/testassets/BasicTestApp/GracefulTermination.razor b/src/Components/test/testassets/BasicTestApp/GracefulTermination.razor
index 967775faa4bb..8109f027687f 100644
--- a/src/Components/test/testassets/BasicTestApp/GracefulTermination.razor
+++ b/src/Components/test/testassets/BasicTestApp/GracefulTermination.razor
@@ -1,6 +1,6 @@
 @inject NavigationManager navigationManager
 
-<h1>Graceful Termination</h1>
+<h1 id="graceful-termination-title">Graceful Termination</h1>
 
 <a href="mailto:test@example.com" id="mailto-link">Send Email</a>
 <a href="download" download id="download-href">Download Link</a>
diff --git a/src/Components/test/testassets/Components.TestServer/CircuitContextComponent.razor b/src/Components/test/testassets/Components.TestServer/CircuitContextComponent.razor
index 7a7b79e4f9f7..0daed1933fd5 100644
--- a/src/Components/test/testassets/Components.TestServer/CircuitContextComponent.razor
+++ b/src/Components/test/testassets/Components.TestServer/CircuitContextComponent.razor
@@ -5,7 +5,7 @@
 @inject IJSRuntime JS
 @inject TestCircuitContextAccessor CircuitContextAccessor
 
-<h1>Circuit Context</h1>
+<h1 id="circuit-context-title">Circuit Context</h1>
 
 <button id="trigger-click-event-button" type="button" @onclick="OnClickEvent">Trigger event</button>
 

From be882837885f03eca8dfd989fbd5257ec811770c Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Tue, 26 Aug 2025 12:56:31 +0200
Subject: [PATCH 27/39] Limit relying on JS execution for checking the element
 position + increase timeouts for landing page assert that can be too short
 once in every 20 runs.

---
 .../WebDriverExtensions.cs                    | 33 +++++++++----------
 .../EnhancedNavigationTest.cs                 |  4 +--
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/src/Components/test/E2ETest/Infrastructure/WebDriverExtensions/WebDriverExtensions.cs b/src/Components/test/E2ETest/Infrastructure/WebDriverExtensions/WebDriverExtensions.cs
index a5788a130a72..4b3a5f5214cd 100644
--- a/src/Components/test/E2ETest/Infrastructure/WebDriverExtensions/WebDriverExtensions.cs
+++ b/src/Components/test/E2ETest/Infrastructure/WebDriverExtensions/WebDriverExtensions.cs
@@ -3,15 +3,11 @@
 
 using OpenQA.Selenium;
 using OpenQA.Selenium.Support.UI;
-using System;
 
 namespace Microsoft.AspNetCore.Components.E2ETest;
 
 internal static class WebDriverExtensions
 {
-    private static string GetFindPositionScript(string elementId) =>
-        $"return Math.round(document.getElementById('{elementId}').getBoundingClientRect().top + window.scrollY);";
-
     public static void Navigate(this IWebDriver browser, Uri baseUri, string relativeUrl)
     {
         var absoluteUrl = new Uri(baseUri, relativeUrl);
@@ -45,32 +41,33 @@ public static void WaitForElementToBeVisible(this IWebDriver browser, By by, int
 
     public static long GetElementPositionWithRetry(this IWebDriver browser, string elementId, int retryCount = 3, int delayBetweenRetriesMs = 100)
     {
-        var jsExecutor = (IJavaScriptExecutor)browser;
-        string script = GetFindPositionScript(elementId);
-        browser.WaitForElementToBeVisible(By.Id(elementId));
         string log = "";
 
         for (int i = 0; i < retryCount; i++)
         {
             try
             {
-                var result = jsExecutor.ExecuteScript(script);
-                if (result != null)
-                {
-                    return (long)result;
-                }
+                browser.WaitForElementToBeVisible(By.Id(elementId));
+                var element = browser.FindElement(By.Id(elementId));
+                var elementLocation = element.Location.Y;
+
+                // Get scroll position using JavaScript (this is less likely to fail than element positioning)
+                var jsExecutor = (IJavaScriptExecutor)browser;
+                var scrollY = (long)jsExecutor.ExecuteScript("return window.scrollY");
 
-                log += $"Attempt {i + 1}: Script returned null. ";
+                return elementLocation + scrollY;
             }
-            catch (OpenQA.Selenium.JavaScriptException ex)
+            catch (Exception ex)
             {
-                // JavaScript execution failed, retry
-                log += $"Attempt {i + 1}: JavaScriptException - {ex.Message}. ";
+                log += $"Attempt {i + 1}: - {ex.Message}. ";
             }
 
-            Thread.Sleep(delayBetweenRetriesMs);
+            if (i < retryCount - 1)
+            {
+                Thread.Sleep(delayBetweenRetriesMs);
+            }
         }
 
-        throw new Exception($"Failed to execute script to get position for element '{elementId}' after {retryCount} retries. Debug log: {log}");
+        throw new Exception($"Failed to get position for element '{elementId}' after {retryCount} retries. Debug log: {log}");
     }
 }
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
index 66d0c202a283..c97da4c44911 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
@@ -874,14 +874,14 @@ private void AssertEnhancedNavigation(bool useEnhancedNavigation, IWebElement el
     private void AssertWeAreOnLandingPage()
     {
         string infoName = "test-info-1";
-        Browser.WaitForElementToBeVisible(By.Id(infoName), timeoutInSeconds: 20);
+        Browser.WaitForElementToBeVisible(By.Id(infoName), timeoutInSeconds: 30);
         Browser.Equal("Scroll tests landing page", () => Browser.Exists(By.Id(infoName)).Text);
     }
 
     private void AssertWeAreOnNextPage()
     {
         string infoName = "test-info-2";
-        Browser.WaitForElementToBeVisible(By.Id(infoName), timeoutInSeconds: 20);
+        Browser.WaitForElementToBeVisible(By.Id(infoName), timeoutInSeconds: 30);
         Browser.Equal("Scroll tests next page", () => Browser.Exists(By.Id(infoName)).Text);
     }
 

From 2afc2aec6f82fa94a7bbae261e1934c5e3660af8 Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Wed, 27 Aug 2025 09:37:33 +0200
Subject: [PATCH 28/39] Grant ID for each test on initialization. Change
 BinaryHttpClientTest inheritance to ServerTestBase, so that it calls ID
 granting method as well.

---
 .../E2ETest/Infrastructure/ServerTestBase.cs  |  5 +++
 .../EnhancedNavigationTestUtil.cs             | 35 +++++++++++++------
 .../E2ETest/Tests/BinaryHttpClientTest.cs     |  8 +++--
 src/Shared/E2ETesting/BrowserTestBase.cs      |  5 +++
 4 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs b/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs
index 315b80cd2248..988faa27f3f2 100644
--- a/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs
+++ b/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs
@@ -44,4 +44,9 @@ protected override void InitializeAsyncCore()
         // Make sure each test starts clean.
         ((IJavaScriptExecutor)Browser).ExecuteScript("console.clear()");
     }
+
+    protected override void GrantTestId()
+    {
+        EnhancedNavigationTestUtil.GrantTestId(this);
+    }
 }
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
index 3adb7bc937c2..8908d73e3767 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
@@ -22,20 +22,12 @@ public static void SuppressEnhancedNavigation<TServerFixture>(ServerTestBase<TSe
             {
                 NavigateToOrigin(fixture);
             }
-
-            try
-            {
-                ((IJavaScriptExecutor)browser).ExecuteScript("sessionStorage.length");
-            }
-            catch (Exception ex)
-            {
-                throw new InvalidOperationException("Session storage not found. Ensure that the browser is on the correct origin by navigating to a page or by setting skipNavigation to false.", ex);
-            }
+            AssertSessionStorageAvailable(browser);
 
             var testId = ((IJavaScriptExecutor)browser).ExecuteScript($"return sessionStorage.getItem('test-id')");
             if (testId is null || string.IsNullOrEmpty(testId as string))
             {
-                testId = GrantTestId(browser);
+                throw new InvalidOperationException("Test ID not found in sessionStorage. Make sure your test class grants it in InitializeAsync.");
             }
 
             ((IJavaScriptExecutor)browser).ExecuteScript($"sessionStorage.setItem('suppress-enhanced-navigation-{testId}', 'true')");
@@ -46,6 +38,27 @@ public static void SuppressEnhancedNavigation<TServerFixture>(ServerTestBase<TSe
         }
     }
 
+    public static void AssertSessionStorageAvailable(IWebDriver browser)
+    {
+        try
+        {
+            ((IJavaScriptExecutor)browser).ExecuteScript("sessionStorage.length");
+        }
+        catch (Exception ex)
+        {
+            throw new InvalidOperationException("Session storage not found. Ensure that the browser is on the correct origin by navigating to a page or by setting skipNavigation to false.", ex);
+        }
+
+    }
+
+    public static void GrantTestId<TServerFixture>(ServerTestBase<TServerFixture> fixture)
+        where TServerFixture : ServerFixture
+    {
+        NavigateToOrigin(fixture);
+        AssertSessionStorageAvailable(fixture.Browser);
+        GrantTestIdCore(fixture.Browser);
+    }
+
     public static void CleanEnhancedNavigationSuppression<TServerFixture>(ServerTestBase<TServerFixture> fixture, bool skipNavigation = false)
         where TServerFixture : ServerFixture
     {
@@ -94,7 +107,7 @@ private static void NavigateToOrigin<TServerFixture>(ServerTestBase<TServerFixtu
         fixture.Browser.Equal("Hello", () => fixture.Browser.Exists(By.TagName("h1")).Text);
     }
 
-    private static string GrantTestId(IWebDriver browser)
+    private static string GrantTestIdCore(IWebDriver browser)
     {
         var testId = Guid.NewGuid().ToString("N")[..8];
         ((IJavaScriptExecutor)browser).ExecuteScript($"sessionStorage.setItem('test-id', '{testId}')");
diff --git a/src/Components/test/E2ETest/Tests/BinaryHttpClientTest.cs b/src/Components/test/E2ETest/Tests/BinaryHttpClientTest.cs
index a8b06bcab09a..0fbcb98fca4e 100644
--- a/src/Components/test/E2ETest/Tests/BinaryHttpClientTest.cs
+++ b/src/Components/test/E2ETest/Tests/BinaryHttpClientTest.cs
@@ -2,7 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using BasicTestApp.HttpClientTest;
+using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
+using Microsoft.AspNetCore.Components.E2ETests.ServerRenderingTests;
 using Microsoft.AspNetCore.E2ETesting;
 using OpenQA.Selenium;
 using TestServer;
@@ -10,7 +12,7 @@
 
 namespace Microsoft.AspNetCore.Components.E2ETest.Tests;
 
-public class BinaryHttpClientTest : BrowserTestBase,
+public class BinaryHttpClientTest : ServerTestBase<AspNetSiteServerFixture>,
     IClassFixture<BasicTestAppServerSiteFixture<CorsStartup>>,
     IClassFixture<BlazorWasmTestAppFixture<BasicTestApp.Program>>
 {
@@ -23,11 +25,13 @@ public class BinaryHttpClientTest : BrowserTestBase,
 
     public BinaryHttpClientTest(
         BrowserFixture browserFixture,
+        AspNetSiteServerFixture serverFixture,
         BlazorWasmTestAppFixture<BasicTestApp.Program> devHostServerFixture,
         BasicTestAppServerSiteFixture<CorsStartup> apiServerFixture,
         ITestOutputHelper output)
-        : base(browserFixture, output)
+        : base(browserFixture, serverFixture, output)
     {
+        serverFixture.BuildWebHostMethod = Program.BuildWebHost<CorsStartup>;
         _devHostServerFixture = devHostServerFixture;
         _devHostServerFixture.PathBase = "/subdir";
         _apiServerFixture = apiServerFixture;
diff --git a/src/Shared/E2ETesting/BrowserTestBase.cs b/src/Shared/E2ETesting/BrowserTestBase.cs
index dcd840cc6d10..82be99df340f 100644
--- a/src/Shared/E2ETesting/BrowserTestBase.cs
+++ b/src/Shared/E2ETesting/BrowserTestBase.cs
@@ -62,6 +62,7 @@ public virtual Task InitializeAsync()
     public virtual Task InitializeAsync(string isolationContext)
     {
         InitializeBrowser(isolationContext);
+        GrantTestId();
         InitializeAsyncCore();
         return Task.CompletedTask;
     }
@@ -70,6 +71,10 @@ protected virtual void InitializeAsyncCore()
     {
     }
 
+    protected virtual void GrantTestId()
+    {
+    }
+
     protected void InitializeBrowser(string isolationContext)
     {
         try

From cf2cef538c01c120b2b2e41131ecaa3a52476901 Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Thu, 28 Aug 2025 13:10:46 +0200
Subject: [PATCH 29/39] Try on CI if tests run with small or big window (toggle
 bar has problems locally because it runs in a small window).

---
 .../testassets/StandaloneApp/Pages/Index.razor            | 2 +-
 .../test/E2ETest/Infrastructure/ServerTestBase.cs         | 8 ++++++--
 .../ServerRenderingTests/EnhancedNavigationTestUtil.cs    | 2 +-
 src/Components/test/E2ETest/Tests/StandaloneAppTest.cs    | 2 +-
 src/Components/test/testassets/BasicTestApp/Index.razor   | 2 +-
 .../RazorComponents/Pages/Index.razor                     | 2 +-
 6 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/Components/WebAssembly/testassets/StandaloneApp/Pages/Index.razor b/src/Components/WebAssembly/testassets/StandaloneApp/Pages/Index.razor
index 16dac3192520..71201aa021ee 100644
--- a/src/Components/WebAssembly/testassets/StandaloneApp/Pages/Index.razor
+++ b/src/Components/WebAssembly/testassets/StandaloneApp/Pages/Index.razor
@@ -1,5 +1,5 @@
 @page "/"
 
-<h1>Hello, world!</h1>
+<h1 id="session-storage-anchor">Hello, world!</h1>
 
 Welcome to your new app.
diff --git a/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs b/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs
index 988faa27f3f2..f0a06cc90538 100644
--- a/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs
+++ b/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs
@@ -5,6 +5,7 @@
 using Microsoft.AspNetCore.Components.E2ETests.ServerRenderingTests;
 using Microsoft.AspNetCore.E2ETesting;
 using OpenQA.Selenium;
+using OpenQA.Selenium.BiDi.Communication;
 using Xunit.Abstractions;
 
 namespace Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
@@ -14,17 +15,20 @@ public abstract class ServerTestBase<TServerFixture>
     IClassFixture<TServerFixture>
     where TServerFixture : ServerFixture
 {
-    public string ServerPathBase => "/subdir";
+    private string _serverPathBase;
+    public string ServerPathBase => _serverPathBase;
 
     protected readonly TServerFixture _serverFixture;
 
     public ServerTestBase(
         BrowserFixture browserFixture,
         TServerFixture serverFixture,
-        ITestOutputHelper output)
+        ITestOutputHelper output,
+        string serverPathBase = "/subdir")
         : base(browserFixture, output)
     {
         _serverFixture = serverFixture;
+        _serverPathBase = serverPathBase;
     }
 
     public void Navigate(string relativeUrl)
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
index 8908d73e3767..9a7583a5d398 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
@@ -104,7 +104,7 @@ private static void NavigateToOrigin<TServerFixture>(ServerTestBase<TServerFixtu
     {
         // Navigate to the test origin to ensure the browser is on the correct state to access sessionStorage
         fixture.Navigate($"{fixture.ServerPathBase}/");
-        fixture.Browser.Equal("Hello", () => fixture.Browser.Exists(By.TagName("h1")).Text);
+        fixture.Browser.Exists(By.Id("session-storage-anchor"));
     }
 
     private static string GrantTestIdCore(IWebDriver browser)
diff --git a/src/Components/test/E2ETest/Tests/StandaloneAppTest.cs b/src/Components/test/E2ETest/Tests/StandaloneAppTest.cs
index abdc012a2482..233cc1ace533 100644
--- a/src/Components/test/E2ETest/Tests/StandaloneAppTest.cs
+++ b/src/Components/test/E2ETest/Tests/StandaloneAppTest.cs
@@ -16,7 +16,7 @@ public StandaloneAppTest(
         BrowserFixture browserFixture,
         BlazorWasmTestAppFixture<StandaloneApp.Program> serverFixture,
         ITestOutputHelper output)
-        : base(browserFixture, serverFixture, output)
+        : base(browserFixture, serverFixture, output, "")
     {
     }
 
diff --git a/src/Components/test/testassets/BasicTestApp/Index.razor b/src/Components/test/testassets/BasicTestApp/Index.razor
index bbe6fe794d69..d17a04ca016a 100644
--- a/src/Components/test/testassets/BasicTestApp/Index.razor
+++ b/src/Components/test/testassets/BasicTestApp/Index.razor
@@ -3,7 +3,7 @@
 @inject NavigationManager NavigationManager
 
 <div id="test-selector">
-    <h1 style="margin: 0; padding: 0; line-height: 1;">Hello</h1>
+    <h1 id="session-storage-anchor" style="margin: 0; padding: 0; line-height: 1;">Hello</h1>
     Select test:
     <select id="test-selector-select" @bind=SelectedComponentTypeName>
         <option value="none">Choose...</option>
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Index.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Index.razor
index 81020bd258ed..cd6f38b6f2e5 100644
--- a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Index.razor
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Index.razor
@@ -2,6 +2,6 @@
 
 <PageTitle>Home</PageTitle>
 
-<h1>Hello</h1>
+<h1 id="session-storage-anchor">Hello</h1>
 
 <p>This is a Razor Component endpoint.</p>

From 81744433dc49d34b850ed7f29bdaf4cdf78db1f2 Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Fri, 29 Aug 2025 18:55:19 +0200
Subject: [PATCH 30/39] Fix failing tests.

---
 .../testassets/CustomBasePathApp/wwwroot/index.html           | 1 +
 .../WebAssembly/testassets/HostedInAspNet.Client/Home.razor   | 2 +-
 .../WebAssembly/testassets/Wasm.Prerendered.Client/App.razor  | 2 ++
 .../benchmarkapps/Wasm.Performance/TestApp/wwwroot/index.html | 1 +
 .../ServerExecutionTests/ComponentWithParametersTest.cs       | 2 +-
 .../ServerExecutionTests/HeadModificationPrerenderingTest.cs  | 2 +-
 .../ServerExecutionTests/MultipleRootComponentsTest.cs        | 2 +-
 .../test/E2ETest/ServerExecutionTests/PrerenderingTest.cs     | 2 +-
 .../test/E2ETest/ServerExecutionTests/ServerTransportsTest.cs | 2 +-
 .../E2ETest/Tests/ClientRenderingMultpleComponentsTest.cs     | 2 +-
 src/Components/test/E2ETest/Tests/ClientSideHostingTest.cs    | 2 +-
 .../test/E2ETest/Tests/HostedInAlternativeBasePathTest.cs     | 2 +-
 src/Components/test/E2ETest/Tests/HostedInAspNetTest.cs       | 2 +-
 src/Components/test/E2ETest/Tests/MultipleHostedAppTest.cs    | 4 ++--
 src/Components/test/E2ETest/Tests/PerformanceTest.cs          | 2 +-
 src/Components/test/E2ETest/Tests/SaveStateTest.cs            | 2 +-
 .../test/E2ETest/Tests/WebAssemblyPrerenderedTest.cs          | 2 +-
 .../test/testassets/BasicTestApp/HeadModification.razor       | 3 ++-
 .../Pages/Client/MultipleComponents.cshtml                    | 1 +
 .../Components.TestServer/Pages/MultipleComponents.cshtml     | 1 +
 .../Components.TestServer/Pages/PrerenderedHost.cshtml        | 1 +
 .../testassets/Components.TestServer/Pages/SaveState.cshtml   | 1 +
 .../RazorComponents/NamedFormContextNoFormContextApp.razor    | 1 +
 .../RazorComponents/RemoteAuthenticationApp.razor             | 1 +
 src/Components/test/testassets/GlobalizationWasmApp/App.razor | 2 ++
 25 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/src/Components/WebAssembly/testassets/CustomBasePathApp/wwwroot/index.html b/src/Components/WebAssembly/testassets/CustomBasePathApp/wwwroot/index.html
index 73ab907e443b..a5767e9beff8 100644
--- a/src/Components/WebAssembly/testassets/CustomBasePathApp/wwwroot/index.html
+++ b/src/Components/WebAssembly/testassets/CustomBasePathApp/wwwroot/index.html
@@ -9,6 +9,7 @@
 </head>
 <body>
     <app>Loading...</app>
+    <p id="session-storage-anchor"></p>
     <script src="_framework/blazor.webassembly.js"></script>
 </body>
 </html>
diff --git a/src/Components/WebAssembly/testassets/HostedInAspNet.Client/Home.razor b/src/Components/WebAssembly/testassets/HostedInAspNet.Client/Home.razor
index 0ad1ea275e55..4b376bf4f1bd 100644
--- a/src/Components/WebAssembly/testassets/HostedInAspNet.Client/Home.razor
+++ b/src/Components/WebAssembly/testassets/HostedInAspNet.Client/Home.razor
@@ -1 +1 @@
-<h1>Hello, world!</h1>
+<h1 id="session-storage-anchor">Hello, world!</h1>
diff --git a/src/Components/WebAssembly/testassets/Wasm.Prerendered.Client/App.razor b/src/Components/WebAssembly/testassets/Wasm.Prerendered.Client/App.razor
index 5180131cb3d1..ebf677bd33aa 100644
--- a/src/Components/WebAssembly/testassets/Wasm.Prerendered.Client/App.razor
+++ b/src/Components/WebAssembly/testassets/Wasm.Prerendered.Client/App.razor
@@ -2,6 +2,8 @@
 
 <PageTitle>Current count: @_counter</PageTitle>
 
+<p id="session-storage-anchor"></p>
+
 <p>
     <span>Current count: @_counter</span><br>
     <button id="increment-count" @onclick="IncrementCounter">Increment count</button>
diff --git a/src/Components/benchmarkapps/Wasm.Performance/TestApp/wwwroot/index.html b/src/Components/benchmarkapps/Wasm.Performance/TestApp/wwwroot/index.html
index 13bbb314fe6a..dc1b7ab0f703 100644
--- a/src/Components/benchmarkapps/Wasm.Performance/TestApp/wwwroot/index.html
+++ b/src/Components/benchmarkapps/Wasm.Performance/TestApp/wwwroot/index.html
@@ -7,6 +7,7 @@
     <link href="benchmarks/lib/minibench/style.css" rel="stylesheet" />
 </head>
 <body style="overflow: scroll;">
+    <p id="session-storage-anchor"></p>
     <div class="container" id="display"></div>
     <p class="container px-3">
         <a href="blazor-frame.html">View benchmark app ⮕</a>
diff --git a/src/Components/test/E2ETest/ServerExecutionTests/ComponentWithParametersTest.cs b/src/Components/test/E2ETest/ServerExecutionTests/ComponentWithParametersTest.cs
index 1e9cf7fcbe22..102854529a74 100644
--- a/src/Components/test/E2ETest/ServerExecutionTests/ComponentWithParametersTest.cs
+++ b/src/Components/test/E2ETest/ServerExecutionTests/ComponentWithParametersTest.cs
@@ -16,7 +16,7 @@ public ComponentWithParametersTest(
         BrowserFixture browserFixture,
         BasicTestAppServerSiteFixture<PrerenderedStartup> serverFixture,
         ITestOutputHelper output)
-        : base(browserFixture, serverFixture, output)
+        : base(browserFixture, serverFixture, output, serverPathBase: "/prerendered")
     {
     }
 
diff --git a/src/Components/test/E2ETest/ServerExecutionTests/HeadModificationPrerenderingTest.cs b/src/Components/test/E2ETest/ServerExecutionTests/HeadModificationPrerenderingTest.cs
index 759a67070ebf..95d57432ee10 100644
--- a/src/Components/test/E2ETest/ServerExecutionTests/HeadModificationPrerenderingTest.cs
+++ b/src/Components/test/E2ETest/ServerExecutionTests/HeadModificationPrerenderingTest.cs
@@ -16,7 +16,7 @@ public HeadModificationPrerenderingTest(
         BrowserFixture browserFixture,
         BasicTestAppServerSiteFixture<DeferredComponentContentStartup> serverFixture,
         ITestOutputHelper output)
-        : base(browserFixture, serverFixture, output)
+        : base(browserFixture, serverFixture, output, serverPathBase: "/deferred-component-content")
     {
     }
 
diff --git a/src/Components/test/E2ETest/ServerExecutionTests/MultipleRootComponentsTest.cs b/src/Components/test/E2ETest/ServerExecutionTests/MultipleRootComponentsTest.cs
index 5d1575c6ab59..6e4092cd43e7 100644
--- a/src/Components/test/E2ETest/ServerExecutionTests/MultipleRootComponentsTest.cs
+++ b/src/Components/test/E2ETest/ServerExecutionTests/MultipleRootComponentsTest.cs
@@ -20,7 +20,7 @@ public MultipleComponentsTest(
         BrowserFixture browserFixture,
         BasicTestAppServerSiteFixture<MultipleComponents> serverFixture,
         ITestOutputHelper output)
-        : base(browserFixture, serverFixture, output)
+        : base(browserFixture, serverFixture, output, serverPathBase: "/multiple-components")
     {
     }
 
diff --git a/src/Components/test/E2ETest/ServerExecutionTests/PrerenderingTest.cs b/src/Components/test/E2ETest/ServerExecutionTests/PrerenderingTest.cs
index 3de6df8da5db..f7279379531c 100644
--- a/src/Components/test/E2ETest/ServerExecutionTests/PrerenderingTest.cs
+++ b/src/Components/test/E2ETest/ServerExecutionTests/PrerenderingTest.cs
@@ -19,7 +19,7 @@ public PrerenderingTest(
         BrowserFixture browserFixture,
         BasicTestAppServerSiteFixture<PrerenderedStartup> serverFixture,
         ITestOutputHelper output)
-        : base(browserFixture, serverFixture, output)
+        : base(browserFixture, serverFixture, output, serverPathBase: "/prerendered")
     {
     }
 
diff --git a/src/Components/test/E2ETest/ServerExecutionTests/ServerTransportsTest.cs b/src/Components/test/E2ETest/ServerExecutionTests/ServerTransportsTest.cs
index ab43e2e5b514..7d56437fb166 100644
--- a/src/Components/test/E2ETest/ServerExecutionTests/ServerTransportsTest.cs
+++ b/src/Components/test/E2ETest/ServerExecutionTests/ServerTransportsTest.cs
@@ -16,7 +16,7 @@ public ServerTransportsTest(
         BrowserFixture browserFixture,
         BasicTestAppServerSiteFixture<TransportsServerStartup> serverFixture,
         ITestOutputHelper output)
-        : base(browserFixture, serverFixture, output)
+        : base(browserFixture, serverFixture, output, serverPathBase: "/defaultTransport")
     {
     }
 
diff --git a/src/Components/test/E2ETest/Tests/ClientRenderingMultpleComponentsTest.cs b/src/Components/test/E2ETest/Tests/ClientRenderingMultpleComponentsTest.cs
index 5492d8bb8cdc..02d07e08e67d 100644
--- a/src/Components/test/E2ETest/Tests/ClientRenderingMultpleComponentsTest.cs
+++ b/src/Components/test/E2ETest/Tests/ClientRenderingMultpleComponentsTest.cs
@@ -19,7 +19,7 @@ public ClientRenderingMultpleComponentsTest(
         BrowserFixture browserFixture,
         BasicTestAppServerSiteFixture<MultipleComponents> serverFixture,
         ITestOutputHelper output)
-        : base(browserFixture, serverFixture, output)
+        : base(browserFixture, serverFixture, output, serverPathBase: "/Client/multiple-components")
     {
     }
 
diff --git a/src/Components/test/E2ETest/Tests/ClientSideHostingTest.cs b/src/Components/test/E2ETest/Tests/ClientSideHostingTest.cs
index 406a38c43d36..642e840167ac 100644
--- a/src/Components/test/E2ETest/Tests/ClientSideHostingTest.cs
+++ b/src/Components/test/E2ETest/Tests/ClientSideHostingTest.cs
@@ -20,7 +20,7 @@ public ClientSideHostingTest(
         BrowserFixture browserFixture,
         BasicTestAppServerSiteFixture<TestServer.StartupWithMapFallbackToClientSideBlazor> serverFixture,
         ITestOutputHelper output)
-        : base(browserFixture, serverFixture, output)
+        : base(browserFixture, serverFixture, output, serverPathBase: "/subdir/filepath")
     {
     }
 
diff --git a/src/Components/test/E2ETest/Tests/HostedInAlternativeBasePathTest.cs b/src/Components/test/E2ETest/Tests/HostedInAlternativeBasePathTest.cs
index df1cbaecc556..3472412bb26e 100644
--- a/src/Components/test/E2ETest/Tests/HostedInAlternativeBasePathTest.cs
+++ b/src/Components/test/E2ETest/Tests/HostedInAlternativeBasePathTest.cs
@@ -15,7 +15,7 @@ public HostedInAlternativeBasePathTest(
         BrowserFixture browserFixture,
         AspNetSiteServerFixture serverFixture,
         ITestOutputHelper output)
-        : base(browserFixture, serverFixture, output)
+        : base(browserFixture, serverFixture, output, serverPathBase: "/app")
     {
         serverFixture.AdditionalArguments.AddRange(new[] { "--UseAlternativeBasePath", "true" });
         serverFixture.BuildWebHostMethod = HostedInAspNet.Server.Program.BuildWebHost;
diff --git a/src/Components/test/E2ETest/Tests/HostedInAspNetTest.cs b/src/Components/test/E2ETest/Tests/HostedInAspNetTest.cs
index 8f6e1775990c..462acbf88454 100644
--- a/src/Components/test/E2ETest/Tests/HostedInAspNetTest.cs
+++ b/src/Components/test/E2ETest/Tests/HostedInAspNetTest.cs
@@ -15,7 +15,7 @@ public HostedInAspNetTest(
         BrowserFixture browserFixture,
         AspNetSiteServerFixture serverFixture,
         ITestOutputHelper output)
-        : base(browserFixture, serverFixture, output)
+        : base(browserFixture, serverFixture, output, serverPathBase: "")
     {
         serverFixture.BuildWebHostMethod = HostedInAspNet.Server.Program.BuildWebHost;
         serverFixture.Environment = AspNetEnvironment.Development;
diff --git a/src/Components/test/E2ETest/Tests/MultipleHostedAppTest.cs b/src/Components/test/E2ETest/Tests/MultipleHostedAppTest.cs
index feee1434d50d..fb4399b81945 100644
--- a/src/Components/test/E2ETest/Tests/MultipleHostedAppTest.cs
+++ b/src/Components/test/E2ETest/Tests/MultipleHostedAppTest.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
@@ -15,7 +15,7 @@ public MultipleHostedAppTest(
         BrowserFixture browserFixture,
         AspNetSiteServerFixture serverFixture,
         ITestOutputHelper output)
-        : base(browserFixture, serverFixture, output)
+        : base(browserFixture, serverFixture, output, serverPathBase: "")
     {
         serverFixture.AdditionalArguments.AddRange(new[] { "--MapAllApps", "true" });
         serverFixture.BuildWebHostMethod = HostedInAspNet.Server.Program.BuildWebHost;
diff --git a/src/Components/test/E2ETest/Tests/PerformanceTest.cs b/src/Components/test/E2ETest/Tests/PerformanceTest.cs
index c237c8fd4aa6..2ae8f73ca552 100644
--- a/src/Components/test/E2ETest/Tests/PerformanceTest.cs
+++ b/src/Components/test/E2ETest/Tests/PerformanceTest.cs
@@ -16,7 +16,7 @@ public PerformanceTest(
         BrowserFixture browserFixture,
         BlazorWasmTestAppFixture<Wasm.Performance.TestApp.Program> serverFixture,
         ITestOutputHelper output)
-        : base(browserFixture, serverFixture, output)
+        : base(browserFixture, serverFixture, output, serverPathBase: "")
     {
     }
 
diff --git a/src/Components/test/E2ETest/Tests/SaveStateTest.cs b/src/Components/test/E2ETest/Tests/SaveStateTest.cs
index 680b030c32c5..70de85b0d9f7 100644
--- a/src/Components/test/E2ETest/Tests/SaveStateTest.cs
+++ b/src/Components/test/E2ETest/Tests/SaveStateTest.cs
@@ -18,7 +18,7 @@ public SaveStateTest(
         BrowserFixture browserFixture,
         AspNetSiteServerFixture serverFixture,
         ITestOutputHelper output)
-        : base(browserFixture, serverFixture, output)
+        : base(browserFixture, serverFixture, output, "save-state")
     {
         serverFixture.BuildWebHostMethod = Program.BuildWebHost<SaveState>;
         serverFixture.Environment = AspNetEnvironment.Development;
diff --git a/src/Components/test/E2ETest/Tests/WebAssemblyPrerenderedTest.cs b/src/Components/test/E2ETest/Tests/WebAssemblyPrerenderedTest.cs
index 18869083cf0f..09f1adfc67cd 100644
--- a/src/Components/test/E2ETest/Tests/WebAssemblyPrerenderedTest.cs
+++ b/src/Components/test/E2ETest/Tests/WebAssemblyPrerenderedTest.cs
@@ -15,7 +15,7 @@ public WebAssemblyPrerenderedTest(
         BrowserFixture browserFixture,
         TrimmingServerFixture<Wasm.Prerendered.Server.Startup> serverFixture,
         ITestOutputHelper output)
-        : base(browserFixture, serverFixture, output)
+        : base(browserFixture, serverFixture, output, serverPathBase: "")
     {
         serverFixture.Environment = AspNetEnvironment.Development;
     }
diff --git a/src/Components/test/testassets/BasicTestApp/HeadModification.razor b/src/Components/test/testassets/BasicTestApp/HeadModification.razor
index aeca2f88d0c4..f0fc12da8a7d 100644
--- a/src/Components/test/testassets/BasicTestApp/HeadModification.razor
+++ b/src/Components/test/testassets/BasicTestApp/HeadModification.razor
@@ -1,4 +1,5 @@
-<h3>Head modification</h3>
+<p id="session-storage-anchor"></p>
+<h3>Head modification</h3>
 
 <p>
 	Title modification
diff --git a/src/Components/test/testassets/Components.TestServer/Pages/Client/MultipleComponents.cshtml b/src/Components/test/testassets/Components.TestServer/Pages/Client/MultipleComponents.cshtml
index 0f7078e0e603..5a91eadaaa41 100644
--- a/src/Components/test/testassets/Components.TestServer/Pages/Client/MultipleComponents.cshtml
+++ b/src/Components/test/testassets/Components.TestServer/Pages/Client/MultipleComponents.cshtml
@@ -5,6 +5,7 @@
     Layout = "./MultipleComponentsLayout.cshtml";
 }
 
+<p id="session-storage-anchor"></p>
 
 @(await Html.RenderComponentAsync<GreeterComponent>(RenderMode.WebAssemblyPrerendered))
 @(await Html.RenderComponentAsync<GreeterComponent>(RenderMode.WebAssembly))
diff --git a/src/Components/test/testassets/Components.TestServer/Pages/MultipleComponents.cshtml b/src/Components/test/testassets/Components.TestServer/Pages/MultipleComponents.cshtml
index dff3093166ba..a3ab97a4f3d0 100644
--- a/src/Components/test/testassets/Components.TestServer/Pages/MultipleComponents.cshtml
+++ b/src/Components/test/testassets/Components.TestServer/Pages/MultipleComponents.cshtml
@@ -5,6 +5,7 @@
     Layout = "./MultipleComponentsLayout.cshtml";
 }
 
+<p id="session-storage-anchor"></p>
 
 @(await Html.RenderComponentAsync<GreeterComponent>(RenderMode.ServerPrerendered))
 @(await Html.RenderComponentAsync<GreeterComponent>(RenderMode.Server))
diff --git a/src/Components/test/testassets/Components.TestServer/Pages/PrerenderedHost.cshtml b/src/Components/test/testassets/Components.TestServer/Pages/PrerenderedHost.cshtml
index ff2d847d5bf1..6eada78e02d7 100644
--- a/src/Components/test/testassets/Components.TestServer/Pages/PrerenderedHost.cshtml
+++ b/src/Components/test/testassets/Components.TestServer/Pages/PrerenderedHost.cshtml
@@ -8,6 +8,7 @@
     <base href="~/" />
 </head>
 <body>
+    <p id="session-storage-anchor"></p>
     <app><component type="typeof(TestRouterWithLazyAssembly)" render-mode="ServerPrerendered" /></app>
 
     @*
diff --git a/src/Components/test/testassets/Components.TestServer/Pages/SaveState.cshtml b/src/Components/test/testassets/Components.TestServer/Pages/SaveState.cshtml
index 8df0fb304427..faaa9678ba41 100644
--- a/src/Components/test/testassets/Components.TestServer/Pages/SaveState.cshtml
+++ b/src/Components/test/testassets/Components.TestServer/Pages/SaveState.cshtml
@@ -23,6 +23,7 @@
     @* This page is used to validate the ability to preserve and restore the state of components in Blazor server and WebAssembly. *@
 </head>
 <body>
+    <p id="session-storage-anchor"></p>
     @if (script == "client")
     {
         @* This is here to keep BasicTestApp.Program.cs happy *@
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/NamedFormContextNoFormContextApp.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/NamedFormContextNoFormContextApp.razor
index fc8a291d9821..c5650956e7c4 100644
--- a/src/Components/test/testassets/Components.TestServer/RazorComponents/NamedFormContextNoFormContextApp.razor
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/NamedFormContextNoFormContextApp.razor
@@ -9,6 +9,7 @@
 </head>
 <body>
     <h1 id="ready">Form test cases</h1>
+    <p id="session-storage-anchor"></p>
     <NamedFormContextNoFormContextLayout />
     <script src="@Assets["_framework/blazor.web.js"]" suppress-error="BL9992"></script>
 </body>
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/RemoteAuthenticationApp.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/RemoteAuthenticationApp.razor
index c8f89e587f8f..f8a390a764b4 100644
--- a/src/Components/test/testassets/Components.TestServer/RazorComponents/RemoteAuthenticationApp.razor
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/RemoteAuthenticationApp.razor
@@ -9,6 +9,7 @@
 </head>
 
 <body>
+    <p id="session-storage-anchor"></p>
     <Components.WasmRemoteAuthentication.Routes @rendermode="new InteractiveWebAssemblyRenderMode(prerender: false)" />
     <script src="@Assets["_framework/blazor.web.js"]" autostart="false"></script>
     <script src="_content/Microsoft.AspNetCore.Components.WebAssembly.Authentication/AuthenticationService.js"></script>
diff --git a/src/Components/test/testassets/GlobalizationWasmApp/App.razor b/src/Components/test/testassets/GlobalizationWasmApp/App.razor
index 8ee3c33fdcb1..6707e5396dd1 100644
--- a/src/Components/test/testassets/GlobalizationWasmApp/App.razor
+++ b/src/Components/test/testassets/GlobalizationWasmApp/App.razor
@@ -1,6 +1,8 @@
 @using System.Globalization
 @inject Microsoft.Extensions.Localization.IStringLocalizer<App> Loc
 
+<p id="session-storage-anchor"></p>
+
 <p>App's culture: <span id="culture">@CultureInfo.CurrentCulture</span></p>
 
 <p>DateTime: <span id="dateTime">@(new DateTime(2020, 09, 02))</span></p>

From 4e9ff7343dcf335aee125ceb4eaf986449051950 Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Sat, 30 Aug 2025 08:56:07 +0200
Subject: [PATCH 31/39] Revert "Fix failing tests."

This reverts commit 6dcfd16fccfbb593b942c437b3ad101077f19563.
---
 .../testassets/CustomBasePathApp/wwwroot/index.html           | 1 -
 .../WebAssembly/testassets/HostedInAspNet.Client/Home.razor   | 2 +-
 .../WebAssembly/testassets/Wasm.Prerendered.Client/App.razor  | 2 --
 .../benchmarkapps/Wasm.Performance/TestApp/wwwroot/index.html | 1 -
 .../ServerExecutionTests/ComponentWithParametersTest.cs       | 2 +-
 .../ServerExecutionTests/HeadModificationPrerenderingTest.cs  | 2 +-
 .../ServerExecutionTests/MultipleRootComponentsTest.cs        | 2 +-
 .../test/E2ETest/ServerExecutionTests/PrerenderingTest.cs     | 2 +-
 .../test/E2ETest/ServerExecutionTests/ServerTransportsTest.cs | 2 +-
 .../E2ETest/Tests/ClientRenderingMultpleComponentsTest.cs     | 2 +-
 src/Components/test/E2ETest/Tests/ClientSideHostingTest.cs    | 2 +-
 .../test/E2ETest/Tests/HostedInAlternativeBasePathTest.cs     | 2 +-
 src/Components/test/E2ETest/Tests/HostedInAspNetTest.cs       | 2 +-
 src/Components/test/E2ETest/Tests/MultipleHostedAppTest.cs    | 4 ++--
 src/Components/test/E2ETest/Tests/PerformanceTest.cs          | 2 +-
 src/Components/test/E2ETest/Tests/SaveStateTest.cs            | 2 +-
 .../test/E2ETest/Tests/WebAssemblyPrerenderedTest.cs          | 2 +-
 .../test/testassets/BasicTestApp/HeadModification.razor       | 3 +--
 .../Pages/Client/MultipleComponents.cshtml                    | 1 -
 .../Components.TestServer/Pages/MultipleComponents.cshtml     | 1 -
 .../Components.TestServer/Pages/PrerenderedHost.cshtml        | 1 -
 .../testassets/Components.TestServer/Pages/SaveState.cshtml   | 1 -
 .../RazorComponents/NamedFormContextNoFormContextApp.razor    | 1 -
 .../RazorComponents/RemoteAuthenticationApp.razor             | 1 -
 src/Components/test/testassets/GlobalizationWasmApp/App.razor | 2 --
 25 files changed, 16 insertions(+), 29 deletions(-)

diff --git a/src/Components/WebAssembly/testassets/CustomBasePathApp/wwwroot/index.html b/src/Components/WebAssembly/testassets/CustomBasePathApp/wwwroot/index.html
index a5767e9beff8..73ab907e443b 100644
--- a/src/Components/WebAssembly/testassets/CustomBasePathApp/wwwroot/index.html
+++ b/src/Components/WebAssembly/testassets/CustomBasePathApp/wwwroot/index.html
@@ -9,7 +9,6 @@
 </head>
 <body>
     <app>Loading...</app>
-    <p id="session-storage-anchor"></p>
     <script src="_framework/blazor.webassembly.js"></script>
 </body>
 </html>
diff --git a/src/Components/WebAssembly/testassets/HostedInAspNet.Client/Home.razor b/src/Components/WebAssembly/testassets/HostedInAspNet.Client/Home.razor
index 4b376bf4f1bd..0ad1ea275e55 100644
--- a/src/Components/WebAssembly/testassets/HostedInAspNet.Client/Home.razor
+++ b/src/Components/WebAssembly/testassets/HostedInAspNet.Client/Home.razor
@@ -1 +1 @@
-<h1 id="session-storage-anchor">Hello, world!</h1>
+<h1>Hello, world!</h1>
diff --git a/src/Components/WebAssembly/testassets/Wasm.Prerendered.Client/App.razor b/src/Components/WebAssembly/testassets/Wasm.Prerendered.Client/App.razor
index ebf677bd33aa..5180131cb3d1 100644
--- a/src/Components/WebAssembly/testassets/Wasm.Prerendered.Client/App.razor
+++ b/src/Components/WebAssembly/testassets/Wasm.Prerendered.Client/App.razor
@@ -2,8 +2,6 @@
 
 <PageTitle>Current count: @_counter</PageTitle>
 
-<p id="session-storage-anchor"></p>
-
 <p>
     <span>Current count: @_counter</span><br>
     <button id="increment-count" @onclick="IncrementCounter">Increment count</button>
diff --git a/src/Components/benchmarkapps/Wasm.Performance/TestApp/wwwroot/index.html b/src/Components/benchmarkapps/Wasm.Performance/TestApp/wwwroot/index.html
index dc1b7ab0f703..13bbb314fe6a 100644
--- a/src/Components/benchmarkapps/Wasm.Performance/TestApp/wwwroot/index.html
+++ b/src/Components/benchmarkapps/Wasm.Performance/TestApp/wwwroot/index.html
@@ -7,7 +7,6 @@
     <link href="benchmarks/lib/minibench/style.css" rel="stylesheet" />
 </head>
 <body style="overflow: scroll;">
-    <p id="session-storage-anchor"></p>
     <div class="container" id="display"></div>
     <p class="container px-3">
         <a href="blazor-frame.html">View benchmark app ⮕</a>
diff --git a/src/Components/test/E2ETest/ServerExecutionTests/ComponentWithParametersTest.cs b/src/Components/test/E2ETest/ServerExecutionTests/ComponentWithParametersTest.cs
index 102854529a74..1e9cf7fcbe22 100644
--- a/src/Components/test/E2ETest/ServerExecutionTests/ComponentWithParametersTest.cs
+++ b/src/Components/test/E2ETest/ServerExecutionTests/ComponentWithParametersTest.cs
@@ -16,7 +16,7 @@ public ComponentWithParametersTest(
         BrowserFixture browserFixture,
         BasicTestAppServerSiteFixture<PrerenderedStartup> serverFixture,
         ITestOutputHelper output)
-        : base(browserFixture, serverFixture, output, serverPathBase: "/prerendered")
+        : base(browserFixture, serverFixture, output)
     {
     }
 
diff --git a/src/Components/test/E2ETest/ServerExecutionTests/HeadModificationPrerenderingTest.cs b/src/Components/test/E2ETest/ServerExecutionTests/HeadModificationPrerenderingTest.cs
index 95d57432ee10..759a67070ebf 100644
--- a/src/Components/test/E2ETest/ServerExecutionTests/HeadModificationPrerenderingTest.cs
+++ b/src/Components/test/E2ETest/ServerExecutionTests/HeadModificationPrerenderingTest.cs
@@ -16,7 +16,7 @@ public HeadModificationPrerenderingTest(
         BrowserFixture browserFixture,
         BasicTestAppServerSiteFixture<DeferredComponentContentStartup> serverFixture,
         ITestOutputHelper output)
-        : base(browserFixture, serverFixture, output, serverPathBase: "/deferred-component-content")
+        : base(browserFixture, serverFixture, output)
     {
     }
 
diff --git a/src/Components/test/E2ETest/ServerExecutionTests/MultipleRootComponentsTest.cs b/src/Components/test/E2ETest/ServerExecutionTests/MultipleRootComponentsTest.cs
index 6e4092cd43e7..5d1575c6ab59 100644
--- a/src/Components/test/E2ETest/ServerExecutionTests/MultipleRootComponentsTest.cs
+++ b/src/Components/test/E2ETest/ServerExecutionTests/MultipleRootComponentsTest.cs
@@ -20,7 +20,7 @@ public MultipleComponentsTest(
         BrowserFixture browserFixture,
         BasicTestAppServerSiteFixture<MultipleComponents> serverFixture,
         ITestOutputHelper output)
-        : base(browserFixture, serverFixture, output, serverPathBase: "/multiple-components")
+        : base(browserFixture, serverFixture, output)
     {
     }
 
diff --git a/src/Components/test/E2ETest/ServerExecutionTests/PrerenderingTest.cs b/src/Components/test/E2ETest/ServerExecutionTests/PrerenderingTest.cs
index f7279379531c..3de6df8da5db 100644
--- a/src/Components/test/E2ETest/ServerExecutionTests/PrerenderingTest.cs
+++ b/src/Components/test/E2ETest/ServerExecutionTests/PrerenderingTest.cs
@@ -19,7 +19,7 @@ public PrerenderingTest(
         BrowserFixture browserFixture,
         BasicTestAppServerSiteFixture<PrerenderedStartup> serverFixture,
         ITestOutputHelper output)
-        : base(browserFixture, serverFixture, output, serverPathBase: "/prerendered")
+        : base(browserFixture, serverFixture, output)
     {
     }
 
diff --git a/src/Components/test/E2ETest/ServerExecutionTests/ServerTransportsTest.cs b/src/Components/test/E2ETest/ServerExecutionTests/ServerTransportsTest.cs
index 7d56437fb166..ab43e2e5b514 100644
--- a/src/Components/test/E2ETest/ServerExecutionTests/ServerTransportsTest.cs
+++ b/src/Components/test/E2ETest/ServerExecutionTests/ServerTransportsTest.cs
@@ -16,7 +16,7 @@ public ServerTransportsTest(
         BrowserFixture browserFixture,
         BasicTestAppServerSiteFixture<TransportsServerStartup> serverFixture,
         ITestOutputHelper output)
-        : base(browserFixture, serverFixture, output, serverPathBase: "/defaultTransport")
+        : base(browserFixture, serverFixture, output)
     {
     }
 
diff --git a/src/Components/test/E2ETest/Tests/ClientRenderingMultpleComponentsTest.cs b/src/Components/test/E2ETest/Tests/ClientRenderingMultpleComponentsTest.cs
index 02d07e08e67d..5492d8bb8cdc 100644
--- a/src/Components/test/E2ETest/Tests/ClientRenderingMultpleComponentsTest.cs
+++ b/src/Components/test/E2ETest/Tests/ClientRenderingMultpleComponentsTest.cs
@@ -19,7 +19,7 @@ public ClientRenderingMultpleComponentsTest(
         BrowserFixture browserFixture,
         BasicTestAppServerSiteFixture<MultipleComponents> serverFixture,
         ITestOutputHelper output)
-        : base(browserFixture, serverFixture, output, serverPathBase: "/Client/multiple-components")
+        : base(browserFixture, serverFixture, output)
     {
     }
 
diff --git a/src/Components/test/E2ETest/Tests/ClientSideHostingTest.cs b/src/Components/test/E2ETest/Tests/ClientSideHostingTest.cs
index 642e840167ac..406a38c43d36 100644
--- a/src/Components/test/E2ETest/Tests/ClientSideHostingTest.cs
+++ b/src/Components/test/E2ETest/Tests/ClientSideHostingTest.cs
@@ -20,7 +20,7 @@ public ClientSideHostingTest(
         BrowserFixture browserFixture,
         BasicTestAppServerSiteFixture<TestServer.StartupWithMapFallbackToClientSideBlazor> serverFixture,
         ITestOutputHelper output)
-        : base(browserFixture, serverFixture, output, serverPathBase: "/subdir/filepath")
+        : base(browserFixture, serverFixture, output)
     {
     }
 
diff --git a/src/Components/test/E2ETest/Tests/HostedInAlternativeBasePathTest.cs b/src/Components/test/E2ETest/Tests/HostedInAlternativeBasePathTest.cs
index 3472412bb26e..df1cbaecc556 100644
--- a/src/Components/test/E2ETest/Tests/HostedInAlternativeBasePathTest.cs
+++ b/src/Components/test/E2ETest/Tests/HostedInAlternativeBasePathTest.cs
@@ -15,7 +15,7 @@ public HostedInAlternativeBasePathTest(
         BrowserFixture browserFixture,
         AspNetSiteServerFixture serverFixture,
         ITestOutputHelper output)
-        : base(browserFixture, serverFixture, output, serverPathBase: "/app")
+        : base(browserFixture, serverFixture, output)
     {
         serverFixture.AdditionalArguments.AddRange(new[] { "--UseAlternativeBasePath", "true" });
         serverFixture.BuildWebHostMethod = HostedInAspNet.Server.Program.BuildWebHost;
diff --git a/src/Components/test/E2ETest/Tests/HostedInAspNetTest.cs b/src/Components/test/E2ETest/Tests/HostedInAspNetTest.cs
index 462acbf88454..8f6e1775990c 100644
--- a/src/Components/test/E2ETest/Tests/HostedInAspNetTest.cs
+++ b/src/Components/test/E2ETest/Tests/HostedInAspNetTest.cs
@@ -15,7 +15,7 @@ public HostedInAspNetTest(
         BrowserFixture browserFixture,
         AspNetSiteServerFixture serverFixture,
         ITestOutputHelper output)
-        : base(browserFixture, serverFixture, output, serverPathBase: "")
+        : base(browserFixture, serverFixture, output)
     {
         serverFixture.BuildWebHostMethod = HostedInAspNet.Server.Program.BuildWebHost;
         serverFixture.Environment = AspNetEnvironment.Development;
diff --git a/src/Components/test/E2ETest/Tests/MultipleHostedAppTest.cs b/src/Components/test/E2ETest/Tests/MultipleHostedAppTest.cs
index fb4399b81945..feee1434d50d 100644
--- a/src/Components/test/E2ETest/Tests/MultipleHostedAppTest.cs
+++ b/src/Components/test/E2ETest/Tests/MultipleHostedAppTest.cs
@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
@@ -15,7 +15,7 @@ public MultipleHostedAppTest(
         BrowserFixture browserFixture,
         AspNetSiteServerFixture serverFixture,
         ITestOutputHelper output)
-        : base(browserFixture, serverFixture, output, serverPathBase: "")
+        : base(browserFixture, serverFixture, output)
     {
         serverFixture.AdditionalArguments.AddRange(new[] { "--MapAllApps", "true" });
         serverFixture.BuildWebHostMethod = HostedInAspNet.Server.Program.BuildWebHost;
diff --git a/src/Components/test/E2ETest/Tests/PerformanceTest.cs b/src/Components/test/E2ETest/Tests/PerformanceTest.cs
index 2ae8f73ca552..c237c8fd4aa6 100644
--- a/src/Components/test/E2ETest/Tests/PerformanceTest.cs
+++ b/src/Components/test/E2ETest/Tests/PerformanceTest.cs
@@ -16,7 +16,7 @@ public PerformanceTest(
         BrowserFixture browserFixture,
         BlazorWasmTestAppFixture<Wasm.Performance.TestApp.Program> serverFixture,
         ITestOutputHelper output)
-        : base(browserFixture, serverFixture, output, serverPathBase: "")
+        : base(browserFixture, serverFixture, output)
     {
     }
 
diff --git a/src/Components/test/E2ETest/Tests/SaveStateTest.cs b/src/Components/test/E2ETest/Tests/SaveStateTest.cs
index 70de85b0d9f7..680b030c32c5 100644
--- a/src/Components/test/E2ETest/Tests/SaveStateTest.cs
+++ b/src/Components/test/E2ETest/Tests/SaveStateTest.cs
@@ -18,7 +18,7 @@ public SaveStateTest(
         BrowserFixture browserFixture,
         AspNetSiteServerFixture serverFixture,
         ITestOutputHelper output)
-        : base(browserFixture, serverFixture, output, "save-state")
+        : base(browserFixture, serverFixture, output)
     {
         serverFixture.BuildWebHostMethod = Program.BuildWebHost<SaveState>;
         serverFixture.Environment = AspNetEnvironment.Development;
diff --git a/src/Components/test/E2ETest/Tests/WebAssemblyPrerenderedTest.cs b/src/Components/test/E2ETest/Tests/WebAssemblyPrerenderedTest.cs
index 09f1adfc67cd..18869083cf0f 100644
--- a/src/Components/test/E2ETest/Tests/WebAssemblyPrerenderedTest.cs
+++ b/src/Components/test/E2ETest/Tests/WebAssemblyPrerenderedTest.cs
@@ -15,7 +15,7 @@ public WebAssemblyPrerenderedTest(
         BrowserFixture browserFixture,
         TrimmingServerFixture<Wasm.Prerendered.Server.Startup> serverFixture,
         ITestOutputHelper output)
-        : base(browserFixture, serverFixture, output, serverPathBase: "")
+        : base(browserFixture, serverFixture, output)
     {
         serverFixture.Environment = AspNetEnvironment.Development;
     }
diff --git a/src/Components/test/testassets/BasicTestApp/HeadModification.razor b/src/Components/test/testassets/BasicTestApp/HeadModification.razor
index f0fc12da8a7d..aeca2f88d0c4 100644
--- a/src/Components/test/testassets/BasicTestApp/HeadModification.razor
+++ b/src/Components/test/testassets/BasicTestApp/HeadModification.razor
@@ -1,5 +1,4 @@
-<p id="session-storage-anchor"></p>
-<h3>Head modification</h3>
+<h3>Head modification</h3>
 
 <p>
 	Title modification
diff --git a/src/Components/test/testassets/Components.TestServer/Pages/Client/MultipleComponents.cshtml b/src/Components/test/testassets/Components.TestServer/Pages/Client/MultipleComponents.cshtml
index 5a91eadaaa41..0f7078e0e603 100644
--- a/src/Components/test/testassets/Components.TestServer/Pages/Client/MultipleComponents.cshtml
+++ b/src/Components/test/testassets/Components.TestServer/Pages/Client/MultipleComponents.cshtml
@@ -5,7 +5,6 @@
     Layout = "./MultipleComponentsLayout.cshtml";
 }
 
-<p id="session-storage-anchor"></p>
 
 @(await Html.RenderComponentAsync<GreeterComponent>(RenderMode.WebAssemblyPrerendered))
 @(await Html.RenderComponentAsync<GreeterComponent>(RenderMode.WebAssembly))
diff --git a/src/Components/test/testassets/Components.TestServer/Pages/MultipleComponents.cshtml b/src/Components/test/testassets/Components.TestServer/Pages/MultipleComponents.cshtml
index a3ab97a4f3d0..dff3093166ba 100644
--- a/src/Components/test/testassets/Components.TestServer/Pages/MultipleComponents.cshtml
+++ b/src/Components/test/testassets/Components.TestServer/Pages/MultipleComponents.cshtml
@@ -5,7 +5,6 @@
     Layout = "./MultipleComponentsLayout.cshtml";
 }
 
-<p id="session-storage-anchor"></p>
 
 @(await Html.RenderComponentAsync<GreeterComponent>(RenderMode.ServerPrerendered))
 @(await Html.RenderComponentAsync<GreeterComponent>(RenderMode.Server))
diff --git a/src/Components/test/testassets/Components.TestServer/Pages/PrerenderedHost.cshtml b/src/Components/test/testassets/Components.TestServer/Pages/PrerenderedHost.cshtml
index 6eada78e02d7..ff2d847d5bf1 100644
--- a/src/Components/test/testassets/Components.TestServer/Pages/PrerenderedHost.cshtml
+++ b/src/Components/test/testassets/Components.TestServer/Pages/PrerenderedHost.cshtml
@@ -8,7 +8,6 @@
     <base href="~/" />
 </head>
 <body>
-    <p id="session-storage-anchor"></p>
     <app><component type="typeof(TestRouterWithLazyAssembly)" render-mode="ServerPrerendered" /></app>
 
     @*
diff --git a/src/Components/test/testassets/Components.TestServer/Pages/SaveState.cshtml b/src/Components/test/testassets/Components.TestServer/Pages/SaveState.cshtml
index faaa9678ba41..8df0fb304427 100644
--- a/src/Components/test/testassets/Components.TestServer/Pages/SaveState.cshtml
+++ b/src/Components/test/testassets/Components.TestServer/Pages/SaveState.cshtml
@@ -23,7 +23,6 @@
     @* This page is used to validate the ability to preserve and restore the state of components in Blazor server and WebAssembly. *@
 </head>
 <body>
-    <p id="session-storage-anchor"></p>
     @if (script == "client")
     {
         @* This is here to keep BasicTestApp.Program.cs happy *@
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/NamedFormContextNoFormContextApp.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/NamedFormContextNoFormContextApp.razor
index c5650956e7c4..fc8a291d9821 100644
--- a/src/Components/test/testassets/Components.TestServer/RazorComponents/NamedFormContextNoFormContextApp.razor
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/NamedFormContextNoFormContextApp.razor
@@ -9,7 +9,6 @@
 </head>
 <body>
     <h1 id="ready">Form test cases</h1>
-    <p id="session-storage-anchor"></p>
     <NamedFormContextNoFormContextLayout />
     <script src="@Assets["_framework/blazor.web.js"]" suppress-error="BL9992"></script>
 </body>
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/RemoteAuthenticationApp.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/RemoteAuthenticationApp.razor
index f8a390a764b4..c8f89e587f8f 100644
--- a/src/Components/test/testassets/Components.TestServer/RazorComponents/RemoteAuthenticationApp.razor
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/RemoteAuthenticationApp.razor
@@ -9,7 +9,6 @@
 </head>
 
 <body>
-    <p id="session-storage-anchor"></p>
     <Components.WasmRemoteAuthentication.Routes @rendermode="new InteractiveWebAssemblyRenderMode(prerender: false)" />
     <script src="@Assets["_framework/blazor.web.js"]" autostart="false"></script>
     <script src="_content/Microsoft.AspNetCore.Components.WebAssembly.Authentication/AuthenticationService.js"></script>
diff --git a/src/Components/test/testassets/GlobalizationWasmApp/App.razor b/src/Components/test/testassets/GlobalizationWasmApp/App.razor
index 6707e5396dd1..8ee3c33fdcb1 100644
--- a/src/Components/test/testassets/GlobalizationWasmApp/App.razor
+++ b/src/Components/test/testassets/GlobalizationWasmApp/App.razor
@@ -1,8 +1,6 @@
 @using System.Globalization
 @inject Microsoft.Extensions.Localization.IStringLocalizer<App> Loc
 
-<p id="session-storage-anchor"></p>
-
 <p>App's culture: <span id="culture">@CultureInfo.CurrentCulture</span></p>
 
 <p>DateTime: <span id="dateTime">@(new DateTime(2020, 09, 02))</span></p>

From 0ce17b637547f8a8bd0d6f82a600551eabec0f34 Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Sat, 30 Aug 2025 08:56:08 +0200
Subject: [PATCH 32/39] Revert "Try on CI if tests run with small or big window
 (toggle bar has problems locally because it runs in a small window)."

This reverts commit 18ee068be59a6bbe79132da101b49635857ebfb9.
---
 .../testassets/StandaloneApp/Pages/Index.razor            | 2 +-
 .../test/E2ETest/Infrastructure/ServerTestBase.cs         | 8 ++------
 .../ServerRenderingTests/EnhancedNavigationTestUtil.cs    | 2 +-
 src/Components/test/E2ETest/Tests/StandaloneAppTest.cs    | 2 +-
 src/Components/test/testassets/BasicTestApp/Index.razor   | 2 +-
 .../RazorComponents/Pages/Index.razor                     | 2 +-
 6 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/Components/WebAssembly/testassets/StandaloneApp/Pages/Index.razor b/src/Components/WebAssembly/testassets/StandaloneApp/Pages/Index.razor
index 71201aa021ee..16dac3192520 100644
--- a/src/Components/WebAssembly/testassets/StandaloneApp/Pages/Index.razor
+++ b/src/Components/WebAssembly/testassets/StandaloneApp/Pages/Index.razor
@@ -1,5 +1,5 @@
 @page "/"
 
-<h1 id="session-storage-anchor">Hello, world!</h1>
+<h1>Hello, world!</h1>
 
 Welcome to your new app.
diff --git a/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs b/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs
index f0a06cc90538..988faa27f3f2 100644
--- a/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs
+++ b/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs
@@ -5,7 +5,6 @@
 using Microsoft.AspNetCore.Components.E2ETests.ServerRenderingTests;
 using Microsoft.AspNetCore.E2ETesting;
 using OpenQA.Selenium;
-using OpenQA.Selenium.BiDi.Communication;
 using Xunit.Abstractions;
 
 namespace Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
@@ -15,20 +14,17 @@ public abstract class ServerTestBase<TServerFixture>
     IClassFixture<TServerFixture>
     where TServerFixture : ServerFixture
 {
-    private string _serverPathBase;
-    public string ServerPathBase => _serverPathBase;
+    public string ServerPathBase => "/subdir";
 
     protected readonly TServerFixture _serverFixture;
 
     public ServerTestBase(
         BrowserFixture browserFixture,
         TServerFixture serverFixture,
-        ITestOutputHelper output,
-        string serverPathBase = "/subdir")
+        ITestOutputHelper output)
         : base(browserFixture, output)
     {
         _serverFixture = serverFixture;
-        _serverPathBase = serverPathBase;
     }
 
     public void Navigate(string relativeUrl)
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
index 9a7583a5d398..8908d73e3767 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
@@ -104,7 +104,7 @@ private static void NavigateToOrigin<TServerFixture>(ServerTestBase<TServerFixtu
     {
         // Navigate to the test origin to ensure the browser is on the correct state to access sessionStorage
         fixture.Navigate($"{fixture.ServerPathBase}/");
-        fixture.Browser.Exists(By.Id("session-storage-anchor"));
+        fixture.Browser.Equal("Hello", () => fixture.Browser.Exists(By.TagName("h1")).Text);
     }
 
     private static string GrantTestIdCore(IWebDriver browser)
diff --git a/src/Components/test/E2ETest/Tests/StandaloneAppTest.cs b/src/Components/test/E2ETest/Tests/StandaloneAppTest.cs
index 233cc1ace533..abdc012a2482 100644
--- a/src/Components/test/E2ETest/Tests/StandaloneAppTest.cs
+++ b/src/Components/test/E2ETest/Tests/StandaloneAppTest.cs
@@ -16,7 +16,7 @@ public StandaloneAppTest(
         BrowserFixture browserFixture,
         BlazorWasmTestAppFixture<StandaloneApp.Program> serverFixture,
         ITestOutputHelper output)
-        : base(browserFixture, serverFixture, output, "")
+        : base(browserFixture, serverFixture, output)
     {
     }
 
diff --git a/src/Components/test/testassets/BasicTestApp/Index.razor b/src/Components/test/testassets/BasicTestApp/Index.razor
index d17a04ca016a..bbe6fe794d69 100644
--- a/src/Components/test/testassets/BasicTestApp/Index.razor
+++ b/src/Components/test/testassets/BasicTestApp/Index.razor
@@ -3,7 +3,7 @@
 @inject NavigationManager NavigationManager
 
 <div id="test-selector">
-    <h1 id="session-storage-anchor" style="margin: 0; padding: 0; line-height: 1;">Hello</h1>
+    <h1 style="margin: 0; padding: 0; line-height: 1;">Hello</h1>
     Select test:
     <select id="test-selector-select" @bind=SelectedComponentTypeName>
         <option value="none">Choose...</option>
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Index.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Index.razor
index cd6f38b6f2e5..81020bd258ed 100644
--- a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Index.razor
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Index.razor
@@ -2,6 +2,6 @@
 
 <PageTitle>Home</PageTitle>
 
-<h1 id="session-storage-anchor">Hello</h1>
+<h1>Hello</h1>
 
 <p>This is a Razor Component endpoint.</p>

From 8c5364c65badef7ce92c42bd18db0a0a7e6ca34d Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Sat, 30 Aug 2025 08:56:08 +0200
Subject: [PATCH 33/39] Revert "Grant ID for each test on initialization.
 Change BinaryHttpClientTest inheritance to ServerTestBase, so that it calls
 ID granting method as well."

This reverts commit 7ac455c5bc07d4e2536ded8b21d2aa64c8a28833.
---
 .../E2ETest/Infrastructure/ServerTestBase.cs  |  5 ---
 .../EnhancedNavigationTestUtil.cs             | 35 ++++++-------------
 .../E2ETest/Tests/BinaryHttpClientTest.cs     |  8 ++---
 src/Shared/E2ETesting/BrowserTestBase.cs      |  5 ---
 4 files changed, 13 insertions(+), 40 deletions(-)

diff --git a/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs b/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs
index 988faa27f3f2..315b80cd2248 100644
--- a/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs
+++ b/src/Components/test/E2ETest/Infrastructure/ServerTestBase.cs
@@ -44,9 +44,4 @@ protected override void InitializeAsyncCore()
         // Make sure each test starts clean.
         ((IJavaScriptExecutor)Browser).ExecuteScript("console.clear()");
     }
-
-    protected override void GrantTestId()
-    {
-        EnhancedNavigationTestUtil.GrantTestId(this);
-    }
 }
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
index 8908d73e3767..3adb7bc937c2 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
@@ -22,12 +22,20 @@ public static void SuppressEnhancedNavigation<TServerFixture>(ServerTestBase<TSe
             {
                 NavigateToOrigin(fixture);
             }
-            AssertSessionStorageAvailable(browser);
+
+            try
+            {
+                ((IJavaScriptExecutor)browser).ExecuteScript("sessionStorage.length");
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException("Session storage not found. Ensure that the browser is on the correct origin by navigating to a page or by setting skipNavigation to false.", ex);
+            }
 
             var testId = ((IJavaScriptExecutor)browser).ExecuteScript($"return sessionStorage.getItem('test-id')");
             if (testId is null || string.IsNullOrEmpty(testId as string))
             {
-                throw new InvalidOperationException("Test ID not found in sessionStorage. Make sure your test class grants it in InitializeAsync.");
+                testId = GrantTestId(browser);
             }
 
             ((IJavaScriptExecutor)browser).ExecuteScript($"sessionStorage.setItem('suppress-enhanced-navigation-{testId}', 'true')");
@@ -38,27 +46,6 @@ public static void SuppressEnhancedNavigation<TServerFixture>(ServerTestBase<TSe
         }
     }
 
-    public static void AssertSessionStorageAvailable(IWebDriver browser)
-    {
-        try
-        {
-            ((IJavaScriptExecutor)browser).ExecuteScript("sessionStorage.length");
-        }
-        catch (Exception ex)
-        {
-            throw new InvalidOperationException("Session storage not found. Ensure that the browser is on the correct origin by navigating to a page or by setting skipNavigation to false.", ex);
-        }
-
-    }
-
-    public static void GrantTestId<TServerFixture>(ServerTestBase<TServerFixture> fixture)
-        where TServerFixture : ServerFixture
-    {
-        NavigateToOrigin(fixture);
-        AssertSessionStorageAvailable(fixture.Browser);
-        GrantTestIdCore(fixture.Browser);
-    }
-
     public static void CleanEnhancedNavigationSuppression<TServerFixture>(ServerTestBase<TServerFixture> fixture, bool skipNavigation = false)
         where TServerFixture : ServerFixture
     {
@@ -107,7 +94,7 @@ private static void NavigateToOrigin<TServerFixture>(ServerTestBase<TServerFixtu
         fixture.Browser.Equal("Hello", () => fixture.Browser.Exists(By.TagName("h1")).Text);
     }
 
-    private static string GrantTestIdCore(IWebDriver browser)
+    private static string GrantTestId(IWebDriver browser)
     {
         var testId = Guid.NewGuid().ToString("N")[..8];
         ((IJavaScriptExecutor)browser).ExecuteScript($"sessionStorage.setItem('test-id', '{testId}')");
diff --git a/src/Components/test/E2ETest/Tests/BinaryHttpClientTest.cs b/src/Components/test/E2ETest/Tests/BinaryHttpClientTest.cs
index 0fbcb98fca4e..a8b06bcab09a 100644
--- a/src/Components/test/E2ETest/Tests/BinaryHttpClientTest.cs
+++ b/src/Components/test/E2ETest/Tests/BinaryHttpClientTest.cs
@@ -2,9 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using BasicTestApp.HttpClientTest;
-using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
-using Microsoft.AspNetCore.Components.E2ETests.ServerRenderingTests;
 using Microsoft.AspNetCore.E2ETesting;
 using OpenQA.Selenium;
 using TestServer;
@@ -12,7 +10,7 @@
 
 namespace Microsoft.AspNetCore.Components.E2ETest.Tests;
 
-public class BinaryHttpClientTest : ServerTestBase<AspNetSiteServerFixture>,
+public class BinaryHttpClientTest : BrowserTestBase,
     IClassFixture<BasicTestAppServerSiteFixture<CorsStartup>>,
     IClassFixture<BlazorWasmTestAppFixture<BasicTestApp.Program>>
 {
@@ -25,13 +23,11 @@ public class BinaryHttpClientTest : ServerTestBase<AspNetSiteServerFixture>,
 
     public BinaryHttpClientTest(
         BrowserFixture browserFixture,
-        AspNetSiteServerFixture serverFixture,
         BlazorWasmTestAppFixture<BasicTestApp.Program> devHostServerFixture,
         BasicTestAppServerSiteFixture<CorsStartup> apiServerFixture,
         ITestOutputHelper output)
-        : base(browserFixture, serverFixture, output)
+        : base(browserFixture, output)
     {
-        serverFixture.BuildWebHostMethod = Program.BuildWebHost<CorsStartup>;
         _devHostServerFixture = devHostServerFixture;
         _devHostServerFixture.PathBase = "/subdir";
         _apiServerFixture = apiServerFixture;
diff --git a/src/Shared/E2ETesting/BrowserTestBase.cs b/src/Shared/E2ETesting/BrowserTestBase.cs
index 82be99df340f..dcd840cc6d10 100644
--- a/src/Shared/E2ETesting/BrowserTestBase.cs
+++ b/src/Shared/E2ETesting/BrowserTestBase.cs
@@ -62,7 +62,6 @@ public virtual Task InitializeAsync()
     public virtual Task InitializeAsync(string isolationContext)
     {
         InitializeBrowser(isolationContext);
-        GrantTestId();
         InitializeAsyncCore();
         return Task.CompletedTask;
     }
@@ -71,10 +70,6 @@ protected virtual void InitializeAsyncCore()
     {
     }
 
-    protected virtual void GrantTestId()
-    {
-    }
-
     protected void InitializeBrowser(string isolationContext)
     {
         try

From 68753a0f609e276fd1678175812efee31a849733 Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Tue, 2 Sep 2025 09:39:20 +0200
Subject: [PATCH 34/39] @javiercn's feedback: selenium gives absolute position.

---
 .../WebDriverExtensions/WebDriverExtensions.cs            | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/Components/test/E2ETest/Infrastructure/WebDriverExtensions/WebDriverExtensions.cs b/src/Components/test/E2ETest/Infrastructure/WebDriverExtensions/WebDriverExtensions.cs
index 4b3a5f5214cd..fd24da459497 100644
--- a/src/Components/test/E2ETest/Infrastructure/WebDriverExtensions/WebDriverExtensions.cs
+++ b/src/Components/test/E2ETest/Infrastructure/WebDriverExtensions/WebDriverExtensions.cs
@@ -49,13 +49,7 @@ public static long GetElementPositionWithRetry(this IWebDriver browser, string e
             {
                 browser.WaitForElementToBeVisible(By.Id(elementId));
                 var element = browser.FindElement(By.Id(elementId));
-                var elementLocation = element.Location.Y;
-
-                // Get scroll position using JavaScript (this is less likely to fail than element positioning)
-                var jsExecutor = (IJavaScriptExecutor)browser;
-                var scrollY = (long)jsExecutor.ExecuteScript("return window.scrollY");
-
-                return elementLocation + scrollY;
+                return element.Location.Y;
             }
             catch (Exception ex)
             {

From f5bbd402170809101d0b25122623d9888c85c9e6 Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Tue, 2 Sep 2025 09:40:12 +0200
Subject: [PATCH 35/39] Remove the "tax" on each test, we can return early from
 cleaning if supression was not requested.

---
 .../EnhancedNavigationTestUtil.cs                    | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
index 3adb7bc937c2..69fd0c30095c 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
@@ -11,6 +11,8 @@ namespace Microsoft.AspNetCore.Components.E2ETests.ServerRenderingTests;
 
 public static class EnhancedNavigationTestUtil
 {
+    private static bool _isSuppressed;
+
     public static void SuppressEnhancedNavigation<TServerFixture>(ServerTestBase<TServerFixture> fixture, bool shouldSuppress, bool skipNavigation = false)
         where TServerFixture : ServerFixture
     {
@@ -43,12 +45,18 @@ public static void SuppressEnhancedNavigation<TServerFixture>(ServerTestBase<TSe
             var suppressEnhancedNavigation = ((IJavaScriptExecutor)browser).ExecuteScript($"return sessionStorage.getItem('suppress-enhanced-navigation-{testId}');");
             Assert.True(suppressEnhancedNavigation is not null && (string)suppressEnhancedNavigation == "true",
                 "Expected 'suppress-enhanced-navigation' to be set in sessionStorage.");
+            _isSuppressed = true;
         }
     }
 
     public static void CleanEnhancedNavigationSuppression<TServerFixture>(ServerTestBase<TServerFixture> fixture, bool skipNavigation = false)
         where TServerFixture : ServerFixture
     {
+        if (!_isSuppressed)
+        {
+            return;
+        }
+
         var browser = fixture.Browser;
 
         try
@@ -84,6 +92,10 @@ public static void CleanEnhancedNavigationSuppression<TServerFixture>(ServerTest
             // This is expected in some tests, so we silently return
             return;
         }
+        finally
+        {
+            _isSuppressed = false;
+        }
     }
 
     private static void NavigateToOrigin<TServerFixture>(ServerTestBase<TServerFixture> fixture)

From a2675882cd8c4eb54a834bc6fe19e4e4ecd23456 Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Tue, 2 Sep 2025 09:42:37 +0200
Subject: [PATCH 36/39] Rename according to feedback.

---
 .../ServerRenderingTests/EnhancedNavigationTestUtil.cs      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
index 69fd0c30095c..e3410ff517af 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
@@ -37,7 +37,7 @@ public static void SuppressEnhancedNavigation<TServerFixture>(ServerTestBase<TSe
             var testId = ((IJavaScriptExecutor)browser).ExecuteScript($"return sessionStorage.getItem('test-id')");
             if (testId is null || string.IsNullOrEmpty(testId as string))
             {
-                testId = GrantTestId(browser);
+                testId = GenerateTestId(browser);
             }
 
             ((IJavaScriptExecutor)browser).ExecuteScript($"sessionStorage.setItem('suppress-enhanced-navigation-{testId}', 'true')");
@@ -103,10 +103,10 @@ private static void NavigateToOrigin<TServerFixture>(ServerTestBase<TServerFixtu
     {
         // Navigate to the test origin to ensure the browser is on the correct state to access sessionStorage
         fixture.Navigate($"{fixture.ServerPathBase}/");
-        fixture.Browser.Equal("Hello", () => fixture.Browser.Exists(By.TagName("h1")).Text);
+        fixture.Browser.Exists(By.Id("session-storage-anchor"));
     }
 
-    private static string GrantTestId(IWebDriver browser)
+    private static string GenerateTestId(IWebDriver browser)
     {
         var testId = Guid.NewGuid().ToString("N")[..8];
         ((IJavaScriptExecutor)browser).ExecuteScript($"sessionStorage.setItem('test-id', '{testId}')");

From e07e484f2ff44b6a9b87af1ecebf2a9e0cb132ae Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Tue, 2 Sep 2025 09:51:13 +0200
Subject: [PATCH 37/39] Use element id to check if page got loaded.

---
 .../WebAssembly/testassets/StandaloneApp/Pages/Index.razor      | 2 +-
 src/Components/test/testassets/BasicTestApp/Index.razor         | 2 +-
 .../Components.TestServer/RazorComponents/Pages/Index.razor     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Components/WebAssembly/testassets/StandaloneApp/Pages/Index.razor b/src/Components/WebAssembly/testassets/StandaloneApp/Pages/Index.razor
index 16dac3192520..71201aa021ee 100644
--- a/src/Components/WebAssembly/testassets/StandaloneApp/Pages/Index.razor
+++ b/src/Components/WebAssembly/testassets/StandaloneApp/Pages/Index.razor
@@ -1,5 +1,5 @@
 @page "/"
 
-<h1>Hello, world!</h1>
+<h1 id="session-storage-anchor">Hello, world!</h1>
 
 Welcome to your new app.
diff --git a/src/Components/test/testassets/BasicTestApp/Index.razor b/src/Components/test/testassets/BasicTestApp/Index.razor
index bbe6fe794d69..a3bc250f0634 100644
--- a/src/Components/test/testassets/BasicTestApp/Index.razor
+++ b/src/Components/test/testassets/BasicTestApp/Index.razor
@@ -2,8 +2,8 @@
 @using System.Web
 @inject NavigationManager NavigationManager
 
+<p id="session-storage-anchor"></p>
 <div id="test-selector">
-    <h1 style="margin: 0; padding: 0; line-height: 1;">Hello</h1>
     Select test:
     <select id="test-selector-select" @bind=SelectedComponentTypeName>
         <option value="none">Choose...</option>
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Index.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Index.razor
index 81020bd258ed..cd6f38b6f2e5 100644
--- a/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Index.razor
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Index.razor
@@ -2,6 +2,6 @@
 
 <PageTitle>Home</PageTitle>
 
-<h1>Hello</h1>
+<h1 id="session-storage-anchor">Hello</h1>
 
 <p>This is a Razor Component endpoint.</p>

From 0994342d7830e1de6627df258dd0764be1c2da0e Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Tue, 2 Sep 2025 11:53:25 +0200
Subject: [PATCH 38/39] Fix tests - use specific ID, not TagName that picks the
 first element of the type.

---
 .../Tests/SectionsWithCascadingParametersTest.cs   | 14 +++++++-------
 .../E2ETest/Tests/SectionsWithErrorBoundaryTest.cs |  6 +++---
 .../SectionsTest/SectionsWithErrorBoundary.razor   |  2 +-
 .../TextComponentWithCascadingParameter.razor      |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/Components/test/E2ETest/Tests/SectionsWithCascadingParametersTest.cs b/src/Components/test/E2ETest/Tests/SectionsWithCascadingParametersTest.cs
index bd69e484a5f8..73a860124ecb 100644
--- a/src/Components/test/E2ETest/Tests/SectionsWithCascadingParametersTest.cs
+++ b/src/Components/test/E2ETest/Tests/SectionsWithCascadingParametersTest.cs
@@ -35,7 +35,7 @@ public void RenderSectionContent_CascadingParameterForSectionOutletIsDeterminedB
         Browser.FindElement(By.Id("render-section-outlet")).Click();
         Browser.FindElement(By.Id("render-second-section-content")).Click();
 
-        Browser.Equal("Second Section with additional text for second section", () => Browser.Exists(By.TagName("p")).Text);
+        Browser.Equal("Second Section with additional text for second section", () => Browser.Exists(By.Id("text-component")).Text);
     }
 
     [Fact]
@@ -46,7 +46,7 @@ public void ChangeCascadingValueForSectionContent_CascadingValueForSectionOutlet
 
         Browser.FindElement(By.Id("change-cascading-value")).Click();
 
-        Browser.Equal("First Section with additional text for second section", () => Browser.Exists(By.TagName("p")).Text);
+        Browser.Equal("First Section with additional text for second section", () => Browser.Exists(By.Id("text-component")).Text);
     }
 
     [Fact]
@@ -56,7 +56,7 @@ public void RenderTwoSectionContentsWithSameId_CascadingParameterForSectionOutle
         Browser.FindElement(By.Id("render-first-section-content")).Click();
         Browser.FindElement(By.Id("render-section-outlet")).Click();
 
-        Browser.Equal("First Section with additional text for first section", () => Browser.Exists(By.TagName("p")).Text);
+        Browser.Equal("First Section with additional text for first section", () => Browser.Exists(By.Id("text-component")).Text);
     }
 
     [Fact]
@@ -68,7 +68,7 @@ public void SecondSectionContentIdChanged_CascadingParameterForSectionOutletIsDe
 
         Browser.FindElement(By.Id("change-second-section-content-id")).Click();
 
-        Browser.Equal("First Section with additional text for first section", () => Browser.Exists(By.TagName("p")).Text);
+        Browser.Equal("First Section with additional text for first section", () => Browser.Exists(By.Id("text-component")).Text);
     }
 
     [Fact]
@@ -80,7 +80,7 @@ public void SecondSectionContentDisposed_CascadingParameterForSectionOutletIsDet
 
         Browser.FindElement(By.Id("dispose-second-section-content")).Click();
 
-        Browser.Equal("First Section with additional text for first section", () => Browser.Exists(By.TagName("p")).Text);
+        Browser.Equal("First Section with additional text for first section", () => Browser.Exists(By.Id("text-component")).Text);
     }
 
     [Fact]
@@ -92,7 +92,7 @@ public void FirstSectionContentDisposedThenRenderSecondSectionContent_CascadingP
         Browser.FindElement(By.Id("dispose-first-section-content")).Click();
         Browser.FindElement(By.Id("render-second-section-content")).Click();
 
-        Browser.Equal("Second Section with additional text for second section", () => Browser.Exists(By.TagName("p")).Text);
+        Browser.Equal("Second Section with additional text for second section", () => Browser.Exists(By.Id("text-component")).Text);
     }
 
     [Fact]
@@ -105,6 +105,6 @@ public void SectionOutletIdChanged_CascadingParameterForSectionOutletIsDetermine
 
         Browser.FindElement(By.Id("change-section-outlet-id")).Click();
 
-        Browser.Equal("Second Section with additional text for second section", () => Browser.Exists(By.TagName("p")).Text);
+        Browser.Equal("Second Section with additional text for second section", () => Browser.Exists(By.Id("text-component")).Text);
     }
 }
diff --git a/src/Components/test/E2ETest/Tests/SectionsWithErrorBoundaryTest.cs b/src/Components/test/E2ETest/Tests/SectionsWithErrorBoundaryTest.cs
index 3509030754af..25106e9ba4f2 100644
--- a/src/Components/test/E2ETest/Tests/SectionsWithErrorBoundaryTest.cs
+++ b/src/Components/test/E2ETest/Tests/SectionsWithErrorBoundaryTest.cs
@@ -37,7 +37,7 @@ public void RenderSectionContent_ErrorBoundaryForSectionOutletContentIsDetermine
 
         Browser.FindElement(By.Id("error-button")).Click();
 
-        Browser.Equal("Sorry!", () => Browser.Exists(By.TagName("p")).Text);
+        Browser.Equal("Sorry!", () => Browser.Exists(By.Id("error-content")).Text);
     }
 
     [Fact]
@@ -88,7 +88,7 @@ public void FirstSectionContentDisposedThenRenderSecondSectionContent_ErrorBound
         Browser.FindElement(By.Id("render-second-section-content")).Click();
         Browser.FindElement(By.Id("error-button")).Click();
 
-        Browser.Equal("Sorry!", () => Browser.Exists(By.TagName("p")).Text);
+        Browser.Equal("Sorry!", () => Browser.Exists(By.Id("error-content")).Text);
     }
 
     [Fact]
@@ -102,6 +102,6 @@ public void SectionOutletIdChanged_ErrorBoundaryForSectionOutletIsDeterminedByMa
         Browser.FindElement(By.Id("change-section-outlet-id")).Click();
         Browser.FindElement(By.Id("error-button")).Click();
 
-        Browser.Equal("Sorry!", () => Browser.Exists(By.TagName("p")).Text);
+        Browser.Equal("Sorry!", () => Browser.Exists(By.Id("error-content")).Text);
     }
 }
diff --git a/src/Components/test/testassets/BasicTestApp/SectionsTest/SectionsWithErrorBoundary.razor b/src/Components/test/testassets/BasicTestApp/SectionsTest/SectionsWithErrorBoundary.razor
index 6edb00c7c309..a7ebeb3ee878 100644
--- a/src/Components/test/testassets/BasicTestApp/SectionsTest/SectionsWithErrorBoundary.razor
+++ b/src/Components/test/testassets/BasicTestApp/SectionsTest/SectionsWithErrorBoundary.razor
@@ -40,7 +40,7 @@
             </SectionContent>
         </ChildContent>
         <ErrorContent>
-            <p>Sorry!</p>
+            <p id="error-content">Sorry!</p>
         </ErrorContent>
     </ErrorBoundary>
 }
diff --git a/src/Components/test/testassets/BasicTestApp/SectionsTest/TextComponentWithCascadingParameter.razor b/src/Components/test/testassets/BasicTestApp/SectionsTest/TextComponentWithCascadingParameter.razor
index 0000841c1322..840c6f9f4852 100644
--- a/src/Components/test/testassets/BasicTestApp/SectionsTest/TextComponentWithCascadingParameter.razor
+++ b/src/Components/test/testassets/BasicTestApp/SectionsTest/TextComponentWithCascadingParameter.razor
@@ -1,4 +1,4 @@
-<p>@Text @AdditionalText</p>
+<p id="text-component">@Text @AdditionalText</p>
 
 @code {
     [Parameter]

From 3e5d43116e67d2d61045d1051892728e432a9b28 Mon Sep 17 00:00:00 2001
From: Ilona Tomkowicz <itomkowicz@microsoft.com>
Date: Tue, 2 Sep 2025 16:53:02 +0200
Subject: [PATCH 39/39] ID is not necessary if we're cleaning and not creating
 it for every test.

---
 .../EnhancedNavigationTest.cs                 | 15 ++---------
 .../EnhancedNavigationTestUtil.cs             | 27 +++----------------
 .../RazorComponents/App.razor                 |  3 +--
 .../RazorComponents/Root.razor                |  3 +--
 4 files changed, 7 insertions(+), 41 deletions(-)

diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
index c97da4c44911..49ca00e06915 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
@@ -847,20 +847,9 @@ private void AssertEnhancedNavigation(bool useEnhancedNavigation, IWebElement el
             {
                 var logs = Browser.GetBrowserLogs(LogLevel.Warning);
                 logging += $"{string.Join(", ", logs.Select(l => l.Message))}\n";
+                isNavigationSuppressed = (string)((IJavaScriptExecutor)Browser).ExecuteScript("return sessionStorage.getItem('suppress-enhanced-navigation');");
 
-                var testId = ((IJavaScriptExecutor)Browser).ExecuteScript("return sessionStorage.getItem('test-id');");
-                logging += $"  testId: {testId}\n";
-                if (testId is null)
-                {
-                    continue;
-                }
-                var suppressKey = $"suppress-enhanced-navigation-{testId}";
-
-                var enhancedNavAttached = ((IJavaScriptExecutor)Browser).ExecuteScript("return sessionStorage.getItem('blazor-enhanced-nav-attached');");
-                isNavigationSuppressed = (string)((IJavaScriptExecutor)Browser).ExecuteScript($"return sessionStorage.getItem('{suppressKey}');");
-
-                logging += $"  suppressKey: {suppressKey}\n";
-                logging += $"  {suppressKey}: {isNavigationSuppressed}\n";
+                logging += $" isNavigationSuppressed: {isNavigationSuppressed}\n";
                 // Maybe the check was done too early to change the DOM ref, retry
             }
 
diff --git a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
index e3410ff517af..ffd0287063a0 100644
--- a/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
+++ b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTestUtil.cs
@@ -34,15 +34,9 @@ public static void SuppressEnhancedNavigation<TServerFixture>(ServerTestBase<TSe
                 throw new InvalidOperationException("Session storage not found. Ensure that the browser is on the correct origin by navigating to a page or by setting skipNavigation to false.", ex);
             }
 
-            var testId = ((IJavaScriptExecutor)browser).ExecuteScript($"return sessionStorage.getItem('test-id')");
-            if (testId is null || string.IsNullOrEmpty(testId as string))
-            {
-                testId = GenerateTestId(browser);
-            }
-
-            ((IJavaScriptExecutor)browser).ExecuteScript($"sessionStorage.setItem('suppress-enhanced-navigation-{testId}', 'true')");
+            ((IJavaScriptExecutor)browser).ExecuteScript("sessionStorage.setItem('suppress-enhanced-navigation', 'true')");
 
-            var suppressEnhancedNavigation = ((IJavaScriptExecutor)browser).ExecuteScript($"return sessionStorage.getItem('suppress-enhanced-navigation-{testId}');");
+            var suppressEnhancedNavigation = ((IJavaScriptExecutor)browser).ExecuteScript("return sessionStorage.getItem('suppress-enhanced-navigation');");
             Assert.True(suppressEnhancedNavigation is not null && (string)suppressEnhancedNavigation == "true",
                 "Expected 'suppress-enhanced-navigation' to be set in sessionStorage.");
             _isSuppressed = true;
@@ -75,15 +69,7 @@ public static void CleanEnhancedNavigationSuppression<TServerFixture>(ServerTest
                 }
                 NavigateToOrigin(fixture);
             }
-
-            var testId = ((IJavaScriptExecutor)browser).ExecuteScript($"return sessionStorage.getItem('test-id')");
-            if (testId is null || string.IsNullOrEmpty(testId as string))
-            {
-                return;
-            }
-
-            ((IJavaScriptExecutor)browser).ExecuteScript($"sessionStorage.removeItem('test-id')");
-            ((IJavaScriptExecutor)browser).ExecuteScript($"sessionStorage.removeItem('suppress-enhanced-navigation-{testId}')");
+            ((IJavaScriptExecutor)browser).ExecuteScript($"sessionStorage.removeItem('suppress-enhanced-navigation')");
         }
         catch (WebDriverException ex) when (ex.Message.Contains("invalid session id"))
         {
@@ -106,13 +92,6 @@ private static void NavigateToOrigin<TServerFixture>(ServerTestBase<TServerFixtu
         fixture.Browser.Exists(By.Id("session-storage-anchor"));
     }
 
-    private static string GenerateTestId(IWebDriver browser)
-    {
-        var testId = Guid.NewGuid().ToString("N")[..8];
-        ((IJavaScriptExecutor)browser).ExecuteScript($"sessionStorage.setItem('test-id', '{testId}')");
-        return testId;
-    }
-
     public static long GetScrollY(this IWebDriver browser)
         => Convert.ToInt64(((IJavaScriptExecutor)browser).ExecuteScript("return window.scrollY"), CultureInfo.CurrentCulture);
 
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/App.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/App.razor
index 7b8af1442eea..f547144c8fdd 100644
--- a/src/Components/test/testassets/Components.TestServer/RazorComponents/App.razor
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/App.razor
@@ -137,8 +137,7 @@
             }
 
             const enableClassicInitializers = sessionStorage.getItem('enable-classic-initializers') === 'true';
-            const testId = sessionStorage.getItem('test-id');
-            const suppressEnhancedNavigation = testId ? sessionStorage.getItem(`suppress-enhanced-navigation-${testId}`) === 'true' : false;
+            const suppressEnhancedNavigation = sessionStorage.getItem('suppress-enhanced-navigation') === 'true';
             const blockLoadBootResource = sessionStorage.getItem('block-load-boot-resource') === 'true';
             const blockWebassemblySettings = sessionStorage.getItem('block-webassembly-settings') === 'true';
             sessionStorage.removeItem('block-load-boot-resource');
diff --git a/src/Components/test/testassets/Components.TestServer/RazorComponents/Root.razor b/src/Components/test/testassets/Components.TestServer/RazorComponents/Root.razor
index 098813212786..9238fb858c7b 100644
--- a/src/Components/test/testassets/Components.TestServer/RazorComponents/Root.razor
+++ b/src/Components/test/testassets/Components.TestServer/RazorComponents/Root.razor
@@ -14,8 +14,7 @@
 
     <script src="@Assets["_framework/blazor.web.js"]" autostart="false"></script>
     <script>
-        const testId = sessionStorage.getItem('test-id');
-        const suppressEnhancedNavigation = testId ? sessionStorage.getItem(`suppress-enhanced-navigation-${testId}`) === 'true' : false;
+        const suppressEnhancedNavigation = sessionStorage.getItem('suppress-enhanced-navigation') === 'true';
 
         let pwr = Promise.withResolvers();
         let reconnectPromise = pwr.promise;