diff --git a/tests/Symfony/Tests/Bridge/Doctrine/HttpFoundation/DbalSessionStorageTest.php b/tests/Symfony/Tests/Bridge/Doctrine/HttpFoundation/DbalSessionHandlerTest.php
similarity index 80%
rename from tests/Symfony/Tests/Bridge/Doctrine/HttpFoundation/DbalSessionStorageTest.php
rename to tests/Symfony/Tests/Bridge/Doctrine/HttpFoundation/DbalSessionHandlerTest.php
index 428f065c1a..eda2dac30d 100644
--- a/tests/Symfony/Tests/Bridge/Doctrine/HttpFoundation/DbalSessionStorageTest.php
+++ b/tests/Symfony/Tests/Bridge/Doctrine/HttpFoundation/DbalSessionHandlerTest.php
@@ -11,19 +11,19 @@
 
 namespace Symfony\Bridge\Doctrine\HttpFoundation;
 
-use Symfony\Bridge\Doctrine\HttpFoundation\DbalSessionStorage;
+use Symfony\Bridge\Doctrine\HttpFoundation\DbalSessionHandler;
 
 /**
  * Test class for DbalSessionStorage.
  *
  * @author Drak <drak@zikula.org>
  */
-class DbalSessionStorageTest extends \PHPUnit_Framework_TestCase
+class DbalSessionHandlerTest extends \PHPUnit_Framework_TestCase
 {
     public function test__Construct()
     {
         $this->connection = $this->getMock('Doctrine\DBAL\Driver\Connection');
-        $mock = $this->getMockBuilder('Symfony\Bridge\Doctrine\HttpFoundation\DbalSessionStorage');
+        $mock = $this->getMockBuilder('Symfony\Bridge\Doctrine\HttpFoundation\DbalSessionHandler');
         $mock->setConstructorArgs(array($this->connection));
         $this->driver = $mock->getMock();
     }
diff --git a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/PdoSessionStorageTest.php b/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandlerTest.php
similarity index 79%
rename from tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/PdoSessionStorageTest.php
rename to tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandlerTest.php
index 6a6fd6760a..8f921334ae 100644
--- a/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/PdoSessionStorageTest.php
+++ b/tests/Symfony/Tests/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandlerTest.php
@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Tests\Component\HttpFoundation\Session\Storage;
+namespace Symfony\Tests\Component\HttpFoundation\Session\Storage\Handler;
 
-use Symfony\Component\HttpFoundation\Session\Storage\PdoSessionStorage;
+use Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler;
 
-class PdoSessionStorageTest extends \PHPUnit_Framework_TestCase
+class PdoSessionHandlerTest extends \PHPUnit_Framework_TestCase
 {
     private $pdo;
 
@@ -26,16 +26,16 @@ class PdoSessionStorageTest extends \PHPUnit_Framework_TestCase
 
     public function testMultipleInstances()
     {
-        $storage1 = new PdoSessionStorage($this->pdo, array('db_table' => 'sessions'), array());
+        $storage1 = new PdoSessionHandler($this->pdo, array('db_table' => 'sessions'), array());
         $storage1->write('foo', 'bar');
 
-        $storage2 = new PdoSessionStorage($this->pdo, array('db_table' => 'sessions'), array());
+        $storage2 = new PdoSessionHandler($this->pdo, array('db_table' => 'sessions'), array());
         $this->assertEquals('bar', $storage2->read('foo'), 'values persist between instances');
     }
 
     public function testSessionDestroy()
     {
-        $storage = new PdoSessionStorage($this->pdo, array('db_table' => 'sessions'), array());
+        $storage = new PdoSessionHandler($this->pdo, array('db_table' => 'sessions'), array());
         $storage->write('foo', 'bar');
         $this->assertEquals(1, count($this->pdo->query('SELECT * FROM sessions')->fetchAll()));
 
@@ -46,7 +46,7 @@ class PdoSessionStorageTest extends \PHPUnit_Framework_TestCase
 
     public function testSessionGC()
     {
-        $storage = new PdoSessionStorage($this->pdo, array('db_table' => 'sessions'), array());
+        $storage = new PdoSessionHandler($this->pdo, array('db_table' => 'sessions'), array());
 
         $storage->write('foo', 'bar');
         $storage->write('baz', 'bar');