diff --git a/src/Microsoft.AspNet.Hosting/WebHostBuilder.cs b/src/Microsoft.AspNet.Hosting/WebHostBuilder.cs
index 815684d2b9..ef7aeb0ecb 100644
--- a/src/Microsoft.AspNet.Hosting/WebHostBuilder.cs
+++ b/src/Microsoft.AspNet.Hosting/WebHostBuilder.cs
@@ -101,6 +101,7 @@ namespace Microsoft.AspNet.Hosting
             services.TryAdd(ServiceDescriptor.Instance(PlatformServices.Default.AssemblyLoaderContainer));
             services.TryAdd(ServiceDescriptor.Instance(PlatformServices.Default.LibraryManager));
             services.TryAdd(ServiceDescriptor.Instance(CompilationServices.Default.LibraryExporter));
+            services.TryAdd(ServiceDescriptor.Instance(CompilationServices.Default.CompilerOptionsProvider));
 
             return services;
         }
diff --git a/src/Microsoft.AspNet.TestHost/TestServer.cs b/src/Microsoft.AspNet.TestHost/TestServer.cs
index 331ad7fd76..56dce2e74c 100644
--- a/src/Microsoft.AspNet.TestHost/TestServer.cs
+++ b/src/Microsoft.AspNet.TestHost/TestServer.cs
@@ -48,7 +48,11 @@ namespace Microsoft.AspNet.TestHost
 
         public static TestServer Create(Action<IApplicationBuilder> configureApp, Func<IServiceCollection, IServiceProvider> configureServices)
         {
-            return new TestServer(CreateBuilder(config: null, configureApp: configureApp, configureServices: configureServices));
+            return new TestServer(CreateBuilder(config: null, configureApp: configureApp, configureServices: configureServices, configureHostServices: null));
+        }
+        public static TestServer Create(Action<IApplicationBuilder> configureApp, Func<IServiceCollection, IServiceProvider> configureServices, Action<IServiceCollection> configureHostServices)
+        {
+            return new TestServer(CreateBuilder(config: null, configureApp: configureApp, configureServices: configureServices, configureHostServices: configureHostServices));
         }
 
         public static TestServer Create(IConfiguration config, Action<IApplicationBuilder> configureApp, Action<IServiceCollection> configureServices)
@@ -66,12 +70,16 @@ namespace Microsoft.AspNet.TestHost
                         configureServices(s);
                     }
                     return s.BuildServiceProvider();
-                });
+                }, null);
         }
-
         public static WebHostBuilder CreateBuilder(IConfiguration config, Action<IApplicationBuilder> configureApp, Func<IServiceCollection, IServiceProvider> configureServices)
         {
-            return CreateBuilder(config).UseStartup(configureApp, configureServices);
+            return CreateBuilder(config, configureApp, configureServices, null);
+        }
+
+        public static WebHostBuilder CreateBuilder(IConfiguration config, Action<IApplicationBuilder> configureApp, Func<IServiceCollection, IServiceProvider> configureServices, Action<IServiceCollection> configureHostServices)
+        {
+            return CreateBuilder(config).UseStartup(configureApp, configureServices).UseServices(configureHostServices);
         }
 
         public static WebHostBuilder CreateBuilder(IConfiguration config)