diff --git a/test/WebSites/LoggingWebSite/Models/RequestInfoDto.cs b/test/WebSites/LoggingWebSite/Models/RequestInfoDto.cs
index e457c1d7ce..7bfe22c44f 100644
--- a/test/WebSites/LoggingWebSite/Models/RequestInfoDto.cs
+++ b/test/WebSites/LoggingWebSite/Models/RequestInfoDto.cs
@@ -25,6 +25,6 @@ namespace LoggingWebSite
 
         public string Query { get; set; }
 
-        public IEnumerable<KeyValuePair<string, StringValues>> Cookies { get; set; }
+        public IEnumerable<KeyValuePair<string, string>> Cookies { get; set; }
     }
 }
\ No newline at end of file
diff --git a/test/WebSites/ModelBindingWebSite/Controllers/TryUpdateModelController.cs b/test/WebSites/ModelBindingWebSite/Controllers/TryUpdateModelController.cs
index c6ef4a829d..f20561174a 100644
--- a/test/WebSites/ModelBindingWebSite/Controllers/TryUpdateModelController.cs
+++ b/test/WebSites/ModelBindingWebSite/Controllers/TryUpdateModelController.cs
@@ -107,7 +107,7 @@ namespace ModelBindingWebSite.Controllers
 
         public async Task<Employee> GetEmployeeAsync_BindToBaseDeclaredType()
         {
-            var backingStore = new ReadableStringCollection(
+            var backingStore = new QueryCollection(
             new Dictionary<string, StringValues>
             {
                 { "Parent.Name", new[] { "fatherName"} },
@@ -120,7 +120,7 @@ namespace ModelBindingWebSite.Controllers
                 employee,
                 employee.GetType(),
                 prefix: string.Empty,
-                valueProvider: new ReadableStringCollectionValueProvider(
+                valueProvider: new QueryStringValueProvider(
                     BindingSource.Query,
                     backingStore,
                     CultureInfo.CurrentCulture),
@@ -131,7 +131,7 @@ namespace ModelBindingWebSite.Controllers
 
         public async Task<User> GetUserAsync_ModelType_IncludeAll(int id)
         {
-            var backingStore = new ReadableStringCollection(
+            var backingStore = new QueryCollection(
             new Dictionary<string, StringValues>
             {
                 { "Key", new[] { "123"} },
@@ -144,7 +144,7 @@ namespace ModelBindingWebSite.Controllers
             await TryUpdateModelAsync(user,
                 typeof(User),
                 prefix: string.Empty,
-                valueProvider: new ReadableStringCollectionValueProvider(
+                valueProvider: new QueryStringValueProvider(
                     BindingSource.Query,
                     backingStore,
                     CultureInfo.CurrentCulture),