diff --git a/src/MusicStore/Controllers/CheckoutController.cs b/src/MusicStore/Controllers/CheckoutController.cs
index 34817dd87d..41a8d1b41e 100644
--- a/src/MusicStore/Controllers/CheckoutController.cs
+++ b/src/MusicStore/Controllers/CheckoutController.cs
@@ -33,7 +33,7 @@ namespace MusicStore.Controllers
         [ValidateAntiForgeryToken]
         public async Task<IActionResult> AddressAndPayment(Order order)
         {
-            var formCollection = await Context.Request.GetFormAsync();
+            var formCollection = await Context.Request.ReadFormAsync();
 
             try
             {
diff --git a/src/MusicStore/Controllers/ShoppingCartController.cs b/src/MusicStore/Controllers/ShoppingCartController.cs
index 7c6f8b9aa5..544cc5d78e 100644
--- a/src/MusicStore/Controllers/ShoppingCartController.cs
+++ b/src/MusicStore/Controllers/ShoppingCartController.cs
@@ -59,7 +59,7 @@ namespace MusicStore.Controllers
         [HttpPost]
         public async Task<IActionResult> RemoveFromCart(int id)
         {
-            var formParameters = await Context.Request.GetFormAsync();
+            var formParameters = await Context.Request.ReadFormAsync();
             var requestVerification = formParameters["RequestVerificationToken"];
             string cookieToken = null;
             string formToken = null;
diff --git a/test/E2ETests/Implementation/FacebookLoginScenarios.cs b/test/E2ETests/Implementation/FacebookLoginScenarios.cs
index 0d26ff6d4e..72232e4c67 100644
--- a/test/E2ETests/Implementation/FacebookLoginScenarios.cs
+++ b/test/E2ETests/Implementation/FacebookLoginScenarios.cs
@@ -1,9 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Net.Http;
 using System.Net;
-using Xunit;
+using System.Net.Http;
+using Microsoft.AspNet.PipelineCore.Collections;
 using Microsoft.AspNet.WebUtilities;
+using Xunit;
 
 namespace E2ETests
 {
@@ -28,7 +29,7 @@ namespace E2ETests
             var content = new FormUrlEncodedContent(formParameters.ToArray());
             response = _httpClient.PostAsync("Account/ExternalLogin", content).Result;
             Assert.Equal<string>("https://www.facebook.com/v2.2/dialog/oauth", response.Headers.Location.AbsoluteUri.Replace(response.Headers.Location.Query, string.Empty));
-            var queryItems = QueryHelpers.ParseQuery(response.Headers.Location.Query);
+            var queryItems = new ReadableStringCollection(QueryHelpers.ParseQuery(response.Headers.Location.Query));
             Assert.Equal<string>("code", queryItems["response_type"]);
             Assert.Equal<string>("[AppId]", queryItems["client_id"]);
             Assert.Equal<string>(_applicationBaseUrl + "signin-facebook", queryItems["redirect_uri"]);
diff --git a/test/E2ETests/Implementation/GoogleLoginScenarios.cs b/test/E2ETests/Implementation/GoogleLoginScenarios.cs
index 7542d75f37..47c66486c1 100644
--- a/test/E2ETests/Implementation/GoogleLoginScenarios.cs
+++ b/test/E2ETests/Implementation/GoogleLoginScenarios.cs
@@ -1,9 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Net.Http;
 using System.Net;
-using Xunit;
+using System.Net.Http;
+using Microsoft.AspNet.PipelineCore.Collections;
 using Microsoft.AspNet.WebUtilities;
+using Xunit;
 
 namespace E2ETests
 {
@@ -28,7 +29,7 @@ namespace E2ETests
             var content = new FormUrlEncodedContent(formParameters.ToArray());
             response = _httpClient.PostAsync("Account/ExternalLogin", content).Result;
             Assert.Equal<string>("https://accounts.google.com/o/oauth2/auth", response.Headers.Location.AbsoluteUri.Replace(response.Headers.Location.Query, string.Empty));
-            var queryItems = QueryHelpers.ParseQuery(response.Headers.Location.Query);
+            var queryItems = new ReadableStringCollection(QueryHelpers.ParseQuery(response.Headers.Location.Query));
             Assert.Equal<string>("code", queryItems["response_type"]);
             Assert.Equal<string>("offline", queryItems["access_type"]);
             Assert.Equal<string>("[ClientId]", queryItems["client_id"]);
diff --git a/test/E2ETests/Implementation/MicrosoftAccountAuthenticationScenarios.cs b/test/E2ETests/Implementation/MicrosoftAccountAuthenticationScenarios.cs
index 6b7f4cbcf0..7359912a41 100644
--- a/test/E2ETests/Implementation/MicrosoftAccountAuthenticationScenarios.cs
+++ b/test/E2ETests/Implementation/MicrosoftAccountAuthenticationScenarios.cs
@@ -1,9 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Net.Http;
 using System.Net;
-using Xunit;
+using System.Net.Http;
+using Microsoft.AspNet.PipelineCore.Collections;
 using Microsoft.AspNet.WebUtilities;
+using Xunit;
 
 namespace E2ETests
 {
@@ -28,7 +29,7 @@ namespace E2ETests
             var content = new FormUrlEncodedContent(formParameters.ToArray());
             response = _httpClient.PostAsync("Account/ExternalLogin", content).Result;
             Assert.Equal<string>("https://login.live.com/oauth20_authorize.srf", response.Headers.Location.AbsoluteUri.Replace(response.Headers.Location.Query, string.Empty));
-            var queryItems = QueryHelpers.ParseQuery(response.Headers.Location.Query);
+            var queryItems = new ReadableStringCollection(QueryHelpers.ParseQuery(response.Headers.Location.Query));
             Assert.Equal<string>("code", queryItems["response_type"]);
             Assert.Equal<string>("[ClientId]", queryItems["client_id"]);
             Assert.Equal<string>(_applicationBaseUrl + "signin-microsoft", queryItems["redirect_uri"]);
diff --git a/test/E2ETests/Implementation/TwitterLoginScenarios.cs b/test/E2ETests/Implementation/TwitterLoginScenarios.cs
index 529a7d8166..88642d2b24 100644
--- a/test/E2ETests/Implementation/TwitterLoginScenarios.cs
+++ b/test/E2ETests/Implementation/TwitterLoginScenarios.cs
@@ -1,9 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Net.Http;
 using System.Net;
-using Xunit;
+using System.Net.Http;
+using Microsoft.AspNet.PipelineCore.Collections;
 using Microsoft.AspNet.WebUtilities;
+using Xunit;
 
 namespace E2ETests
 {
@@ -31,7 +32,7 @@ namespace E2ETests
             var content = new FormUrlEncodedContent(formParameters.ToArray());
             response = _httpClient.PostAsync("Account/ExternalLogin", content).Result;
             Assert.Equal<string>("https://twitter.com/oauth/authenticate", response.Headers.Location.AbsoluteUri.Replace(response.Headers.Location.Query, string.Empty));
-            var queryItems = QueryHelpers.ParseQuery(response.Headers.Location.Query);
+            var queryItems = new ReadableStringCollection(QueryHelpers.ParseQuery(response.Headers.Location.Query));
             Assert.Equal<string>("custom", queryItems["custom_redirect_uri"]);
             Assert.Equal<string>("valid_oauth_token", queryItems["oauth_token"]);
             //Check for the correlation cookie
diff --git a/test/E2ETests/compiler/shared/Mocks/Facebook/FacebookMockBackChannelHttpHandler.cs b/test/E2ETests/compiler/shared/Mocks/Facebook/FacebookMockBackChannelHttpHandler.cs
index 43787a14f5..57bc76a25b 100644
--- a/test/E2ETests/compiler/shared/Mocks/Facebook/FacebookMockBackChannelHttpHandler.cs
+++ b/test/E2ETests/compiler/shared/Mocks/Facebook/FacebookMockBackChannelHttpHandler.cs
@@ -1,6 +1,7 @@
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.AspNet.PipelineCore.Collections;
 using Microsoft.AspNet.WebUtilities;
 using MusicStore.Mocks.Common;
 
@@ -14,7 +15,7 @@ namespace MusicStore.Mocks.Facebook
         protected async override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
         {
             var response = new HttpResponseMessage();
-            var queryParameters = QueryHelpers.ParseQuery(request.RequestUri.Query);
+            var queryParameters = new ReadableStringCollection(QueryHelpers.ParseQuery(request.RequestUri.Query));
 
             if (request.RequestUri.AbsoluteUri.StartsWith("https://graph.facebook.com/v2.2/oauth/access_token"))
             {
diff --git a/test/E2ETests/compiler/shared/Mocks/Google/GoogleMockBackChannelHttpHandler.cs b/test/E2ETests/compiler/shared/Mocks/Google/GoogleMockBackChannelHttpHandler.cs
index 6b330f0491..c094219941 100644
--- a/test/E2ETests/compiler/shared/Mocks/Google/GoogleMockBackChannelHttpHandler.cs
+++ b/test/E2ETests/compiler/shared/Mocks/Google/GoogleMockBackChannelHttpHandler.cs
@@ -2,6 +2,7 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.AspNet.PipelineCore.Collections;
 using Microsoft.AspNet.WebUtilities;
 
 namespace MusicStore.Mocks.Google
@@ -17,7 +18,7 @@ namespace MusicStore.Mocks.Google
 
             if (request.RequestUri.AbsoluteUri.StartsWith("https://accounts.google.com/o/oauth2/token"))
             {
-                var formData = FormHelpers.ParseForm(await request.Content.ReadAsStringAsync());
+                var formData = new FormCollection(await FormReader.ReadFormAsync(await request.Content.ReadAsStreamAsync()));
                 if (formData["grant_type"] == "authorization_code")
                 {
                     if (formData["code"] == "ValidCode")
diff --git a/test/E2ETests/compiler/shared/Mocks/MicrosoftAccount/MicrosoftAccountMockBackChannelHandler.cs b/test/E2ETests/compiler/shared/Mocks/MicrosoftAccount/MicrosoftAccountMockBackChannelHandler.cs
index 9d2f341b8b..ba3f9f611c 100644
--- a/test/E2ETests/compiler/shared/Mocks/MicrosoftAccount/MicrosoftAccountMockBackChannelHandler.cs
+++ b/test/E2ETests/compiler/shared/Mocks/MicrosoftAccount/MicrosoftAccountMockBackChannelHandler.cs
@@ -2,6 +2,7 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.AspNet.PipelineCore.Collections;
 using Microsoft.AspNet.WebUtilities;
 
 namespace MusicStore.Mocks.MicrosoftAccount
@@ -17,7 +18,7 @@ namespace MusicStore.Mocks.MicrosoftAccount
 
             if (request.RequestUri.AbsoluteUri.StartsWith("https://login.live.com/oauth20_token.srf"))
             {
-                var formData = FormHelpers.ParseForm(await request.Content.ReadAsStringAsync());
+                var formData = new FormCollection(await FormReader.ReadFormAsync(await request.Content.ReadAsStreamAsync()));
                 if (formData["grant_type"] == "authorization_code")
                 {
                     if (formData["code"] == "ValidCode")
diff --git a/test/E2ETests/compiler/shared/Mocks/Twitter/TwitterMockBackChannelHttpHandler.cs b/test/E2ETests/compiler/shared/Mocks/Twitter/TwitterMockBackChannelHttpHandler.cs
index 0d38b92eff..23391b1d42 100644
--- a/test/E2ETests/compiler/shared/Mocks/Twitter/TwitterMockBackChannelHttpHandler.cs
+++ b/test/E2ETests/compiler/shared/Mocks/Twitter/TwitterMockBackChannelHttpHandler.cs
@@ -3,6 +3,7 @@ using System.Net;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.AspNet.PipelineCore.Collections;
 using Microsoft.AspNet.WebUtilities;
 
 namespace MusicStore.Mocks.Twitter
@@ -20,7 +21,7 @@ namespace MusicStore.Mocks.Twitter
 
             if (request.RequestUri.AbsoluteUri.StartsWith("https://api.twitter.com/oauth/access_token"))
             {
-                var formData = FormHelpers.ParseForm(await request.Content.ReadAsStringAsync());
+                var formData = new FormCollection(await FormReader.ReadFormAsync(await request.Content.ReadAsStreamAsync()));
                 if (formData["oauth_verifier"] == "valid_oauth_verifier")
                 {
                     if (_requestTokenEndpointInvoked)