diff --git a/sdk/containerregistry/Azure.Containers.ContainerRegistry/tests/ContainerRepositoryLiveTests.cs b/sdk/containerregistry/Azure.Containers.ContainerRegistry/tests/ContainerRepositoryLiveTests.cs
index 879c1a69932e..6af89e26a96c 100644
--- a/sdk/containerregistry/Azure.Containers.ContainerRegistry/tests/ContainerRepositoryLiveTests.cs
+++ b/sdk/containerregistry/Azure.Containers.ContainerRegistry/tests/ContainerRepositoryLiveTests.cs
@@ -169,15 +169,9 @@ public async Task CanGetManifestsWithCustomPageSize(bool anonymous)
             AsyncPageable<ArtifactManifestProperties> artifacts = repository.GetManifestPropertiesCollectionAsync();
             var pages = artifacts.AsPages(pageSizeHint: pageSize);
 
-            int pageCount = 0;
-            await foreach (var page in pages)
-            {
-                Assert.GreaterOrEqual(page.Values.Count, pageSize);
-                pageCount++;
-            }
-
             // Assert
-            Assert.IsTrue(pageCount >= minExpectedPages);
+            int pageCount = await pages.CountAsync();
+            Assert.GreaterOrEqual(pageCount, minExpectedPages);
         }
 
         [RecordedTest]
diff --git a/sdk/containerregistry/Azure.Containers.ContainerRegistry/tests/RegistryArtifactLiveTests.cs b/sdk/containerregistry/Azure.Containers.ContainerRegistry/tests/RegistryArtifactLiveTests.cs
index fdfbeaeefa48..287c9638a52c 100644
--- a/sdk/containerregistry/Azure.Containers.ContainerRegistry/tests/RegistryArtifactLiveTests.cs
+++ b/sdk/containerregistry/Azure.Containers.ContainerRegistry/tests/RegistryArtifactLiveTests.cs
@@ -32,7 +32,7 @@ public async Task CanGetManifestListProperties()
             // Assert
             Assert.Contains(tag, properties.Tags.ToList());
             Assert.AreEqual(_repositoryName, properties.RepositoryName);
-            Assert.GreaterOrEqual(helloWorldRelatedArtifacts, properties.RelatedArtifacts.Count);
+            Assert.GreaterOrEqual(properties.RelatedArtifacts.Count, helloWorldRelatedArtifacts);
 
             Assert.IsTrue(properties.RelatedArtifacts.Any(
                 artifact =>