diff --git a/tests/KubernetesClient.Tests/AuthTests.cs b/tests/KubernetesClient.Tests/AuthTests.cs
index 6a79aa12a..cd8777a73 100644
--- a/tests/KubernetesClient.Tests/AuthTests.cs
+++ b/tests/KubernetesClient.Tests/AuthTests.cs
@@ -49,7 +49,7 @@ public void Anonymous()
                 var listTask = ExecuteListPods(client);
 
                 Assert.True(listTask.Response.IsSuccessStatusCode);
-                Assert.Equal(1, listTask.Body.Items.Count);
+                Assert.Single(listTask.Body.Items);
             }
 
             using (var server = new MockKubeApiServer(testOutput, cxt =>
@@ -114,7 +114,7 @@ public void BasicAuth()
 
                     var listTask = ExecuteListPods(client);
                     Assert.True(listTask.Response.IsSuccessStatusCode);
-                    Assert.Equal(1, listTask.Body.Items.Count);
+                    Assert.Single(listTask.Body.Items);
                 }
 
                 {
@@ -224,7 +224,7 @@ public void Cert()
 
                     Assert.True(clientCertificateValidationCalled);
                     Assert.True(listTask.Response.IsSuccessStatusCode);
-                    Assert.Equal(1, listTask.Body.Items.Count);
+                    Assert.Single(listTask.Body.Items);
                 }
 
                 {
@@ -241,7 +241,7 @@ public void Cert()
 
                     Assert.True(clientCertificateValidationCalled);
                     Assert.True(listTask.Response.IsSuccessStatusCode);
-                    Assert.Equal(1, listTask.Body.Items.Count);
+                    Assert.Single(listTask.Body.Items);
                 }
 
                 {
@@ -324,7 +324,7 @@ public void ExternalCertificate()
                     var client = new Kubernetes(clientConfig);
                     var listTask = ExecuteListPods(client);
                     Assert.True(listTask.Response.IsSuccessStatusCode);
-                    Assert.Equal(1, listTask.Body.Items.Count);
+                    Assert.Single(listTask.Body.Items);
                 }
 
                 {
@@ -368,7 +368,7 @@ public void ExternalToken()
                     var client = new Kubernetes(clientConfig);
                     var listTask = ExecuteListPods(client);
                     Assert.True(listTask.Response.IsSuccessStatusCode);
-                    Assert.Equal(1, listTask.Body.Items.Count);
+                    Assert.Single(listTask.Body.Items);
                 }
 
                 {
@@ -410,7 +410,7 @@ public void Token()
 
                     var listTask = ExecuteListPods(client);
                     Assert.True(listTask.Response.IsSuccessStatusCode);
-                    Assert.Equal(1, listTask.Body.Items.Count);
+                    Assert.Single(listTask.Body.Items);
                 }
 
                 {
@@ -478,7 +478,7 @@ public void Oidc()
 
                     var listTask = ExecuteListPods(client);
                     Assert.True(listTask.Response.IsSuccessStatusCode);
-                    Assert.Equal(1, listTask.Body.Items.Count);
+                    Assert.Single(listTask.Body.Items);
                 }
 
                 {
@@ -493,7 +493,7 @@ public void Oidc()
                     try
                     {
                         PeelAggregate(() => ExecuteListPods(client));
-                        Assert.True(false, "should not be here");
+                        Assert.Fail("should not be here");
                     }
                     catch (KubernetesClientException e)
                     {
@@ -513,7 +513,7 @@ public void Oidc()
                     try
                     {
                         PeelAggregate(() => ExecuteListPods(client));
-                        Assert.True(false, "should not be here");
+                        Assert.Fail("should not be here");
                     }
                     catch (KubernetesClientException e)
                     {
@@ -528,7 +528,7 @@ private static void ShouldThrowUnauthorized(Kubernetes client)
             try
             {
                 PeelAggregate(() => ExecuteListPods(client));
-                Assert.True(false, "should not be here");
+                Assert.Fail("should not be here");
             }
             catch (HttpOperationException e)
             {
diff --git a/tests/KubernetesClient.Tests/LeaderElection/LeaderElectionTests.cs b/tests/KubernetesClient.Tests/LeaderElection/LeaderElectionTests.cs
index 3bac7e6f3..1e65f8dfb 100644
--- a/tests/KubernetesClient.Tests/LeaderElection/LeaderElectionTests.cs
+++ b/tests/KubernetesClient.Tests/LeaderElection/LeaderElectionTests.cs
@@ -313,7 +313,7 @@ public void LeaderElectionThrowException()
                 return;
             }
 
-            Assert.True(false, "exception not thrown");
+            Assert.Fail("exception not thrown");
         }
 
         [Fact]
diff --git a/tests/KubernetesClient.Tests/ModelExtensionTests.cs b/tests/KubernetesClient.Tests/ModelExtensionTests.cs
index f7b714530..220c8586f 100644
--- a/tests/KubernetesClient.Tests/ModelExtensionTests.cs
+++ b/tests/KubernetesClient.Tests/ModelExtensionTests.cs
@@ -82,8 +82,8 @@ public void TestMetadata()
             // test annotations and labels
             pod.SetAnnotation("x", "y");
             pod.SetLabel("a", "b");
-            Assert.Equal(1, pod.Annotations().Count);
-            Assert.Equal(1, pod.Labels().Count);
+            Assert.Single(pod.Annotations());
+            Assert.Single(pod.Labels());
             Assert.Equal("y", pod.GetAnnotation("x"));
             Assert.Equal("y", pod.Metadata.Annotations["x"]);
             Assert.Null(pod.GetAnnotation("a"));
@@ -91,9 +91,9 @@ public void TestMetadata()
             Assert.Equal("b", pod.Metadata.Labels["a"]);
             Assert.Null(pod.GetLabel("x"));
             pod.SetAnnotation("x", null);
-            Assert.Equal(0, pod.Annotations().Count);
+            Assert.Empty(pod.Annotations());
             pod.SetLabel("a", null);
-            Assert.Equal(0, pod.Labels().Count);
+            Assert.Empty(pod.Labels());
 
             // test finalizers
             Assert.False(pod.HasFinalizer("abc"));
@@ -153,7 +153,7 @@ public void TestReferences()
             svc.OwnerReferences()[0].Controller = true;
             Assert.Same(ownr, svc.GetController());
             Assert.Same(ownr, svc.RemoveOwnerReference(pod));
-            Assert.Equal(0, svc.OwnerReferences().Count);
+            Assert.Empty(svc.OwnerReferences());
             svc.AddOwnerReference(new V1OwnerReference() { ApiVersion = pod.ApiVersion, Kind = pod.Kind, Name = pod.Name(), Uid = pod.Uid(), Controller = true });
             svc.AddOwnerReference(new V1OwnerReference() { ApiVersion = pod.ApiVersion, Kind = pod.Kind, Name = pod.Name(), Uid = pod.Uid(), Controller = false });
             svc.AddOwnerReference(new V1OwnerReference() { ApiVersion = pod.ApiVersion, Kind = pod.Kind, Name = pod.Name(), Uid = pod.Uid() });
@@ -161,7 +161,7 @@ public void TestReferences()
             Assert.NotNull(svc.RemoveOwnerReference(pod));
             Assert.Equal(2, svc.OwnerReferences().Count);
             Assert.True(svc.RemoveOwnerReferences(pod));
-            Assert.Equal(0, svc.OwnerReferences().Count);
+            Assert.Empty(svc.OwnerReferences());
         }
 
         [Fact]
diff --git a/tests/KubernetesClient.Tests/OidcAuthTests.cs b/tests/KubernetesClient.Tests/OidcAuthTests.cs
index 9889c3ff7..8eccf4755 100644
--- a/tests/KubernetesClient.Tests/OidcAuthTests.cs
+++ b/tests/KubernetesClient.Tests/OidcAuthTests.cs
@@ -32,7 +32,7 @@ public async Task TestOidcAuth()
                 result = await auth.GetAuthenticationHeaderAsync(CancellationToken.None).ConfigureAwait(false);
                 result.Scheme.Should().Be("Bearer");
                 result.Parameter.Should().Be(expiredIdToken);
-                Assert.True(false, "should not be here");
+                Assert.Fail("should not be here");
             }
             catch (KubernetesClientException e)
             {
@@ -46,7 +46,7 @@ public async Task TestOidcAuth()
                 result = await auth.GetAuthenticationHeaderAsync(CancellationToken.None).ConfigureAwait(false);
                 result.Scheme.Should().Be("Bearer");
                 result.Parameter.Should().Be(expiredIdToken);
-                Assert.True(false, "should not be here");
+                Assert.Fail("should not be here");
             }
             catch (KubernetesClientException e)
             {