diff --git a/src/Microsoft.AspNetCore.Hosting/Startup/DelegateStartup.cs b/src/Microsoft.AspNetCore.Hosting/Startup/DelegateStartup.cs
index 843a8f6c6f..d354ad946e 100644
--- a/src/Microsoft.AspNetCore.Hosting/Startup/DelegateStartup.cs
+++ b/src/Microsoft.AspNetCore.Hosting/Startup/DelegateStartup.cs
@@ -3,14 +3,15 @@
 
 using System;
 using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.AspNetCore.Hosting
 {
-    public class DelegateStartup : StartupBase
+    public class DelegateStartup : StartupBase<IServiceCollection>
     {
         private Action<IApplicationBuilder> _configureApp;
-        
-        public DelegateStartup(Action<IApplicationBuilder> configureApp)
+
+        public DelegateStartup(IServiceProviderFactory<IServiceCollection> factory, Action<IApplicationBuilder> configureApp) : base(factory)
         {
             _configureApp = configureApp;
         }
diff --git a/src/Microsoft.AspNetCore.Hosting/WebHostBuilderExtensions.cs b/src/Microsoft.AspNetCore.Hosting/WebHostBuilderExtensions.cs
index 79598203f0..6e2b7a7552 100644
--- a/src/Microsoft.AspNetCore.Hosting/WebHostBuilderExtensions.cs
+++ b/src/Microsoft.AspNetCore.Hosting/WebHostBuilderExtensions.cs
@@ -6,6 +6,7 @@ using System.Reflection;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting.Internal;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 
 namespace Microsoft.AspNetCore.Hosting
 {
@@ -29,7 +30,10 @@ namespace Microsoft.AspNetCore.Hosting
             return hostBuilder.UseSetting(WebHostDefaults.ApplicationKey, startupAssemblyName)
                               .ConfigureServices(services =>
                               {
-                                  services.AddSingleton<IStartup>(new DelegateStartup(configureApp));
+                                  services.AddSingleton<IStartup>(sp =>
+                                  {
+                                      return new DelegateStartup(sp.GetRequiredService<IServiceProviderFactory<IServiceCollection>>(), configureApp);
+                                  });
                               });
         }
 
@@ -72,5 +76,21 @@ namespace Microsoft.AspNetCore.Hosting
         {
             return hostBuilder.UseStartup(typeof(TStartup));
         }
+
+        /// <summary>
+        /// Configures the default service provider
+        /// </summary>
+        /// <param name="hostBuilder">The <see cref="IWebHostBuilder"/> to configure.</param>
+        /// <param name="configure">A callback used to configure the <see cref="ServiceProviderOptions"/> for the default <see cref="IServiceProvider"/>.</param>
+        /// <returns>The <see cref="IWebHostBuilder"/>.</returns>
+        public static IWebHostBuilder UseDefaultServiceProvider(this IWebHostBuilder hostBuilder, Action<ServiceProviderOptions> configure)
+        {
+            return hostBuilder.ConfigureServices(services =>
+            {
+                var options = new ServiceProviderOptions();
+                configure(options);
+                services.Replace(ServiceDescriptor.Singleton<IServiceProviderFactory<IServiceCollection>>(new DefaultServiceProviderFactory(options)));
+            });
+        }
     }
 }
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/WebHostBuilderTests.cs b/test/Microsoft.AspNetCore.Hosting.Tests/WebHostBuilderTests.cs
index 4d9795b45f..1f382dee5c 100644
--- a/test/Microsoft.AspNetCore.Hosting.Tests/WebHostBuilderTests.cs
+++ b/test/Microsoft.AspNetCore.Hosting.Tests/WebHostBuilderTests.cs
@@ -157,6 +157,28 @@ namespace Microsoft.AspNetCore.Hosting
             Assert.NotNull(host.Services.GetService<ILoggerFactory>());
         }
 
+        [Fact]
+        public void ConfigureDefaultServiceProvider()
+        {
+            var hostBuilder = new WebHostBuilder()
+                .UseServer(new TestServer())
+                .ConfigureServices(s =>
+                {
+                    s.AddTransient<ServiceD>();
+                    s.AddScoped<ServiceC>();
+                })
+                .Configure(app =>
+                {
+                    app.ApplicationServices.GetRequiredService<ServiceC>();
+                })
+                .UseDefaultServiceProvider(options =>
+                {
+                    options.ValidateScopes = true;
+                });
+
+            Assert.Throws<InvalidOperationException>(() => hostBuilder.Build());
+        }
+
         [Fact]
         public void UseLoggerFactoryHonored()
         {
@@ -621,6 +643,19 @@ namespace Microsoft.AspNetCore.Hosting
             }
         }
 
+        private class ServiceC
+        {
+            public ServiceC(ServiceD serviceD)
+            {
+
+            }
+        }
+
+        private class ServiceD
+        {
+
+        }
+
         private class ServiceA
         {