diff --git a/Tests/Functional/Bundle/CsrfFormLoginBundle/Resources/views/Login/after_login.html.twig b/Tests/Functional/Bundle/CsrfFormLoginBundle/Resources/views/Login/after_login.html.twig
index 9d503551..9a9bfbc7 100644
--- a/Tests/Functional/Bundle/CsrfFormLoginBundle/Resources/views/Login/after_login.html.twig
+++ b/Tests/Functional/Bundle/CsrfFormLoginBundle/Resources/views/Login/after_login.html.twig
@@ -1,8 +1,8 @@
 {% extends "base.html.twig" %}
 
 {% block body %}
-    Hello {{ app.user.userIdentifier }}!<br><br>
-    You're browsing to path "{{ app.request.pathInfo }}".<br><br>
+    Hello {{ app.user.userIdentifier }}!<br /><br />
+    You're browsing to path "{{ app.request.pathInfo }}".<br /><br />
     <a href="{{ logout_path('default') }}">Log out</a>.
     <a href="{{ logout_url('default') }}">Log out</a>.
 {% endblock %}
diff --git a/Tests/Functional/Bundle/CsrfFormLoginBundle/Resources/views/Login/login.html.twig b/Tests/Functional/Bundle/CsrfFormLoginBundle/Resources/views/Login/login.html.twig
index 47badfed..a21ea725 100644
--- a/Tests/Functional/Bundle/CsrfFormLoginBundle/Resources/views/Login/login.html.twig
+++ b/Tests/Functional/Bundle/CsrfFormLoginBundle/Resources/views/Login/login.html.twig
@@ -6,7 +6,7 @@
         {{ form_widget(form) }}
 
         {# Note: ensure the submit name does not conflict with the form's name or it may clobber field data #}
-        <input type="submit" name="login">
+        <input type="submit" name="login" />
     </form>
 
 {% endblock %}
diff --git a/Tests/Functional/Bundle/FormLoginBundle/Resources/views/Localized/login.html.twig b/Tests/Functional/Bundle/FormLoginBundle/Resources/views/Localized/login.html.twig
index d147bd1a..de0da3bb 100644
--- a/Tests/Functional/Bundle/FormLoginBundle/Resources/views/Localized/login.html.twig
+++ b/Tests/Functional/Bundle/FormLoginBundle/Resources/views/Localized/login.html.twig
@@ -8,14 +8,14 @@
 
     <form action="{{ path('localized_check_path') }}" method="post">
         <label for="username">Username:</label>
-        <input type="text" id="username" name="_username" value="{{ last_username }}">
+        <input type="text" id="username" name="_username" value="{{ last_username }}" />
 
         <label for="password">Password:</label>
-        <input type="password" id="password" name="_password">
+        <input type="password" id="password" name="_password" />
 
-        <input type="hidden" name="_target_path" value="">
+        <input type="hidden" name="_target_path" value="" />
 
-        <input type="submit" name="login">
+        <input type="submit" name="login" />
     </form>
 
 {% endblock %}
diff --git a/Tests/Functional/Bundle/FormLoginBundle/Resources/views/Login/after_login.html.twig b/Tests/Functional/Bundle/FormLoginBundle/Resources/views/Login/after_login.html.twig
index d48269ae..fd51df2a 100644
--- a/Tests/Functional/Bundle/FormLoginBundle/Resources/views/Login/after_login.html.twig
+++ b/Tests/Functional/Bundle/FormLoginBundle/Resources/views/Login/after_login.html.twig
@@ -1,7 +1,7 @@
 {% extends "base.html.twig" %}
 
 {% block body %}
-    Hello {{ user.userIdentifier }}!<br><br>
+    Hello {{ user.userIdentifier }}!<br /><br />
     You're browsing to path "{{ app.request.pathInfo }}".
 
     <a href="{{ logout_path('default') }}">Log out</a>.
diff --git a/Tests/Functional/Bundle/FormLoginBundle/Resources/views/Login/login.html.twig b/Tests/Functional/Bundle/FormLoginBundle/Resources/views/Login/login.html.twig
index 9e41e022..34ea19f2 100644
--- a/Tests/Functional/Bundle/FormLoginBundle/Resources/views/Login/login.html.twig
+++ b/Tests/Functional/Bundle/FormLoginBundle/Resources/views/Login/login.html.twig
@@ -9,14 +9,14 @@
 
     <form action="{{ path('form_login_check') }}" method="post">
         <label for="username">Username:</label>
-        <input type="text" id="username" name="_username" value="{{ last_username }}">
+        <input type="text" id="username" name="_username" value="{{ last_username }}" />
 
         <label for="password">Password:</label>
-        <input type="password" id="password" name="_password">
+        <input type="password" id="password" name="_password" />
 
-        <input type="hidden" name="_target_path" value="">
+        <input type="hidden" name="_target_path" value="" />
 
-        <input type="submit" name="login">
+        <input type="submit" name="login" />
     </form>
 
 {% endblock %}
diff --git a/Tests/Functional/app/templates/base.html.twig b/Tests/Functional/app/templates/base.html.twig
index 32645815..caf6f6ef 100644
--- a/Tests/Functional/app/templates/base.html.twig
+++ b/Tests/Functional/app/templates/base.html.twig
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
     <head>
-        <meta charset="{{ _charset }}">
+        <meta charset="{{ _charset }}" />
         <title>{% block title %}Welcome!{% endblock %}</title>
         {% block stylesheets %}{% endblock %}
     </head>