diff --git a/tests/SenseiTestCase.class.php b/tests/SenseiTestCase.class.php
index b86ee90a3..a807262ba 100644
--- a/tests/SenseiTestCase.class.php
+++ b/tests/SenseiTestCase.class.php
@@ -1,9 +1,5 @@
 <?php
-require_once("../classes/Doctrine.class.php");
-
-Doctrine::loadAll();
-
-class Sensei_UnitTestCase extends UnitTestCase { 
+class Sensei_UnitTestCase extends UnitTestCase {
     protected $manager;
     protected $session;
     protected $dbh;
diff --git a/tests/UnitTestCase.class.php b/tests/UnitTestCase.class.php
index 313b43df9..982d84000 100644
--- a/tests/UnitTestCase.class.php
+++ b/tests/UnitTestCase.class.php
@@ -1,8 +1,10 @@
 <?php
-require_once("../classes/Doctrine.class.php");
-
-Doctrine::loadAll();
+require_once("../Doctrine.php");
 
+//Doctrine::loadAll();
+function __autoload($class) {
+    Doctrine::autoload($class);
+}
 require_once("classes.php");
 
 ini_set('include_path',ucwords($_SERVER["DOCUMENT_ROOT"]));