diff --git a/samples/TagHelperSample.Web/Startup.cs b/samples/TagHelperSample.Web/Startup.cs
index d086501aea..bf2cd2d968 100644
--- a/samples/TagHelperSample.Web/Startup.cs
+++ b/samples/TagHelperSample.Web/Startup.cs
@@ -8,7 +8,7 @@ namespace TagHelperSample.Web
     {
         public void Configure(IApplicationBuilder app)
         {
-            app.UsePerRequestServices(services => services.AddMvc());
+            app.UseServices(services => services.AddMvc());
             app.UseMvc();
         }
     }
diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/TestableHtmlGenerator.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/TestableHtmlGenerator.cs
index 457e01716e..8f2b1481b7 100644
--- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/TestableHtmlGenerator.cs
+++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/TestableHtmlGenerator.cs
@@ -94,7 +94,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
         private static AntiForgery GetAntiForgery()
         {
             // AntiForgery must be passed to TestableHtmlGenerator constructor but will never be called.
-            var optionsAccessor = new Mock<IOptionsAccessor<MvcOptions>>();
+            var optionsAccessor = new Mock<IOptions<MvcOptions>>();
             optionsAccessor
                 .SetupGet(o => o.Options)
                 .Returns(new MvcOptions());