diff --git a/phpunit.xml b/phpunit.xml
index 39d1794a..b36aa651 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -21,7 +21,7 @@
         <env name="APP_DEBUG" value="1"/>
         <env name="APP_SECRET" value="s$cretf0rt3st"/>
         <env name="SHELL_VERBOSITY" value="-1"/>
-        <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak"/>
+        <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[direct]=0"/>
         <!-- define your env variables for the test env here -->
     </php>
     <testsuites>
diff --git a/src/Form/AliasDeleteType.php b/src/Form/AliasDeleteType.php
index 754c9ae1..72168532 100644
--- a/src/Form/AliasDeleteType.php
+++ b/src/Form/AliasDeleteType.php
@@ -12,7 +12,7 @@ class AliasDeleteType extends AbstractType
 {
     public const NAME = 'delete_alias';
 
-    public function buildForm(FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options) : void
     {
         $builder
             ->add('password', PasswordType::class, ['label' => 'form.delete-password'])
@@ -22,7 +22,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     /**
      * {@inheritdoc}
      */
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver) : void
     {
         $resolver->setDefaults(['data_class' => 'App\Form\Model\Delete']);
     }
@@ -30,7 +30,7 @@ public function configureOptions(OptionsResolver $resolver)
     /**
      * @return string
      */
-    public function getBlockPrefix()
+    public function getBlockPrefix() : string
     {
         return self::NAME;
     }
diff --git a/src/Form/CustomAliasCreateType.php b/src/Form/CustomAliasCreateType.php
index c96e0b63..b200da96 100644
--- a/src/Form/CustomAliasCreateType.php
+++ b/src/Form/CustomAliasCreateType.php
@@ -12,7 +12,7 @@ class CustomAliasCreateType extends AbstractType
 {
     public const NAME = 'create_custom_alias';
 
-    public function buildForm(FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options) : void
     {
         $builder
             ->add('alias', TextType::class, ['label' => 'form.new-custom-alias'])
@@ -22,7 +22,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     /**
      * {@inheritdoc}
      */
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver) : void
     {
         $resolver->setDefaults(['data_class' => 'App\Form\Model\AliasCreate']);
     }
@@ -30,7 +30,7 @@ public function configureOptions(OptionsResolver $resolver)
     /**
      * @return string
      */
-    public function getBlockPrefix()
+    public function getBlockPrefix() : string
     {
         return self::NAME;
     }
diff --git a/src/Form/OpenPgpDeleteType.php b/src/Form/OpenPgpDeleteType.php
index 4db36eae..0d4c4566 100644
--- a/src/Form/OpenPgpDeleteType.php
+++ b/src/Form/OpenPgpDeleteType.php
@@ -12,7 +12,7 @@ class OpenPgpDeleteType extends AbstractType
 {
     public const NAME = 'delete_openpgp';
 
-    public function buildForm(FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options) : void
     {
         $builder
             ->add('password', PasswordType::class, ['label' => 'form.delete-password'])
@@ -22,7 +22,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     /**
      * {@inheritdoc}
      */
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver) : void
     {
         $resolver->setDefaults(['data_class' => 'App\Form\Model\Delete']);
     }
@@ -30,7 +30,7 @@ public function configureOptions(OptionsResolver $resolver)
     /**
      * @return string
      */
-    public function getBlockPrefix()
+    public function getBlockPrefix() : string
     {
         return self::NAME;
     }
diff --git a/src/Form/RegistrationType.php b/src/Form/RegistrationType.php
index b35c5408..01eb6e4b 100644
--- a/src/Form/RegistrationType.php
+++ b/src/Form/RegistrationType.php
@@ -31,7 +31,7 @@ public function __construct(EntityManagerInterface $manager)
         $this->domain = $manager->getRepository(Domain::class)->getDefaultDomain()->getName();
     }
 
-    public function buildForm(FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options) : void
     {
         $transformer = new TextToEmailTransformer($this->domain);
 
diff --git a/tests/EntityListener/UserChangedListenerTest.php b/tests/EntityListener/UserChangedListenerTest.php
index 69ead638..89dc9384 100644
--- a/tests/EntityListener/UserChangedListenerTest.php
+++ b/tests/EntityListener/UserChangedListenerTest.php
@@ -30,15 +30,6 @@ public function setUp(): void
             ->willReturn($this->voucherRepository);
         $this->suspiciousChildrenHandler = $this->createMock(SuspiciousChildrenHandler::class);
         $this->listener = new UserChangedListener($manager, $this->suspiciousChildrenHandler);
-
-        $this->session = $this->createMock(Session::class);
-        $this->request = $this->createMock(Request::class);
-        $this->request->method('getSession')
-            ->willReturn($this->session);
-        $this->request->query = new InputBag();
-        $this->event = $this->createMock(RequestEvent::class);
-        $this->event->method('getRequest')
-            ->willReturn($this->request);
     }
 
     public function testPreUpdateNoRoleChanges(): void