diff --git a/test/ServerComparison.FunctionalTests/HelloWorldTest.cs b/test/ServerComparison.FunctionalTests/HelloWorldTest.cs
index 3644ad2fb8..aacc39dbdb 100644
--- a/test/ServerComparison.FunctionalTests/HelloWorldTest.cs
+++ b/test/ServerComparison.FunctionalTests/HelloWorldTest.cs
@@ -69,7 +69,7 @@ namespace ServerComparison.FunctionalTests
                 var deploymentParameters = new DeploymentParameters(Helpers.GetApplicationPath(), serverType, runtimeFlavor, architecture)
                 {
                     ApplicationBaseUriHint = applicationBaseUrl,
-                    Command = serverType == ServerType.WebListener ? "weblistener" : "web",
+                    Command = "web",
                     EnvironmentName = "HelloWorld", // Will pick the Start class named 'StartupHelloWorld',
                     ApplicationHostConfigTemplateContent = (serverType == ServerType.IISExpress) ? File.ReadAllText("Http.config") : null,
                     SiteName = "HttpTestSite", // This is configured in the Http.config
diff --git a/test/ServerComparison.FunctionalTests/NtlmAuthentationTest.cs b/test/ServerComparison.FunctionalTests/NtlmAuthentationTest.cs
index 9c4d8510df..564c686ba2 100644
--- a/test/ServerComparison.FunctionalTests/NtlmAuthentationTest.cs
+++ b/test/ServerComparison.FunctionalTests/NtlmAuthentationTest.cs
@@ -36,7 +36,7 @@ namespace ServerComparison.FunctionalTests
                 var deploymentParameters = new DeploymentParameters(Helpers.GetApplicationPath(), serverType, runtimeFlavor, architecture)
                 {
                     ApplicationBaseUriHint = applicationBaseUrl,
-                    Command = serverType == ServerType.WebListener ? "weblistener" : "web",
+                    Command = "web",
                     EnvironmentName = "NtlmAuthentication", // Will pick the Start class named 'StartupNtlmAuthentication'
                     ApplicationHostConfigTemplateContent = (serverType == ServerType.IISExpress) ? File.ReadAllText("NtlmAuthentation.config") : null,
                     SiteName = "NtlmAuthenticationTestSite", // This is configured in the NtlmAuthentication.config
diff --git a/test/ServerComparison.FunctionalTests/ResponseTests.cs b/test/ServerComparison.FunctionalTests/ResponseTests.cs
index 6791ddca0e..25291d8d09 100644
--- a/test/ServerComparison.FunctionalTests/ResponseTests.cs
+++ b/test/ServerComparison.FunctionalTests/ResponseTests.cs
@@ -116,7 +116,7 @@ namespace ServerComparison.FunctionalTests
                 {
                     ApplicationBaseUriHint = applicationBaseUrl,
                     EnvironmentName = "Responses",
-                    Command = serverType == ServerType.WebListener ? "weblistener" : "web",
+                    Command = "web",
                     ApplicationHostConfigTemplateContent = (serverType == ServerType.IISExpress) ? File.ReadAllText("Http.config") : null,
                     SiteName = "HttpTestSite", // This is configured in the Http.config
                 };
diff --git a/test/ServerComparison.TestSites/Program.cs b/test/ServerComparison.TestSites/Program.cs
new file mode 100644
index 0000000000..81a1777506
--- /dev/null
+++ b/test/ServerComparison.TestSites/Program.cs
@@ -0,0 +1,20 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using Microsoft.AspNet.Hosting;
+
+namespace ServerComparison.TestSites
+{
+    public static class Program
+    {
+        public static void Main(string[] args)
+        {
+            var application = new WebApplicationBuilder()
+                .UseConfiguration(WebApplicationConfiguration.GetDefault(args))
+                .UseStartup("ServerComparison.TestSites")
+                .Build();
+
+            application.Run();
+        }
+    }
+}
diff --git a/test/ServerComparison.TestSites/Properties/launchSettings.json b/test/ServerComparison.TestSites/Properties/launchSettings.json
index b111483280..7e255d2086 100644
--- a/test/ServerComparison.TestSites/Properties/launchSettings.json
+++ b/test/ServerComparison.TestSites/Properties/launchSettings.json
@@ -1,10 +1,24 @@
 {
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:39982/",
+      "sslPort": 0
+    }
+  },
   "profiles": {
     "IIS Express": {
       "commandName": "IISExpress",
       "launchBrowser": true,
       "environmentVariables": {
-        "ASPNET_ENV": "HelloWorld"
+        "ASPNET_ENVIRONMENT": "HelloWorld"
+      }
+    },
+    "web": {
+      "commandName": "web",
+      "environmentVariables": {
+        "ASPNET_ENVIRONMENT": "HelloWorld"
       }
     }
   }
diff --git a/test/ServerComparison.TestSites/hosting.json b/test/ServerComparison.TestSites/hosting.json
new file mode 100644
index 0000000000..f8ef14574d
--- /dev/null
+++ b/test/ServerComparison.TestSites/hosting.json
@@ -0,0 +1,3 @@
+{
+  "server": "Microsoft.AspNet.Server.Kestrel"
+}
diff --git a/test/ServerComparison.TestSites/project.json b/test/ServerComparison.TestSites/project.json
index b8b20a984c..47c044c6b7 100644
--- a/test/ServerComparison.TestSites/project.json
+++ b/test/ServerComparison.TestSites/project.json
@@ -1,38 +1,39 @@
 {
-    "webroot": "wwwroot",
-    "version": "1.0.0-*",
+  "version": "1.0.0-*",
 
-    "dependencies": {
-        "Microsoft.AspNet.IISPlatformHandler": "1.0.0-*",
-        "Microsoft.AspNet.Server.Kestrel": "1.0.0-*",
-        "Microsoft.AspNet.Server.WebListener": "1.0.0-*",
-        "Microsoft.AspNet.WebUtilities": "1.0.0-*",
-        "Microsoft.Extensions.Configuration.Json": "1.0.0-*",
-        "Microsoft.Extensions.Logging.Console": "1.0.0-*",
-        "Microsoft.Net.Http.Headers": "1.0.0-*"
-    },
+  "dependencies": {
+    "Microsoft.AspNet.IISPlatformHandler": "1.0.0-*",
+    "Microsoft.AspNet.Server.Kestrel": "1.0.0-*",
+    "Microsoft.AspNet.Server.WebListener": "1.0.0-*",
+    "Microsoft.AspNet.WebUtilities": "1.0.0-*",
+    "Microsoft.Extensions.Configuration.Json": "1.0.0-*",
+    "Microsoft.Extensions.Logging.Console": "1.0.0-*",
+    "Microsoft.Net.Http.Headers": "1.0.0-*"
+  },
 
-    "commands": {
-        "kestrel": "Microsoft.AspNet.Server.Kestrel",
-        "web": "Microsoft.AspNet.Server.Kestrel",
-        "weblistener": "Microsoft.AspNet.Server.WebListener"
-    },
+  "commands": {
+    "web": "ServerComparison.TestSites"
+  },
 
-    "frameworks": {
-        "dnx451": { },
-        "dnxcore50": { }
-    },
+  "compilationOptions": {
+    "emitEntryPoint": true
+  },
 
-    "publishExclude": [
-        "node_modules",
-        "bower_components",
-        "**.xproj",
-        "**.user",
-        "**.vspscc"
-    ],
-    "exclude": [
-        "wwwroot",
-        "node_modules",
-        "bower_components"
-    ]
+  "frameworks": {
+    "dnx451": { },
+    "dnxcore50": { }
+  },
+
+  "publishExclude": [
+    "node_modules",
+    "bower_components",
+    "**.xproj",
+    "**.user",
+    "**.vspscc"
+  ],
+  "exclude": [
+    "wwwroot",
+    "node_modules",
+    "bower_components"
+  ]
 }