diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/AuthenticationTests.cs b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/AuthenticationTests.cs
index f8a8c03947..d514a9f65c 100644
--- a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/AuthenticationTests.cs
+++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/AuthenticationTests.cs
@@ -22,7 +22,7 @@ using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.AspNet.FeatureModel;
-using Microsoft.AspNet.Http.Core;
+using Microsoft.AspNet.Http;
 using Microsoft.Net.Http.Server;
 using Xunit;
 using AuthenticationSchemes = Microsoft.Net.Http.Server.AuthenticationSchemes;
diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/HttpsTests.cs b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/HttpsTests.cs
index 64a2b91072..b7c89ef1ad 100644
--- a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/HttpsTests.cs
+++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/HttpsTests.cs
@@ -23,7 +23,6 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNet.FeatureModel;
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Http.Core;
 using Xunit;
 
 namespace Microsoft.AspNet.Server.WebListener
diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/OpaqueUpgradeTests.cs b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/OpaqueUpgradeTests.cs
index 189cc35c90..162140a01c 100644
--- a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/OpaqueUpgradeTests.cs
+++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/OpaqueUpgradeTests.cs
@@ -24,7 +24,6 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNet.FeatureModel;
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Http.Core;
 using Microsoft.AspNet.Testing.xunit;
 using Xunit;
 
diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/RequestBodyTests.cs b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/RequestBodyTests.cs
index 9763e76d33..b91951374c 100644
--- a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/RequestBodyTests.cs
+++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/RequestBodyTests.cs
@@ -24,7 +24,7 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNet.FeatureModel;
-using Microsoft.AspNet.Http.Core;
+using Microsoft.AspNet.Http;
 using Xunit;
 
 namespace Microsoft.AspNet.Server.WebListener
diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/RequestHeaderTests.cs b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/RequestHeaderTests.cs
index ca104ef2c8..c5df794e2f 100644
--- a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/RequestHeaderTests.cs
+++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/RequestHeaderTests.cs
@@ -21,7 +21,7 @@ using System.Net.Sockets;
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNet.FeatureModel;
-using Microsoft.AspNet.Http.Core;
+using Microsoft.AspNet.Http;
 using Xunit;
 
 namespace Microsoft.AspNet.Server.WebListener
diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/RequestTests.cs b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/RequestTests.cs
index e87b8c0940..d0e502ad0c 100644
--- a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/RequestTests.cs
+++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/RequestTests.cs
@@ -22,7 +22,6 @@ using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNet.FeatureModel;
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Http.Core;
 using Microsoft.Net.Http.Server;
 using Xunit;
 
diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ResponseBodyTests.cs b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ResponseBodyTests.cs
index 2792b3bd35..e4cf7b4a33 100644
--- a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ResponseBodyTests.cs
+++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ResponseBodyTests.cs
@@ -23,7 +23,7 @@ using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNet.FeatureModel;
-using Microsoft.AspNet.Http.Core;
+using Microsoft.AspNet.Http;
 using Xunit;
 
 namespace Microsoft.AspNet.Server.WebListener
diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ResponseHeaderTests.cs b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ResponseHeaderTests.cs
index 56cf7214ee..f6c887af11 100644
--- a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ResponseHeaderTests.cs
+++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ResponseHeaderTests.cs
@@ -22,7 +22,6 @@ using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.AspNet.FeatureModel;
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Http.Core;
 using Xunit;
 
 namespace Microsoft.AspNet.Server.WebListener
diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ResponseSendFileTests.cs b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ResponseSendFileTests.cs
index 4da7f00ee9..76ae3e5a62 100644
--- a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ResponseSendFileTests.cs
+++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ResponseSendFileTests.cs
@@ -26,7 +26,6 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNet.FeatureModel;
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Http.Core;
 using Xunit;
 
 namespace Microsoft.AspNet.Server.WebListener
diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ResponseTests.cs b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ResponseTests.cs
index 17ddeb7137..fe173fc13b 100644
--- a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ResponseTests.cs
+++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ResponseTests.cs
@@ -21,7 +21,6 @@ using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.AspNet.FeatureModel;
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Http.Core;
 using Xunit;
 
 namespace Microsoft.AspNet.Server.WebListener
diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ServerTests.cs b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ServerTests.cs
index 5a85157c6b..fc9fb62e83 100644
--- a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ServerTests.cs
+++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/ServerTests.cs
@@ -26,7 +26,6 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNet.FeatureModel;
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Http.Core;
 using Microsoft.Net.Http.Server;
 using Xunit;
 
diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/WebSocketTests.cs b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/WebSocketTests.cs
index c486371ea0..b0f7c98e8f 100644
--- a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/WebSocketTests.cs
+++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/WebSocketTests.cs
@@ -22,7 +22,6 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNet.FeatureModel;
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Http.Core;
 using Microsoft.AspNet.Testing.xunit;
 using Xunit;
 
diff --git a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/project.json b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/project.json
index 71d430dee6..310ae5d0f1 100644
--- a/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/project.json
+++ b/test/Microsoft.AspNet.Server.WebListener.FunctionalTests/project.json
@@ -3,7 +3,7 @@
         "test": "xunit.runner.aspnet"
     },
     "dependencies": {
-        "Microsoft.AspNet.Http.Core": "1.0.0-*",
+        "Microsoft.AspNet.Http": "1.0.0-*",
         "Microsoft.AspNet.Server.WebListener": "1.0.0-*",
         "Microsoft.AspNet.Testing": "1.0.0-*",
         "xunit.runner.aspnet": "2.0.0-aspnet-*"