diff --git a/src/Components/test/E2ETest/ServerExecutionTests/ServerSideAppTest.cs b/src/Components/test/E2ETest/ServerExecutionTests/ServerSideAppTest.cs
index 2a594d45bb35..f83c72f2e5c4 100644
--- a/src/Components/test/E2ETest/ServerExecutionTests/ServerSideAppTest.cs
+++ b/src/Components/test/E2ETest/ServerExecutionTests/ServerSideAppTest.cs
@@ -1,14 +1,13 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
+using System.Linq;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.E2ETesting;
 using OpenQA.Selenium;
 using OpenQA.Selenium.Support.UI;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -41,7 +40,7 @@ public void HasTitle()
         [Fact]
         public void HasHeading()
         {
-            Assert.Equal("Hello, world!", Browser.FindElement(By.TagName("h1")).Text);
+            Browser.Equal("Hello, world!", () => Browser.FindElement(By.CssSelector("h1#index")).Text);
         }
 
         [Fact]
@@ -96,7 +95,7 @@ public void HasFetchDataPage()
         {
             // Navigate to "Fetch Data"
             Browser.FindElement(By.LinkText("Fetch data")).Click();
-            Browser.Equal("Weather forecast", () => Browser.FindElement(By.TagName("h1")).Text);
+            Browser.Equal("Weather forecast", () => Browser.FindElement(By.CssSelector("h1#fetch-data")).Text);
 
             // Wait until loaded
             var tableSelector = By.CssSelector("table.table");
diff --git a/src/Components/test/E2ETest/Tests/EventTest.cs b/src/Components/test/E2ETest/Tests/EventTest.cs
index 3f9b1f38fa45..da5a98af560f 100644
--- a/src/Components/test/E2ETest/Tests/EventTest.cs
+++ b/src/Components/test/E2ETest/Tests/EventTest.cs
@@ -6,6 +6,7 @@
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
 using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
 using Microsoft.AspNetCore.E2ETesting;
+using Microsoft.AspNetCore.Testing.xunit;
 using OpenQA.Selenium;
 using OpenQA.Selenium.Interactions;
 using Xunit;
@@ -133,6 +134,7 @@ public void PreventDefault_DotNotApplyByDefault()
         }
 
         [Fact]
+        [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/1987")]
         public void InputEvent_RespondsOnKeystrokes()
         {
             MountTestComponent<InputEventComponent>();
diff --git a/src/Components/test/testassets/ComponentsApp.App/Pages/FetchData.cshtml b/src/Components/test/testassets/ComponentsApp.App/Pages/FetchData.cshtml
index 425ac534dfb5..af9cc8b037cc 100644
--- a/src/Components/test/testassets/ComponentsApp.App/Pages/FetchData.cshtml
+++ b/src/Components/test/testassets/ComponentsApp.App/Pages/FetchData.cshtml
@@ -2,7 +2,7 @@
 @page "/fetchdata/{StartDate:datetime}"
 @inject WeatherForecastService ForecastService
 
-<h1>Weather forecast</h1>
+<h1 id="fetch-data">Weather forecast</h1>
 
 <p>This component demonstrates fetching data from the server.</p>
 
diff --git a/src/Components/test/testassets/ComponentsApp.App/Pages/Index.cshtml b/src/Components/test/testassets/ComponentsApp.App/Pages/Index.cshtml
index 16dac3192520..ecc05ca6f495 100644
--- a/src/Components/test/testassets/ComponentsApp.App/Pages/Index.cshtml
+++ b/src/Components/test/testassets/ComponentsApp.App/Pages/Index.cshtml
@@ -1,5 +1,5 @@
-@page "/"
+@page "/"
 
-<h1>Hello, world!</h1>
+<h1 id="index">Hello, world!</h1>
 
 Welcome to your new app.