diff --git a/src/Resources/skeleton/registration/twig_email.tpl.php b/src/Resources/skeleton/registration/twig_email.tpl.php
index bc307f272..7c79d8ad2 100644
--- a/src/Resources/skeleton/registration/twig_email.tpl.php
+++ b/src/Resources/skeleton/registration/twig_email.tpl.php
@@ -2,7 +2,7 @@
 
 <p>
     Please confirm your email address by clicking the following link: <br><br>
-    <a href="{{ signedUrl }}">Confirm my Email</a>.
+    <a href="{{ signedUrl|raw }}">Confirm my Email</a>.
     This link will expire in {{ expiresAtMessageKey|trans(expiresAtMessageData, 'VerifyEmailBundle') }}.
 </p>
 
diff --git a/tests/Maker/MakeRegistrationFormTest.php b/tests/Maker/MakeRegistrationFormTest.php
index 80ad01e32..9d7fac5bc 100644
--- a/tests/Maker/MakeRegistrationFormTest.php
+++ b/tests/Maker/MakeRegistrationFormTest.php
@@ -135,7 +135,7 @@ public function getTestDetails(): \Generator
                     'jr@rushlow.dev', // from email address
                     'SymfonyCasts', // From Name
                     'n', // no authenticate after
-                    0, // route number to redirect to
+                    'app_anonymous', // route number to redirect to
                 ]);
 
                 $this->assertStringContainsString('Success', $output);
@@ -174,7 +174,7 @@ public function getTestDetails(): \Generator
                     'victor@symfonycasts.com', // from email address
                     'SymfonyCasts', // From Name
                     'n', // no authenticate after
-                    0, // route number to redirect to
+                    'app_anonymous', // route number to redirect to
                 ]);
 
                 $this->assertStringContainsString('Success', $output);
diff --git a/tests/fixtures/make-registration-form/tests/it_generates_registration_form_with_verification.php b/tests/fixtures/make-registration-form/tests/it_generates_registration_form_with_verification.php
index fc40efc17..45045a1c6 100644
--- a/tests/fixtures/make-registration-form/tests/it_generates_registration_form_with_verification.php
+++ b/tests/fixtures/make-registration-form/tests/it_generates_registration_form_with_verification.php
@@ -19,8 +19,7 @@ public function testRegistrationSuccessful()
 
         $client->submit($form);
 
-        $messages = $this->getMailerMessages();
-        self::assertCount(1, $messages);
+        self::assertEmailCount(1);
 
         /** @var EntityManager $em */
         $em = self::$kernel->getContainer()
@@ -32,9 +31,12 @@ public function testRegistrationSuccessful()
 
         self::assertFalse(($query->getSingleResult())->isVerified());
 
-        $context = $messages[0]->getContext();
+        $messageBody = self::getMailerMessage()->getHtmlBody();
 
-        $client->request('GET', $context['signedUrl']);
+        // Group "1" contains just the signed url from the email
+        preg_match('/(http.*)(")/', $messageBody, $signedUrl);
+
+        $client->request('GET', $signedUrl[1]);
 
         self::assertTrue(($query->getSingleResult())->isVerified());
     }