diff --git a/src/Maker/MakeResetPassword.php b/src/Maker/MakeResetPassword.php
index 43c78d36f..79bdde034 100644
--- a/src/Maker/MakeResetPassword.php
+++ b/src/Maker/MakeResetPassword.php
@@ -13,6 +13,7 @@
 
 use Doctrine\Common\Annotations\Annotation;
 use PhpParser\Builder\Param;
+use Symfony\Bridge\Twig\AppVariable;
 use Symfony\Bridge\Twig\Mime\TemplatedEmail;
 use Symfony\Bundle\MakerBundle\ConsoleStyle;
 use Symfony\Bundle\MakerBundle\DependencyBuilder;
@@ -30,8 +31,10 @@
 use Symfony\Bundle\MakerBundle\Util\TemplateComponentGenerator;
 use Symfony\Bundle\MakerBundle\Util\YamlSourceManipulator;
 use Symfony\Bundle\MakerBundle\Validator;
+use Symfony\Bundle\SecurityBundle\SecurityBundle;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Form\Form;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -40,6 +43,7 @@
 use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface;
+use Symfony\Component\Validator\Validation;
 use Symfony\Component\Yaml\Yaml;
 use SymfonyCasts\Bundle\ResetPassword\Controller\ResetPasswordControllerTrait;
 use SymfonyCasts\Bundle\ResetPassword\Exception\ResetPasswordExceptionInterface;
@@ -102,6 +106,10 @@ public function configureDependencies(DependencyBuilder $dependencies): void
     {
         $dependencies->addClassDependency(SymfonyCastsResetPasswordBundle::class, 'symfonycasts/reset-password-bundle');
         $dependencies->addClassDependency(MailerInterface::class, 'symfony/mailer');
+        $dependencies->addClassDependency(Form::class, 'symfony/form');
+        $dependencies->addClassDependency(Validation::class, 'symfony/validator');
+        $dependencies->addClassDependency(SecurityBundle::class, 'security-bundle');
+        $dependencies->addClassDependency(AppVariable::class, 'twig');
 
         ORMDependencyBuilder::buildDependencies($dependencies);
 
diff --git a/tests/Maker/MakeResetPasswordTest.php b/tests/Maker/MakeResetPasswordTest.php
index 518b2c330..6120127ee 100644
--- a/tests/Maker/MakeResetPasswordTest.php
+++ b/tests/Maker/MakeResetPasswordTest.php
@@ -30,8 +30,6 @@ public function getTestDetails()
                 'SymfonyCasts',
             ])
             ->setRequiredPhpVersion(70200)
-            ->addExtraDependencies('security-bundle')
-            ->addExtraDependencies('twig')
             ->setFixtureFilesPath(__DIR__.'/../fixtures/MakeResetPassword')
             ->assert(
                 function (string $output, string $directory) {
@@ -76,8 +74,6 @@ function (string $output, string $directory) {
                 'SymfonyCasts',
             ])
             ->setRequiredPhpVersion(70200)
-            ->addExtraDependencies('security-bundle')
-            ->addExtraDependencies('twig')
             ->deleteFile('config/packages/reset_password.yaml')
             ->setFixtureFilesPath(__DIR__.'/../fixtures/MakeResetPasswordCustomConfig')
             ->assert(
@@ -103,8 +99,6 @@ function (string $output, string $directory) {
                 'SymfonyCasts',
             ])
             ->setRequiredPhpVersion(70200)
-            ->addExtraDependencies('security-bundle')
-            ->addExtraDependencies('twig')
             ->addReplacement(
                 'config/packages/reset_password.yaml',
                 'symfonycasts_reset_password:',
@@ -134,13 +128,6 @@ function (string $output, string $directory) {
                 'SymfonyCasts',
             ])
             ->setRequiredPhpVersion(70200)
-            ->addExtraDependencies('doctrine')
-            ->addExtraDependencies('doctrine/annotations')
-            ->addExtraDependencies('mailer')
-            ->addExtraDependencies('security-bundle')
-            ->addExtraDependencies('symfony/form')
-            ->addExtraDependencies('symfony/validator')
-            ->addExtraDependencies('twig')
             ->setFixtureFilesPath(__DIR__.'/../fixtures/MakeResetPasswordFunctionalTest'),
         ];
 
@@ -155,8 +142,6 @@ function (string $output, string $directory) {
                 'SymfonyCasts',
             ])
             ->setRequiredPhpVersion(70200)
-            ->addExtraDependencies('security-bundle')
-            ->addExtraDependencies('twig')
             ->setFixtureFilesPath(__DIR__.'/../fixtures/MakeResetPasswordCustomUserAttribute')
             ->assert(
                 function (string $output, string $directory) {