diff --git a/apis/Google.Cloud.Firestore/Google.Cloud.Firestore.Tests/ValueComparerTest.cs b/apis/Google.Cloud.Firestore/Google.Cloud.Firestore.Tests/ValueComparerTest.cs
index a72efd8bd0cd..75b2e83bde09 100644
--- a/apis/Google.Cloud.Firestore/Google.Cloud.Firestore.Tests/ValueComparerTest.cs
+++ b/apis/Google.Cloud.Firestore/Google.Cloud.Firestore.Tests/ValueComparerTest.cs
@@ -127,7 +127,7 @@ public class ValueComparerTest
         public static IEnumerable<object[]> Values => s_valuesInOrder.Select(x => new object[] { x });
 
         // Each group has equal values.
-        public static TheoryData<dynamic[]> EqualityGroups { get; } = new TheoryData<dynamic[]>
+        public static TheoryData<IEnumerable<dynamic>> EqualityGroups { get; } = new TheoryData<IEnumerable<dynamic>>
         {
             new dynamic[] { 0, -0.0, 0.0 },
             new dynamic[] { 1, 1.0 },
@@ -166,7 +166,7 @@ public void Compare_WithSelf(dynamic clrValue)
         }
 
         [Theory, MemberData(nameof(EqualityGroups))]
-        public void Compare_EqualValues(dynamic[] clrValues)
+        public void Compare_EqualValues(IEnumerable<dynamic> clrValues)
         {
             var instance = ValueComparer.Instance;
             Value[] values = clrValues.Select(d => (Value) ProtoHelpers.CreateValue(d)).ToArray();
diff --git a/apis/Google.Cloud.Firestore/Google.Cloud.Firestore.Tests/WriteBatchTest.ValidateNoPrefixes.cs b/apis/Google.Cloud.Firestore/Google.Cloud.Firestore.Tests/WriteBatchTest.ValidateNoPrefixes.cs
index 4b44209e4e1d..82f4a5c04534 100644
--- a/apis/Google.Cloud.Firestore/Google.Cloud.Firestore.Tests/WriteBatchTest.ValidateNoPrefixes.cs
+++ b/apis/Google.Cloud.Firestore/Google.Cloud.Firestore.Tests/WriteBatchTest.ValidateNoPrefixes.cs
@@ -1,4 +1,4 @@
-// Copyright 2017, Google Inc. All rights reserved.
+// Copyright 2017, Google Inc. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,6 +14,7 @@
 
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using Xunit;
 
@@ -22,7 +23,7 @@ namespace Google.Cloud.Firestore.Tests
     // Just tests for WriteBatch.ValidateNoPrefixes
     public partial class WriteBatchTest
     {
-        public static TheoryData<FieldPath[]> ValidPathSets = new TheoryData<FieldPath[]>
+        public static TheoryData<IEnumerable<FieldPath>> ValidPathSets = new TheoryData<IEnumerable<FieldPath>>
         {
             SplitPaths("a", "b"),
             SplitPaths("a.b", "b"),
@@ -32,7 +33,7 @@ public partial class WriteBatchTest
             SplitPaths("ab.b", "b"),
         };
 
-        public static TheoryData<FieldPath[]> InvalidPathSets = new TheoryData<FieldPath[]>
+        public static TheoryData<IEnumerable<FieldPath>> InvalidPathSets = new TheoryData<IEnumerable<FieldPath>>
         {
             SplitPaths("a", "a.b"),
             SplitPaths("a", "a.b.c"),
@@ -44,7 +45,7 @@ private static FieldPath[] SplitPaths(params string[] paths) =>
 
         [Theory]
         [MemberData(nameof(ValidPathSets))]
-        public void ValidateNoPrefixes_Valid(FieldPath[] paths)
+        public void ValidateNoPrefixes_Valid(IEnumerable<FieldPath> paths)
         {
             WriteBatch.ValidateNoPrefixes(paths);
             WriteBatch.ValidateNoPrefixes(paths.Reverse());
@@ -52,10 +53,10 @@ public void ValidateNoPrefixes_Valid(FieldPath[] paths)
 
         [Theory]
         [MemberData(nameof(InvalidPathSets))]
-        public void ValidateNoPrefixes_Invalid(FieldPath[] paths)
+        public void ValidateNoPrefixes_Invalid(IEnumerable<FieldPath> paths)
         {
             Assert.Throws<ArgumentException>(() => WriteBatch.ValidateNoPrefixes(paths));
             Assert.Throws<ArgumentException>(() => WriteBatch.ValidateNoPrefixes(paths.Reverse()));
         }
     }
-}
\ No newline at end of file
+}