diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InjectDirective.cs b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InjectDirective.cs
index 368f96393e..e0a93785c6 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InjectDirective.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InjectDirective.cs
@@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             // Runs after the @model and @namespace directives
             public override int Order => 10;
             
-            public override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
+            protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
             {
                 var visitor = new Visitor();
                 visitor.Visit(irDocument);
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InstrumentationPass.cs b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InstrumentationPass.cs
index 46cf7197bc..10e59547a7 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InstrumentationPass.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InstrumentationPass.cs
@@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
     {
         public override int Order => DefaultFeatureOrder;
 
-        public override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
         {
             var walker = new Visitor();
             walker.VisitDocument(irDocument);
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ModelDirective.cs b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ModelDirective.cs
index 8b358ec8d0..a2da8212f2 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ModelDirective.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ModelDirective.cs
@@ -71,7 +71,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             // Runs after the @inherits directive
             public override int Order => 5;
 
-            public override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
+            protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
             {
                 var visitor = new Visitor();
                 var modelType = GetModelType(irDocument, visitor);
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ModelExpressionPass.cs b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ModelExpressionPass.cs
index 58ad72a70e..1abb6595af 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ModelExpressionPass.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ModelExpressionPass.cs
@@ -13,7 +13,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
     {
         private const string ModelExpressionTypeName = "Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression";
 
-        public override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
         {
             var visitor = new Visitor();
             visitor.Visit(irDocument);
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/NamespaceDirective.cs b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/NamespaceDirective.cs
index 263f2d1b86..437e8a40f3 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/NamespaceDirective.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/NamespaceDirective.cs
@@ -33,7 +33,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
         // internal for testing
         internal class Pass : RazorIRPassBase, IRazorDirectiveClassifierPass
         {
-            public override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
+            protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
             {
                 if (irDocument.DocumentKind != RazorPageDocumentClassifierPass.RazorPageDocumentKind &&
                     irDocument.DocumentKind != MvcViewDocumentClassifierPass.MvcViewDocumentKind)
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/PagesPropertyInjectionPass.cs b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/PagesPropertyInjectionPass.cs
index 499f8beb31..8be19e9d39 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/PagesPropertyInjectionPass.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/PagesPropertyInjectionPass.cs
@@ -8,7 +8,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
 {
     public class PagesPropertyInjectionPass : RazorIRPassBase, IRazorIROptimizationPass
     {
-        public override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
         {
             if (irDocument.DocumentKind != RazorPageDocumentClassifierPass.RazorPageDocumentKind)
             {
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ViewComponentTagHelperPass.cs b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ViewComponentTagHelperPass.cs
index c7b278e9c7..396e4dab48 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ViewComponentTagHelperPass.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ViewComponentTagHelperPass.cs
@@ -13,7 +13,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
 {
     public class ViewComponentTagHelperPass : RazorIRPassBase, IRazorIROptimizationPass
     {
-        public override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
         {
             var visitor = new Visitor();
             visitor.Visit(irDocument);
diff --git a/src/Microsoft.AspNetCore.Razor.Language/DefaultDirectiveIRPass.cs b/src/Microsoft.AspNetCore.Razor.Language/DefaultDirectiveIRPass.cs
index 5ab238c627..4321896633 100644
--- a/src/Microsoft.AspNetCore.Razor.Language/DefaultDirectiveIRPass.cs
+++ b/src/Microsoft.AspNetCore.Razor.Language/DefaultDirectiveIRPass.cs
@@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore.Razor.Language
 {
     internal class DefaultDirectiveIRPass : RazorIRPassBase, IRazorDirectiveClassifierPass
     {
-        public override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
         {
             var parserOptions = irDocument.Options;
 
diff --git a/src/Microsoft.AspNetCore.Razor.Language/DirectiveRemovalIROptimizationPass.cs b/src/Microsoft.AspNetCore.Razor.Language/DirectiveRemovalIROptimizationPass.cs
index b936a8414b..28033645fa 100644
--- a/src/Microsoft.AspNetCore.Razor.Language/DirectiveRemovalIROptimizationPass.cs
+++ b/src/Microsoft.AspNetCore.Razor.Language/DirectiveRemovalIROptimizationPass.cs
@@ -10,7 +10,7 @@ namespace Microsoft.AspNetCore.Razor.Language
     {
         public override int Order => DefaultFeatureOrder + 50;
 
-        public override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
         {
             var visitor = new Visitor();
             visitor.VisitDocument(irDocument);
diff --git a/src/Microsoft.AspNetCore.Razor.Language/DocumentClassifierPassBase.cs b/src/Microsoft.AspNetCore.Razor.Language/DocumentClassifierPassBase.cs
index 6febbf203f..907a3381a2 100644
--- a/src/Microsoft.AspNetCore.Razor.Language/DocumentClassifierPassBase.cs
+++ b/src/Microsoft.AspNetCore.Razor.Language/DocumentClassifierPassBase.cs
@@ -23,7 +23,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             TargetExtensions = feature.FirstOrDefault()?.TargetExtensions.ToArray() ?? EmptyExtensionArray;
         }
 
-        public sealed override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
+        protected sealed override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
         {
             if (irDocument.DocumentKind != null)
             {
diff --git a/src/Microsoft.AspNetCore.Razor.Language/RazorDesignTimeIRPass.cs b/src/Microsoft.AspNetCore.Razor.Language/RazorDesignTimeIRPass.cs
index 77aeb01a12..2ba58e8c7d 100644
--- a/src/Microsoft.AspNetCore.Razor.Language/RazorDesignTimeIRPass.cs
+++ b/src/Microsoft.AspNetCore.Razor.Language/RazorDesignTimeIRPass.cs
@@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Razor.Language
         // This needs to run before other directive classifiers.
         public override int Order => -10;
 
-        public override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
         {
             var walker = new DesignTimeHelperWalker();
             walker.VisitDocument(irDocument);
diff --git a/src/Microsoft.AspNetCore.Razor.Language/RazorIRPassBase.cs b/src/Microsoft.AspNetCore.Razor.Language/RazorIRPassBase.cs
index 0957fc1471..5474837dfe 100644
--- a/src/Microsoft.AspNetCore.Razor.Language/RazorIRPassBase.cs
+++ b/src/Microsoft.AspNetCore.Razor.Language/RazorIRPassBase.cs
@@ -85,6 +85,6 @@ namespace Microsoft.AspNetCore.Razor.Language
             ExecuteCore(codeDocument, irDocument);
         }
 
-        public abstract void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument);
+        protected abstract void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument);
     }
 }
diff --git a/src/Microsoft.AspNetCore.Razor.Language/RazorPreallocatedTagHelperAttributeOptimizationPass.cs b/src/Microsoft.AspNetCore.Razor.Language/RazorPreallocatedTagHelperAttributeOptimizationPass.cs
index 18cb8ddae6..ceab49f05a 100644
--- a/src/Microsoft.AspNetCore.Razor.Language/RazorPreallocatedTagHelperAttributeOptimizationPass.cs
+++ b/src/Microsoft.AspNetCore.Razor.Language/RazorPreallocatedTagHelperAttributeOptimizationPass.cs
@@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Razor.Language
     {
         public override int Order => DefaultFeatureOrder;
 
-        public override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
         {
             var walker = new PreallocatedTagHelperWalker();
             walker.VisitDocument(irDocument);
diff --git a/src/RazorPageGenerator/RemovePragmaChecksumFeature.cs b/src/RazorPageGenerator/RemovePragmaChecksumFeature.cs
index 6da8006c9f..b6eae1d18f 100644
--- a/src/RazorPageGenerator/RemovePragmaChecksumFeature.cs
+++ b/src/RazorPageGenerator/RemovePragmaChecksumFeature.cs
@@ -1,7 +1,6 @@
 // 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 System;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
 
@@ -9,7 +8,7 @@ namespace RazorPageGenerator
 {
     public class RemovePragmaChecksumFeature : RazorIRPassBase, IRazorIROptimizationPass
     {
-        public override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
+        protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
         {
             var walker = new Walker();
             walker.Visit(irDocument);
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/InstrumentationPassTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/InstrumentationPassTest.cs
index 4c7948f884..b857378b40 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/InstrumentationPassTest.cs
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Extensions.Test/InstrumentationPassTest.cs
@@ -29,10 +29,13 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
 
             var irDocument = (DocumentIRNode)builder.Build();
 
-            var pass = new InstrumentationPass();
+            var pass = new InstrumentationPass()
+            {
+                Engine = RazorEngine.CreateEmpty(b => { }),
+            };
 
             // Act
-            pass.ExecuteCore(TestRazorCodeDocument.CreateEmpty(), irDocument);
+            pass.Execute(TestRazorCodeDocument.CreateEmpty(), irDocument);
 
             // Assert
             Children(
@@ -57,10 +60,13 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
 
             var irDocument = (DocumentIRNode)builder.Build();
 
-            var pass = new InstrumentationPass();
+            var pass = new InstrumentationPass()
+            {
+                Engine = RazorEngine.CreateEmpty(b => { }),
+            };
 
             // Act
-            pass.ExecuteCore(TestRazorCodeDocument.CreateEmpty(), irDocument);
+            pass.Execute(TestRazorCodeDocument.CreateEmpty(), irDocument);
 
             // Assert
             Children(
@@ -85,10 +91,13 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
 
             var irDocument = (DocumentIRNode)builder.Build();
 
-            var pass = new InstrumentationPass();
+            var pass = new InstrumentationPass()
+            {
+                Engine = RazorEngine.CreateEmpty(b => { }),
+            };
 
             // Act
-            pass.ExecuteCore(TestRazorCodeDocument.CreateEmpty(), irDocument);
+            pass.Execute(TestRazorCodeDocument.CreateEmpty(), irDocument);
 
             // Assert
             Children(
@@ -112,10 +121,13 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
 
             var irDocument = (DocumentIRNode)builder.Build();
 
-            var pass = new InstrumentationPass();
+            var pass = new InstrumentationPass()
+            {
+                Engine = RazorEngine.CreateEmpty(b => { }),
+            };
 
             // Act
-            pass.ExecuteCore(TestRazorCodeDocument.CreateEmpty(), irDocument);
+            pass.Execute(TestRazorCodeDocument.CreateEmpty(), irDocument);
 
             // Assert
             Children(
@@ -148,10 +160,13 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
 
             var irDocument = (DocumentIRNode)builder.Build();
 
-            var pass = new InstrumentationPass();
+            var pass = new InstrumentationPass()
+            {
+                Engine = RazorEngine.CreateEmpty(b => { }),
+            };
 
             // Act
-            pass.ExecuteCore(TestRazorCodeDocument.CreateEmpty(), irDocument);
+            pass.Execute(TestRazorCodeDocument.CreateEmpty(), irDocument);
 
             // Assert
             Children(
@@ -196,10 +211,13 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
 
             var irDocument = (DocumentIRNode)builder.Build();
 
-            var pass = new InstrumentationPass();
+            var pass = new InstrumentationPass()
+            {
+                Engine = RazorEngine.CreateEmpty(b => { }),
+            };
 
             // Act
-            pass.ExecuteCore(TestRazorCodeDocument.CreateEmpty(), irDocument);
+            pass.Execute(TestRazorCodeDocument.CreateEmpty(), irDocument);
 
             // Assert
             Children(
@@ -233,10 +251,13 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
 
             var irDocument = (DocumentIRNode)builder.Build();
 
-            var pass = new InstrumentationPass();
+            var pass = new InstrumentationPass()
+            {
+                Engine = RazorEngine.CreateEmpty(b => { }),
+            };
 
             // Act
-            pass.ExecuteCore(TestRazorCodeDocument.CreateEmpty(), irDocument);
+            pass.Execute(TestRazorCodeDocument.CreateEmpty(), irDocument);
 
             // Assert
             Children(
@@ -263,10 +284,13 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
 
             var irDocument = (DocumentIRNode)builder.Build();
 
-            var pass = new InstrumentationPass();
+            var pass = new InstrumentationPass()
+            {
+                Engine = RazorEngine.CreateEmpty(b => { }),
+            };
 
             // Act
-            pass.ExecuteCore(TestRazorCodeDocument.CreateEmpty(), irDocument);
+            pass.Execute(TestRazorCodeDocument.CreateEmpty(), irDocument);
 
             // Assert
             Children(
@@ -294,10 +318,13 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
 
             var irDocument = (DocumentIRNode)builder.Build();
 
-            var pass = new InstrumentationPass();
+            var pass = new InstrumentationPass()
+            {
+                Engine = RazorEngine.CreateEmpty(b => { }),
+            };
 
             // Act
-            pass.ExecuteCore(TestRazorCodeDocument.CreateEmpty(), irDocument);
+            pass.Execute(TestRazorCodeDocument.CreateEmpty(), irDocument);
 
             // Assert
             Children(
diff --git a/test/Microsoft.AspNetCore.Razor.Test.Common/Langauge/IntegrationTests/IntegrationTestBase.cs b/test/Microsoft.AspNetCore.Razor.Test.Common/Langauge/IntegrationTests/IntegrationTestBase.cs
index 4d3437f4ac..a10950b48f 100644
--- a/test/Microsoft.AspNetCore.Razor.Test.Common/Langauge/IntegrationTests/IntegrationTestBase.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test.Common/Langauge/IntegrationTests/IntegrationTestBase.cs
@@ -213,7 +213,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
 
         protected class ApiSetsIRTestAdapter : RazorIRPassBase, IRazorIROptimizationPass
         {
-            public override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
+            protected override void ExecuteCore(RazorCodeDocument codeDocument, DocumentIRNode irDocument)
             {
                 var walker = new ApiSetsIRWalker();
                 walker.Visit(irDocument);