diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Home/IndexTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Home/IndexTests.cs
index 8c723158..33f7491a 100644
--- a/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Home/IndexTests.cs
+++ b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Home/IndexTests.cs
@@ -117,8 +117,7 @@ public void ShouldSetAbsoluteUriForOgData(string givenUri, string expectedUri)
 
         var cut = ctx.RenderComponent<Index>();
 
-        cut.WaitForState(() => cut.FindComponents<OgData>().Any());
-        cut.FindComponent<OgData>().Instance.AbsolutePreviewImageUrl.Should().Be(expectedUri);
+        cut.WaitForComponent<OgData>().Instance.AbsolutePreviewImageUrl.Should().Be(expectedUri);
     }
 
     [Theory]
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Search/SearchPageTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Search/SearchPageTests.cs
index f64b7d91..d3171739 100644
--- a/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Search/SearchPageTests.cs
+++ b/tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Search/SearchPageTests.cs
@@ -23,10 +23,8 @@ public async Task ShouldFindBlogPostWhenTitleMatches()
 
         var cut = ctx.RenderComponent<SearchPage>(p => p.Add(s => s.SearchTerm, "Title 1"));
 
-        cut.WaitForState(() => cut.FindComponents<ShortBlogPost>().Any());
-        var blogPosts = cut.FindComponents<ShortBlogPost>();
-        blogPosts.Should().HaveCount(1);
-        blogPosts.Single().Find(".description h1").TextContent.Should().Be("Title 1");
+        var blogPosts = cut.WaitForComponent<ShortBlogPost>();
+        blogPosts.Find(".description h1").TextContent.Should().Be("Title 1");
     }
 
     [Fact]
@@ -41,10 +39,8 @@ public async Task ShouldFindBlogPostWhenTagMatches()
 
         var cut = ctx.RenderComponent<SearchPage>(p => p.Add(s => s.SearchTerm, "Cat"));
 
-        cut.WaitForState(() => cut.FindComponents<ShortBlogPost>().Any());
-        var blogPosts = cut.FindComponents<ShortBlogPost>();
-        blogPosts.Should().HaveCount(1);
-        blogPosts.Single().Find(".description h1").TextContent.Should().Be("Title 1");
+        var blogPost = cut.WaitForComponent<ShortBlogPost>();
+        blogPost.Find(".description h1").TextContent.Should().Be("Title 1");
     }
 
     [Fact]
@@ -57,10 +53,8 @@ public async Task ShouldUnescapeQuery()
 
         var cut = ctx.RenderComponent<SearchPage>(p => p.Add(s => s.SearchTerm, "Title%201"));
 
-        cut.WaitForState(() => cut.FindComponents<ShortBlogPost>().Any());
-        var blogPosts = cut.FindComponents<ShortBlogPost>();
-        blogPosts.Should().HaveCount(1);
-        blogPosts.Single().Find(".description h1").TextContent.Should().Be("Title 1");
+        var blogPosts = cut.WaitForComponent<ShortBlogPost>();
+        blogPosts.Find(".description h1").TextContent.Should().Be("Title 1");
     }
 
     private void RegisterServices(TestContext ctx)
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/Skills/SkillTableTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/Skills/SkillTableTests.cs
index 9fb0abd8..66daa331 100644
--- a/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/Skills/SkillTableTests.cs
+++ b/tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/Skills/SkillTableTests.cs
@@ -67,8 +67,7 @@ public async Task ShouldNotAllowToEditSkillTagsWhenNotAdmin()
         var cut = ctx.RenderComponent<SkillTable>(p =>
             p.Add(s => s.ShowAdminActions, false));
 
-        cut.WaitForState(() => cut.FindComponents<SkillTag>().Any());
-        cut.FindComponent<SkillTag>().Instance.ShowAdminActions.Should().BeFalse();
+        cut.WaitForComponent<SkillTag>().Instance.ShowAdminActions.Should().BeFalse();
     }
 
     [Fact]
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/Sitemap/SitemapPageTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/Sitemap/SitemapPageTests.cs
index 3403f28f..79b33827 100644
--- a/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/Sitemap/SitemapPageTests.cs
+++ b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/Sitemap/SitemapPageTests.cs
@@ -43,8 +43,7 @@ public void ShouldDisplaySitemap()
 
         cut.Find("button").Click();
 
-        cut.WaitForState(() => cut.FindAll("tr").Count > 1);
-        var row = cut.FindAll("tr").Last();
+        var row = cut.WaitForElements("tr").Last();
         row.Children.First().InnerHtml.Should().Be("loc");
         row.Children.Last().InnerHtml.Should().Be("Now");
     }