diff --git a/src/DependencyInjection/Compiler/TagRewriterPass.php b/src/DependencyInjection/Compiler/TagRewriterPass.php
index 1f009b1..0960980 100644
--- a/src/DependencyInjection/Compiler/TagRewriterPass.php
+++ b/src/DependencyInjection/Compiler/TagRewriterPass.php
@@ -72,6 +72,7 @@ private function setupTagRewriters(ContainerBuilder $container): void
                 $definition = clone $prototype;
                 $definition->setAbstract(false);
                 $definition->setLazy(true);
+                $definition->addTag('proxy', ['interface' => TagRewriter::class]);
                 $container->setDefinition($serviceId, $definition);
             }
 
diff --git a/src/Resources/config/services.php b/src/Resources/config/services.php
index 8eccffc..0a72a69 100644
--- a/src/Resources/config/services.php
+++ b/src/Resources/config/services.php
@@ -18,7 +18,8 @@
 
     // Default TagRewriter (will be configured by compiler pass)
     $services->set('webfactory.html5_tag_rewriter.instance.default', Html5TagRewriter::class)
-        ->lazy();
+        ->lazy()
+        ->tag('proxy', ['interface' => TagRewriter::class]);
 
     // Autowiring alias: TagRewriter interface -> default rewriter
     $services->alias(TagRewriter::class, 'webfactory.html5_tag_rewriter.instance.default');
diff --git a/tests/DependencyInjection/Compiler/TagRewriterPassTest.php b/tests/DependencyInjection/Compiler/TagRewriterPassTest.php
index 030432a..8685f2f 100644
--- a/tests/DependencyInjection/Compiler/TagRewriterPassTest.php
+++ b/tests/DependencyInjection/Compiler/TagRewriterPassTest.php
@@ -4,7 +4,6 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ChildDefinition;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Webfactory\Html5TagRewriter\Implementation\Html5TagRewriter;
@@ -13,7 +12,6 @@
 use Webfactory\Html5TagRewriterBundle\DependencyInjection\Compiler\TagRewriterPass;
 use Webfactory\Html5TagRewriterBundle\Tests\Fixtures\Handler\TestDefaultHandler;
 use Webfactory\Html5TagRewriterBundle\Twig\Extension;
-use Webfactory\Html5TagRewriterBundle\WebfactoryHtml5TagRewriterBundle;
 
 class TagRewriterPassTest extends TestCase
 {
diff --git a/tests/Fixtures/TestKernel.php b/tests/Fixtures/TestKernel.php
index 759ff96..ac1edae 100644
--- a/tests/Fixtures/TestKernel.php
+++ b/tests/Fixtures/TestKernel.php
@@ -26,6 +26,7 @@ protected function configureContainer(ContainerConfigurator $container): void
     {
         $container->extension('framework', [
             'test' => true,
+            'secret' => 'dont-tell-mum',
         ] + (Kernel::VERSION_ID < 70000 ? ['annotations' => ['enabled' => false]] : []));
 
         $services = $container->services();