diff --git a/composer.json b/composer.json
index 2e0b69a8b..d294b5b99 100644
--- a/composer.json
+++ b/composer.json
@@ -63,7 +63,7 @@
         "symfony/var-exporter": "^6.4.1 || ^7.0.1",
         "symfony/web-profiler-bundle": "^6.4 || ^7.0",
         "symfony/yaml": "^6.4 || ^7.0",
-        "twig/twig": "^3.0.4"
+        "twig/twig": "^3.21.1"
     },
     "conflict": {
         "doctrine/orm": "<3.0 || >=4.0",
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 2bb5720eb..1c6f58991 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         bootstrap="tests/bootstrap.php"
          colors="true"
          xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          displayDetailsOnTestsThatTriggerDeprecations="true"
@@ -16,7 +15,7 @@
         <env name="DOCTRINE_DEPRECATIONS" value="trigger"/>
     </php>
 
-    <source restrictDeprecations="true" ignoreSuppressionOfDeprecations="true">
+    <source ignoreIndirectDeprecations="true" ignoreSuppressionOfDeprecations="true">
         <include>
             <directory>src</directory>
         </include>
diff --git a/tests/Command/Proxy/InfoDoctrineCommandTest.php b/tests/Command/Proxy/InfoDoctrineCommandTest.php
index fdd34df62..f6a0b209c 100644
--- a/tests/Command/Proxy/InfoDoctrineCommandTest.php
+++ b/tests/Command/Proxy/InfoDoctrineCommandTest.php
@@ -11,6 +11,7 @@
 use Symfony\Component\Console\Tester\CommandTester;
 
 use function interface_exists;
+use function restore_exception_handler;
 
 class InfoDoctrineCommandTest extends TestCase
 {
@@ -38,5 +39,7 @@ public function testExecute(): void
             'Found 3 mapped entities',
             $commandTester->getDisplay(),
         );
+
+        restore_exception_handler();
     }
 }
diff --git a/tests/RegistryTest.php b/tests/RegistryTest.php
index 28263c616..8384693dd 100644
--- a/tests/RegistryTest.php
+++ b/tests/RegistryTest.php
@@ -16,6 +16,7 @@
 
 use function assert;
 use function interface_exists;
+use function restore_exception_handler;
 
 class RegistryTest extends TestCase
 {
@@ -146,5 +147,7 @@ public function testIdentityMapsStayConsistentAfterReset(): void
         $this->assertFalse($repository->getEntityManager()->getUnitOfWork()->isEntityScheduled($entity));
 
         $entityManager->flush();
+
+        restore_exception_handler();
     }
 }
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
deleted file mode 100644
index 99a2941ed..000000000
--- a/tests/bootstrap.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use Symfony\Component\ErrorHandler\ErrorHandler;
-
-ErrorHandler::register(null, false);