diff --git a/tests/AllTests.php b/tests/AllTests.php
index 5f0999539..eba623745 100644
--- a/tests/AllTests.php
+++ b/tests/AllTests.php
@@ -3,10 +3,9 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'AllTests::main');
 }
 
-require_once 'PHPUnit/Framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-require_once 'lib/Doctrine_TestSuite.php';
+require_once 'lib/DoctrineTestInit.php';
 
+// Suites
 require_once 'Dbal/AllTests.php';
 require_once 'Orm/AllTests.php';
 require_once 'Ticket/AllTests.php';
@@ -20,7 +19,7 @@ class AllTests
 
     public static function suite()
     {
-        $suite = new Doctrine_TestSuite('Doctrine');
+        $suite = new Doctrine_TestSuite('Doctrine Tests');
 
         $suite->addTest(Dbal_AllTests::suite());
         $suite->addTest(Orm_AllTests::suite());
diff --git a/tests/Dbal/AllTests.php b/tests/Dbal/AllTests.php
index 72394ec4e..aa04f07af 100644
--- a/tests/Dbal/AllTests.php
+++ b/tests/Dbal/AllTests.php
@@ -3,10 +3,9 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Dbal_AllTests::main');
 }
 
-require_once 'PHPUnit/Framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-require_once 'lib/Doctrine_TestSuite.php';
+require_once 'lib/DoctrineTestInit.php';
 
+// Suites
 require_once 'Dbal/Component/AllTests.php';
 
 class Dbal_AllTests
diff --git a/tests/Dbal/Component/AllTests.php b/tests/Dbal/Component/AllTests.php
index d92bd2155..150106412 100644
--- a/tests/Dbal/Component/AllTests.php
+++ b/tests/Dbal/Component/AllTests.php
@@ -3,10 +3,9 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Dbal_Component_AllTests::main');
 }
 
-require_once 'PHPUnit/Framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-require_once 'lib/Doctrine_TestSuite.php';
+require_once 'lib/DoctrineTestInit.php';
 
+// Tests
 require_once 'Dbal/Component/TestTest.php';
 
 class Dbal_Component_AllTests
diff --git a/tests/Dbal/Component/TestTest.php b/tests/Dbal/Component/TestTest.php
index 9805c75e5..798b1c86d 100644
--- a/tests/Dbal/Component/TestTest.php
+++ b/tests/Dbal/Component/TestTest.php
@@ -1,5 +1,5 @@
 <?php
-require_once 'lib/Doctrine_TestCase.php';
+require_once 'lib/DoctrineTestInit.php';
  
 class Dbal_Component_TestTest extends Doctrine_TestCase
 {
diff --git a/tests/Orm/AllTests.php b/tests/Orm/AllTests.php
index d3dd27cd2..85e95bb3f 100644
--- a/tests/Orm/AllTests.php
+++ b/tests/Orm/AllTests.php
@@ -3,10 +3,9 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Orm_AllTests::main');
 }
 
-require_once 'PHPUnit/Framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-require_once 'lib/Doctrine_TestSuite.php';
+require_once 'lib/DoctrineTestInit.php';
 
+// Suites
 require_once 'Orm/Component/AllTests.php';
 
 class Orm_AllTests
diff --git a/tests/Orm/Component/AllTests.php b/tests/Orm/Component/AllTests.php
index 3075ef6ea..417bb10be 100644
--- a/tests/Orm/Component/AllTests.php
+++ b/tests/Orm/Component/AllTests.php
@@ -3,10 +3,9 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Dbal_Component_AllTests::main');
 }
 
-require_once 'PHPUnit/Framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-require_once 'lib/Doctrine_TestSuite.php';
+require_once 'lib/DoctrineTestInit.php';
 
+// Tests
 require_once 'Orm/Component/TestTest.php';
 
 class Orm_Component_AllTests
diff --git a/tests/Orm/Component/TestTest.php b/tests/Orm/Component/TestTest.php
index 6eff072c6..94c678dcf 100644
--- a/tests/Orm/Component/TestTest.php
+++ b/tests/Orm/Component/TestTest.php
@@ -1,5 +1,5 @@
 <?php
-require_once 'lib/Doctrine_TestCase.php';
+require_once 'lib/DoctrineTestInit.php';
  
 class Orm_Component_TestTest extends Doctrine_TestCase
 {
diff --git a/tests/Ticket/1Test.php b/tests/Ticket/1Test.php
index 9b1fb9a19..16a7f9e69 100644
--- a/tests/Ticket/1Test.php
+++ b/tests/Ticket/1Test.php
@@ -1,5 +1,5 @@
 <?php
-require_once 'lib/Doctrine_TestCase.php';
+require_once 'lib/DoctrineTestInit.php';
  
 class Ticket_1Test extends Doctrine_TestCase
 {
diff --git a/tests/Ticket/AllTests.php b/tests/Ticket/AllTests.php
index 96ea7f9a8..4c5728b7c 100644
--- a/tests/Ticket/AllTests.php
+++ b/tests/Ticket/AllTests.php
@@ -3,10 +3,9 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
     define('PHPUnit_MAIN_METHOD', 'Ticket_AllTests::main');
 }
 
-require_once 'PHPUnit/Framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-require_once 'lib/Doctrine_TestSuite.php';
+require_once 'lib/DoctrineTestInit.php';
 
+// Tests
 require_once 'Ticket/1Test.php';
 
 class Ticket_AllTests
diff --git a/tests/fixtures/cms/data/CmsUser.yml b/tests/fixtures/cms/data/CmsUser.yml
new file mode 100644
index 000000000..6dd2a8cdb
--- /dev/null
+++ b/tests/fixtures/cms/data/CmsUser.yml
@@ -0,0 +1,5 @@
+---
+CmsUser:
+  CmsUser_1:
+    username: jwage
+    password: changeme
\ No newline at end of file
diff --git a/tests/fixtures/cms/models/CmsUser.php b/tests/fixtures/cms/models/CmsUser.php
new file mode 100644
index 000000000..144989756
--- /dev/null
+++ b/tests/fixtures/cms/models/CmsUser.php
@@ -0,0 +1,10 @@
+<?php
+class CmsUser extends Doctrine_Record
+{
+  public static function initMetadata($class) 
+  {
+      $class->setColumn('id', 'integer', 4, array('primary' => true, 'autoincrement' => true));
+      $class->setColumn('username', 'string', 255);
+      $class->setColumn('username', 'string', 255);
+  }
+}
\ No newline at end of file
diff --git a/tests/lib/DoctrineTestInit.php b/tests/lib/DoctrineTestInit.php
new file mode 100644
index 000000000..f5aef9be7
--- /dev/null
+++ b/tests/lib/DoctrineTestInit.php
@@ -0,0 +1,8 @@
+<?php
+require_once 'PHPUnit/Framework.php';
+require_once 'PHPUnit/TextUI/TestRunner.php';
+require_once 'Doctrine_TestCase.php';
+require_once 'Doctrine_TestSuite.php';
+
+require_once '../lib/Doctrine.php';
+spl_autoload_register(array('Doctrine', 'autoload'));
\ No newline at end of file
diff --git a/tests/lib/Doctrine_TestCase.php b/tests/lib/Doctrine_TestCase.php
index e667a692d..f1f8324a0 100644
--- a/tests/lib/Doctrine_TestCase.php
+++ b/tests/lib/Doctrine_TestCase.php
@@ -1,6 +1,39 @@
 <?php
-require_once 'PHPUnit/Framework.php';
-
 class Doctrine_TestCase extends PHPUnit_Framework_TestCase
 {
+    public function setUp()
+    {
+        $pdo = new PDO('sqlite::memory:');
+        $this->sharedFixture = $this->loadConnection($pdo, 'sqlite_memory');
+    }
+
+    public function loadConnection($conn, $name)
+    {
+        return Doctrine_Manager::connection($conn, $name);
+    }
+
+    public function loadFixturesPackage($package, $models = array())
+    {
+        $packagePath = 'fixtures' . DIRECTORY_SEPARATOR . $package;
+
+        if ( ! file_exists($packagePath)) {
+            throw new Exception('Could not find fixtures package: "' . $package . '"');
+        }
+
+        $modelsPath = $packagePath . DIRECTORY_SEPARATOR . 'models';
+        $dataPath = $packagePath . DIRECTORY_SEPARATOR . 'data';
+        
+        Doctrine::loadModels($modelsPath);
+        Doctrine::createTablesFromModels($modelsPath);
+        
+        $data = new Doctrine_Data();
+        $data->importData($dataPath, 'yml', $models);
+    }
+
+    public function tearDown()
+    {
+        Doctrine_Manager::getInstance()->getConnection('sqlite_memory')->close();
+
+        $this->sharedFixture = NULL;
+    }
 }
\ No newline at end of file
diff --git a/tests/lib/Doctrine_TestSuite.php b/tests/lib/Doctrine_TestSuite.php
index 16eae17f9..e866e1b3c 100644
--- a/tests/lib/Doctrine_TestSuite.php
+++ b/tests/lib/Doctrine_TestSuite.php
@@ -1,6 +1,4 @@
 <?php
-require_once 'PHPUnit/Framework.php';
-
 class Doctrine_TestSuite extends PHPUnit_Framework_TestSuite
 {