diff --git a/tests/lib/Doctrine_DbalTestCase.php b/tests/lib/Doctrine_DbalTestCase.php
index 597c0cacf..ffc6de2d6 100644
--- a/tests/lib/Doctrine_DbalTestCase.php
+++ b/tests/lib/Doctrine_DbalTestCase.php
@@ -16,7 +16,6 @@ class Doctrine_DbalTestCase extends Doctrine_TestCase
     {
         // Setup a db connection if there is none, yet. This makes it possible
         // to run tests that use a connection standalone.
-        // @todo Make DBMS choice configurable
         if ( ! isset($this->sharedFixture['connection'])) {
             $this->sharedFixture['connection'] = Doctrine_TestUtil::getConnection();
         }
diff --git a/tests/lib/Doctrine_DbalTestSuite.php b/tests/lib/Doctrine_DbalTestSuite.php
index 22b17546e..99e86945b 100644
--- a/tests/lib/Doctrine_DbalTestSuite.php
+++ b/tests/lib/Doctrine_DbalTestSuite.php
@@ -11,14 +11,8 @@ class Doctrine_DbalTestSuite extends Doctrine_TestSuite
     
     protected function setUp()
     {
-        // @todo Make DBMS choice configurable
         $this->sharedFixture['connection'] = Doctrine_TestUtil::getConnection();
     }
-
-    protected function loadConnection($conn, $name)
-    {
-        return Doctrine_Manager::connection($conn, $name);
-    }
     
     protected function tearDown()
     {}    
diff --git a/tests/lib/Doctrine_OrmTestCase.php b/tests/lib/Doctrine_OrmTestCase.php
index e0f311140..f02b5f229 100644
--- a/tests/lib/Doctrine_OrmTestCase.php
+++ b/tests/lib/Doctrine_OrmTestCase.php
@@ -34,7 +34,6 @@ class Doctrine_OrmTestCase extends Doctrine_TestCase
     {
         // Setup a db connection if there is none, yet. This makes it possible
         // to run tests that use a connection standalone.
-        // @todo Make DBMS choice configurable
         if ( ! isset($this->sharedFixture['connection'])) {
             $this->sharedFixture['connection'] = Doctrine_TestUtil::getConnection();
         }
diff --git a/tests/lib/Doctrine_OrmTestSuite.php b/tests/lib/Doctrine_OrmTestSuite.php
index 7506a86b9..7d5a41ae3 100644
--- a/tests/lib/Doctrine_OrmTestSuite.php
+++ b/tests/lib/Doctrine_OrmTestSuite.php
@@ -10,16 +10,8 @@ class Doctrine_OrmTestSuite extends Doctrine_TestSuite
 {
     protected function setUp()
     {
-        // @todo Make DBMS choice configurable
-        //$pdo = new PDO('sqlite::memory:');
-        //$this->sharedFixture['connection'] = $this->loadConnection($pdo, 'sqlite_memory');
         $this->sharedFixture['connection'] = Doctrine_TestUtil::getConnection();
     }
-
-    protected function loadConnection($conn, $name)
-    {
-        return Doctrine_Manager::connection($conn, $name);
-    }
     
     protected function tearDown()
     {}