diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/GuardAuthenticationFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/GuardAuthenticationFactory.php
index 0d58c39b05..2375267777 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/GuardAuthenticationFactory.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/GuardAuthenticationFactory.php
@@ -94,7 +94,7 @@ class GuardAuthenticationFactory implements SecurityFactoryInterface
             // explode if they've configured the entry_point, but there is already one
             if ($config['entry_point']) {
                 throw new \LogicException(sprintf(
-                    'The guard authentication provider cannot use the "%s" entry_point because another entry point is already configured by another provider! Either remove the other provider or move the entry_point configuration as a root key under your firewall',
+                    'The guard authentication provider cannot use the "%s" entry_point because another entry point is already configured by another provider! Either remove the other provider or move the entry_point configuration as a root key under your firewall (i.e. at the same level as "guard").',
                     $config['entry_point']
                 ));
             }
diff --git a/src/Symfony/Component/Security/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php b/src/Symfony/Component/Security/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php
index 8fab3991f9..26d17dd8c7 100644
--- a/src/Symfony/Component/Security/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php
+++ b/src/Symfony/Component/Security/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php
@@ -218,5 +218,6 @@ class GuardAuthenticationListenerTest extends \PHPUnit_Framework_TestCase
         $this->event = null;
         $this->logger = null;
         $this->request = null;
+        $this->rememberMeServices = null;
     }
 }
diff --git a/src/Symfony/Component/Security/Guard/composer.json b/src/Symfony/Component/Security/Guard/composer.json
index 1e0dc8cedd..176754e335 100644
--- a/src/Symfony/Component/Security/Guard/composer.json
+++ b/src/Symfony/Component/Security/Guard/composer.json
@@ -18,7 +18,7 @@
     "require": {
         "php": ">=5.3.9",
         "symfony/security-core": "~2.8|~3.0.0",
-        "symfony/security-http": "~2.8|~3.0.0"
+        "symfony/security-http": "~2.7|~3.0.0"
     },
     "require-dev": {
         "symfony/phpunit-bridge": "~2.8|~3.0.0",