diff --git a/Resources/config/schema/security-1.0.xsd b/Resources/config/schema/security-1.0.xsd
index 70b682e4..1a367b83 100644
--- a/Resources/config/schema/security-1.0.xsd
+++ b/Resources/config/schema/security-1.0.xsd
@@ -230,6 +230,7 @@
         <xsd:attribute name="check-path" type="xsd:string" />
         <xsd:attribute name="use-forward" type="xsd:boolean" />
         <xsd:attribute name="require-previous-session" type="xsd:boolean" />
+        <xsd:attribute name="provider" type="xsd:string" />
     </xsd:complexType>
 
     <xsd:attributeGroup name="success-handler-options">
diff --git a/Tests/DependencyInjection/Fixtures/xml/container1.xml b/Tests/DependencyInjection/Fixtures/xml/container1.xml
index c97dd5bf..01ecdbae 100644
--- a/Tests/DependencyInjection/Fixtures/xml/container1.xml
+++ b/Tests/DependencyInjection/Fixtures/xml/container1.xml
@@ -64,9 +64,8 @@
             <http-basic />
         </firewall>
 
-        <firewall name="with_user_checker" provider="default">
+        <firewall name="with_user_checker" provider="default" user-checker="app.user_checker">
             <http-basic />
-            <user-checker>app.user_checker</user-checker>
         </firewall>
 
         <role id="ROLE_ADMIN">ROLE_USER</role>
diff --git a/Tests/DependencyInjection/Fixtures/xml/firewall_provider.xml b/Tests/DependencyInjection/Fixtures/xml/firewall_provider.xml
index 6f749840..66da3c4a 100644
--- a/Tests/DependencyInjection/Fixtures/xml/firewall_provider.xml
+++ b/Tests/DependencyInjection/Fixtures/xml/firewall_provider.xml
@@ -15,7 +15,7 @@
 
         <sec:firewalls>
             <sec:firewall name="main" provider="with-dash">
-                <sec:form_login />
+                <sec:form-login />
             </sec:firewall>
         </sec:firewalls>
     </sec:config>
diff --git a/Tests/DependencyInjection/Fixtures/xml/firewall_undefined_provider.xml b/Tests/DependencyInjection/Fixtures/xml/firewall_undefined_provider.xml
index a80f613e..a55ffdac 100644
--- a/Tests/DependencyInjection/Fixtures/xml/firewall_undefined_provider.xml
+++ b/Tests/DependencyInjection/Fixtures/xml/firewall_undefined_provider.xml
@@ -15,7 +15,7 @@
 
         <sec:firewalls>
             <sec:firewall name="main" provider="undefined">
-                <sec:form_login />
+                <sec:form-login />
             </sec:firewall>
         </sec:firewalls>
     </sec:config>
diff --git a/Tests/DependencyInjection/Fixtures/xml/legacy_container1.xml b/Tests/DependencyInjection/Fixtures/xml/legacy_container1.xml
index ed7afe5e..15f27b4f 100644
--- a/Tests/DependencyInjection/Fixtures/xml/legacy_container1.xml
+++ b/Tests/DependencyInjection/Fixtures/xml/legacy_container1.xml
@@ -66,10 +66,9 @@
             <http-basic />
         </firewall>
 
-        <firewall name="with_user_checker" provider="default">
+        <firewall name="with_user_checker" provider="default" user-checker="app.user_checker">
             <anonymous />
             <http-basic />
-            <user-checker>app.user_checker</user-checker>
         </firewall>
 
         <role id="ROLE_ADMIN">ROLE_USER</role>
diff --git a/Tests/DependencyInjection/Fixtures/xml/legacy_encoders.xml b/Tests/DependencyInjection/Fixtures/xml/legacy_encoders.xml
index a362a59a..cb5c04b7 100644
--- a/Tests/DependencyInjection/Fixtures/xml/legacy_encoders.xml
+++ b/Tests/DependencyInjection/Fixtures/xml/legacy_encoders.xml
@@ -66,10 +66,9 @@
             <http-basic />
         </firewall>
 
-        <firewall name="with_user_checker" provider="default">
+        <firewall name="with_user_checker" provider="default" user-checker="app.user_checker">
             <anonymous />
             <http-basic />
-            <user-checker>app.user_checker</user-checker>
         </firewall>
 
         <role id="ROLE_ADMIN">ROLE_USER</role>
diff --git a/Tests/DependencyInjection/Fixtures/xml/listener_provider.xml b/Tests/DependencyInjection/Fixtures/xml/listener_provider.xml
index b45f378a..d4a6a1d4 100644
--- a/Tests/DependencyInjection/Fixtures/xml/listener_provider.xml
+++ b/Tests/DependencyInjection/Fixtures/xml/listener_provider.xml
@@ -15,7 +15,7 @@
 
         <sec:firewalls>
             <sec:firewall name="main">
-                <sec:form_login provider="default" />
+                <sec:form-login provider="default" />
             </sec:firewall>
         </sec:firewalls>
     </sec:config>
diff --git a/Tests/DependencyInjection/Fixtures/xml/listener_undefined_provider.xml b/Tests/DependencyInjection/Fixtures/xml/listener_undefined_provider.xml
index bdf9d5ec..312cb803 100644
--- a/Tests/DependencyInjection/Fixtures/xml/listener_undefined_provider.xml
+++ b/Tests/DependencyInjection/Fixtures/xml/listener_undefined_provider.xml
@@ -15,7 +15,7 @@
 
         <sec:firewalls>
             <sec:firewall name="main">
-                <sec:form_login provider="undefined" />
+                <sec:form-login provider="undefined" />
             </sec:firewall>
         </sec:firewalls>
     </sec:config>
diff --git a/Tests/DependencyInjection/Fixtures/xml/no_custom_user_checker.xml b/Tests/DependencyInjection/Fixtures/xml/no_custom_user_checker.xml
index c4dea529..fe81171b 100644
--- a/Tests/DependencyInjection/Fixtures/xml/no_custom_user_checker.xml
+++ b/Tests/DependencyInjection/Fixtures/xml/no_custom_user_checker.xml
@@ -22,7 +22,6 @@
             <switch-user />
             <x509 />
             <remote-user />
-            <user-checker />
             <logout />
             <remember-me secret="TheSecret"/>
         </firewall>