diff --git a/tests/Doctrine/Tests/ORM/CommitOrderCalculatorTest.php b/tests/Doctrine/Tests/ORM/CommitOrderCalculatorTest.php
index ff8205987..d4b1899fc 100644
--- a/tests/Doctrine/Tests/ORM/CommitOrderCalculatorTest.php
+++ b/tests/Doctrine/Tests/ORM/CommitOrderCalculatorTest.php
@@ -4,8 +4,6 @@ namespace Doctrine\Tests\ORM;
 
 use Doctrine\ORM\Mapping\ClassMetadata;
 
-require_once __DIR__ . '/../TestInit.php';
-
 /**
  * Tests of the commit order calculation.
  *
@@ -53,4 +51,4 @@ class NodeClass1 {}
 class NodeClass2 {}
 class NodeClass3 {}
 class NodeClass4 {}
-class NodeClass5 {}
\ No newline at end of file
+class NodeClass5 {}
diff --git a/tests/Doctrine/Tests/ORM/ConfigurationTest.php b/tests/Doctrine/Tests/ORM/ConfigurationTest.php
index bd8e90d8a..4d0c28349 100644
--- a/tests/Doctrine/Tests/ORM/ConfigurationTest.php
+++ b/tests/Doctrine/Tests/ORM/ConfigurationTest.php
@@ -8,8 +8,6 @@ use Doctrine\ORM\ORMException;
 use ReflectionClass;
 use PHPUnit_Framework_TestCase;
 
-require_once __DIR__ . '/../TestInit.php';
-
 /**
  * Tests for the Configuration object
  * @author Marco Pivetta <ocramius@gmail.com>
diff --git a/tests/Doctrine/Tests/ORM/Entity/ConstructorTest.php b/tests/Doctrine/Tests/ORM/Entity/ConstructorTest.php
index 014a7b421..4cf98ec5e 100644
--- a/tests/Doctrine/Tests/ORM/Entity/ConstructorTest.php
+++ b/tests/Doctrine/Tests/ORM/Entity/ConstructorTest.php
@@ -2,8 +2,6 @@
 
 namespace Doctrine\Tests\ORM\Entity;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 class ConstructorTest extends \Doctrine\Tests\OrmTestCase
 {
     public function testFieldInitializationInConstructor()
diff --git a/tests/Doctrine/Tests/ORM/EntityManagerTest.php b/tests/Doctrine/Tests/ORM/EntityManagerTest.php
index a21fbfad6..37a444a60 100644
--- a/tests/Doctrine/Tests/ORM/EntityManagerTest.php
+++ b/tests/Doctrine/Tests/ORM/EntityManagerTest.php
@@ -2,8 +2,6 @@
 
 namespace Doctrine\Tests\ORM;
 
-require_once __DIR__ . '/../TestInit.php';
-
 class EntityManagerTest extends \Doctrine\Tests\OrmTestCase
 {
     private $_em;
diff --git a/tests/Doctrine/Tests/ORM/Functional/AbstractManyToManyAssociationTestCase.php b/tests/Doctrine/Tests/ORM/Functional/AbstractManyToManyAssociationTestCase.php
index f11ad2622..d6dd12e8b 100644
--- a/tests/Doctrine/Tests/ORM/Functional/AbstractManyToManyAssociationTestCase.php
+++ b/tests/Doctrine/Tests/ORM/Functional/AbstractManyToManyAssociationTestCase.php
@@ -4,8 +4,6 @@ namespace Doctrine\Tests\ORM\Functional;
 
 use Doctrine\Common\Collections\Collection;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * Base class for testing a many-to-many association mapping (without inheritance).
  */
diff --git a/tests/Doctrine/Tests/ORM/Functional/AdvancedAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/AdvancedAssociationTest.php
index f15279672..6847d01c3 100644
--- a/tests/Doctrine/Tests/ORM/Functional/AdvancedAssociationTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/AdvancedAssociationTest.php
@@ -4,8 +4,6 @@ namespace Doctrine\Tests\ORM\Functional;
 
 use Doctrine\ORM\Query;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * Functional tests for the Single Table Inheritance mapping strategy.
  *
diff --git a/tests/Doctrine/Tests/ORM/Functional/AdvancedDqlQueryTest.php b/tests/Doctrine/Tests/ORM/Functional/AdvancedDqlQueryTest.php
index 31fce6ab8..7302a1d6f 100644
--- a/tests/Doctrine/Tests/ORM/Functional/AdvancedDqlQueryTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/AdvancedDqlQueryTest.php
@@ -7,8 +7,6 @@ use Doctrine\Tests\Models\Company\CompanyEmployee,
     Doctrine\Tests\Models\Company\CompanyPerson,
     Doctrine\Tests\Models\Company\CompanyCar;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * Functional Query tests.
  *
@@ -180,4 +178,4 @@ class AdvancedDqlQueryTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->_em->flush();
         $this->_em->clear();
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php b/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php
index 2fb830a92..c504d1bd0 100644
--- a/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php
@@ -11,8 +11,6 @@ use Doctrine\Tests\Models\CMS\CmsGroup;
 use Doctrine\Tests\Models\CMS\CmsArticle;
 use Doctrine\Tests\Models\CMS\CmsComment;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 class BasicFunctionalTest extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     protected function setUp()
diff --git a/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest2.php b/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest2.php
index 531b10020..9c50a1496 100644
--- a/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest2.php
+++ b/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest2.php
@@ -2,8 +2,6 @@
 
 namespace Doctrine\Tests\ORM\Functional;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * Functional tests for the Class Table Inheritance mapping strategy.
  *
diff --git a/tests/Doctrine/Tests/ORM/Functional/ClearEventTest.php b/tests/Doctrine/Tests/ORM/Functional/ClearEventTest.php
index e86edb5b7..389b09a54 100644
--- a/tests/Doctrine/Tests/ORM/Functional/ClearEventTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/ClearEventTest.php
@@ -5,8 +5,6 @@ namespace Doctrine\Tests\ORM\Functional;
 use Doctrine\ORM\Event\OnClearEventArgs;
 use Doctrine\ORM\Events;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * ClearEventTest
  *
@@ -37,4 +35,4 @@ class OnClearListener
     {
         $this->called = true;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyTest.php b/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyTest.php
index f984efafd..7967ecce0 100644
--- a/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyTest.php
@@ -7,8 +7,6 @@ use Doctrine\Tests\Models\Navigation\NavTour;
 use Doctrine\Tests\Models\Navigation\NavPhotos;
 use Doctrine\Tests\Models\Navigation\NavUser;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 class CompositePrimaryKeyTest extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     public function setUp()
diff --git a/tests/Doctrine/Tests/ORM/Functional/DefaultValuesTest.php b/tests/Doctrine/Tests/ORM/Functional/DefaultValuesTest.php
index dc148707c..b1f7cda9c 100644
--- a/tests/Doctrine/Tests/ORM/Functional/DefaultValuesTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/DefaultValuesTest.php
@@ -2,8 +2,6 @@
 
 namespace Doctrine\Tests\ORM\Functional;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * Tests basic operations on entities with default values.
  *
diff --git a/tests/Doctrine/Tests/ORM/Functional/DetachedEntityTest.php b/tests/Doctrine/Tests/ORM/Functional/DetachedEntityTest.php
index f5c50eb11..5504246d5 100644
--- a/tests/Doctrine/Tests/ORM/Functional/DetachedEntityTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/DetachedEntityTest.php
@@ -8,8 +8,6 @@ use Doctrine\Tests\Models\CMS\CmsAddress;
 use Doctrine\Tests\Models\CMS\CmsArticle;
 use Doctrine\ORM\UnitOfWork;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * Description of DetachedEntityTest
  *
diff --git a/tests/Doctrine/Tests/ORM/Functional/ExtraLazyCollectionTest.php b/tests/Doctrine/Tests/ORM/Functional/ExtraLazyCollectionTest.php
index b153fe22a..9ca999996 100644
--- a/tests/Doctrine/Tests/ORM/Functional/ExtraLazyCollectionTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/ExtraLazyCollectionTest.php
@@ -4,8 +4,6 @@ namespace Doctrine\Tests\ORM\Functional;
 
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * Description of ExtraLazyCollectionTest
  *
diff --git a/tests/Doctrine/Tests/ORM/Functional/FlushEventTest.php b/tests/Doctrine/Tests/ORM/Functional/FlushEventTest.php
index b338db3e0..bd3a33002 100644
--- a/tests/Doctrine/Tests/ORM/Functional/FlushEventTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/FlushEventTest.php
@@ -7,8 +7,6 @@ use Doctrine\Tests\Models\CMS\CmsPhonenumber;
 use Doctrine\ORM\Event\OnFlushEventArgs;
 use Doctrine\ORM\Events;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * FlushEventTest
  *
diff --git a/tests/Doctrine/Tests/ORM/Functional/IdentityMapTest.php b/tests/Doctrine/Tests/ORM/Functional/IdentityMapTest.php
index 3ac5bbe1c..ed0d4f644 100644
--- a/tests/Doctrine/Tests/ORM/Functional/IdentityMapTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/IdentityMapTest.php
@@ -7,8 +7,6 @@ use Doctrine\Tests\Models\CMS\CmsUser,
     Doctrine\Tests\Models\CMS\CmsPhonenumber,
     Doctrine\ORM\Query;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * IdentityMapTest
  *
diff --git a/tests/Doctrine/Tests/ORM/Functional/IndexByAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/IndexByAssociationTest.php
index 7d2ed5648..e5a4d1d9e 100644
--- a/tests/Doctrine/Tests/ORM/Functional/IndexByAssociationTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/IndexByAssociationTest.php
@@ -6,8 +6,6 @@ use Doctrine\Tests\Models\StockExchange\Stock;
 use Doctrine\Tests\Models\StockExchange\Market;
 use Doctrine\Tests\Models\StockExchange\Bond;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * @group DDC-250
  */
diff --git a/tests/Doctrine/Tests/ORM/Functional/LifecycleCallbackTest.php b/tests/Doctrine/Tests/ORM/Functional/LifecycleCallbackTest.php
index c19675b6d..af732384a 100644
--- a/tests/Doctrine/Tests/ORM/Functional/LifecycleCallbackTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/LifecycleCallbackTest.php
@@ -3,8 +3,6 @@
 namespace Doctrine\Tests\ORM\Functional;
 use Doctrine\ORM\Event\PreUpdateEventArgs;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 class LifecycleCallbackTest extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     protected function setUp() {
@@ -456,4 +454,4 @@ class LifecycleCallbackEventArgEntity
     {
         $this->calls[__FUNCTION__] = $event;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Locking/GearmanLockTest.php b/tests/Doctrine/Tests/ORM/Functional/Locking/GearmanLockTest.php
index a67a44d8f..c7bdf6bf8 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Locking/GearmanLockTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Locking/GearmanLockTest.php
@@ -7,8 +7,6 @@ use Doctrine\Tests\Models\CMS\CmsArticle,
     Doctrine\DBAL\LockMode,
     Doctrine\ORM\EntityManager;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 /**
  * @group locking_functional
  */
@@ -177,4 +175,4 @@ class GearmanLockTest extends \Doctrine\Tests\OrmFunctionalTestCase
 
         $this->assertEquals(GEARMAN_SUCCESS, $this->gearman->returnCode());
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Locking/LockAgentWorker.php b/tests/Doctrine/Tests/ORM/Functional/Locking/LockAgentWorker.php
index 2db6cce12..4cd8dfec0 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Locking/LockAgentWorker.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Locking/LockAgentWorker.php
@@ -2,8 +2,6 @@
 
 namespace Doctrine\Tests\ORM\Functional\Locking;
 
-require_once __DIR__ . "/../../../TestInit.php";
-
 class LockAgentWorker
 {
     private $em;
@@ -109,4 +107,4 @@ class LockAgentWorker
     }
 }
 
-LockAgentWorker::run();
\ No newline at end of file
+LockAgentWorker::run();
diff --git a/tests/Doctrine/Tests/ORM/Functional/Locking/LockTest.php b/tests/Doctrine/Tests/ORM/Functional/Locking/LockTest.php
index 5eef42aa0..c2d3c7315 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Locking/LockTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Locking/LockTest.php
@@ -7,8 +7,6 @@ use Doctrine\Tests\Models\CMS\CmsArticle,
     Doctrine\DBAL\LockMode,
     Doctrine\ORM\EntityManager;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 /**
  * @group locking
  */
diff --git a/tests/Doctrine/Tests/ORM/Functional/Locking/OptimisticTest.php b/tests/Doctrine/Tests/ORM/Functional/Locking/OptimisticTest.php
index cd0e04b02..e6773dd6b 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Locking/OptimisticTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Locking/OptimisticTest.php
@@ -10,8 +10,6 @@ use Doctrine\Tests\TestUtil;
 use Doctrine\DBAL\LockMode;
 use DateTime;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 class OptimisticTest extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     protected function setUp()
@@ -307,4 +305,4 @@ class OptimisticTimestamp
      * @Version @Column(type="datetime")
      */
     public $version;
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/ManyToManyBasicAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/ManyToManyBasicAssociationTest.php
index b7e23576c..e6e42f0a0 100644
--- a/tests/Doctrine/Tests/ORM/Functional/ManyToManyBasicAssociationTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/ManyToManyBasicAssociationTest.php
@@ -7,8 +7,6 @@ use Doctrine\Tests\Models\CMS\CmsUser,
     Doctrine\Tests\Models\CMS\CmsGroup,
     Doctrine\Common\Collections\ArrayCollection;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * Basic many-to-many association tests.
  * ("Working with associations")
diff --git a/tests/Doctrine/Tests/ORM/Functional/ManyToManyBidirectionalAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/ManyToManyBidirectionalAssociationTest.php
index cfe9f1e83..51121b09a 100644
--- a/tests/Doctrine/Tests/ORM/Functional/ManyToManyBidirectionalAssociationTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/ManyToManyBidirectionalAssociationTest.php
@@ -7,8 +7,6 @@ use Doctrine\Tests\Models\ECommerce\ECommerceCategory;
 use Doctrine\ORM\Mapping\AssociationMapping;
 use Doctrine\ORM\Query;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * Tests a bidirectional many-to-many association mapping (without inheritance).
  * Owning side is ECommerceProduct, inverse side is ECommerceCategory.
diff --git a/tests/Doctrine/Tests/ORM/Functional/ManyToManyEventTest.php b/tests/Doctrine/Tests/ORM/Functional/ManyToManyEventTest.php
index 47c96b1fe..85e8a17e9 100644
--- a/tests/Doctrine/Tests/ORM/Functional/ManyToManyEventTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/ManyToManyEventTest.php
@@ -1,9 +1,10 @@
 <?php
+
 namespace Doctrine\Tests\ORM\Functional;
+
 use Doctrine\Tests\Models\CMS\CmsUser;
 use Doctrine\Tests\Models\CMS\CmsGroup;
 use Doctrine\ORM\Events;
-require_once __DIR__ . '/../../TestInit.php';
 
 /**
  * ManyToManyEventTest
diff --git a/tests/Doctrine/Tests/ORM/Functional/ManyToManySelfReferentialAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/ManyToManySelfReferentialAssociationTest.php
index 88978ad4c..3ad406880 100644
--- a/tests/Doctrine/Tests/ORM/Functional/ManyToManySelfReferentialAssociationTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/ManyToManySelfReferentialAssociationTest.php
@@ -6,8 +6,6 @@ use Doctrine\Tests\Models\ECommerce\ECommerceProduct;
 use Doctrine\ORM\Mapping\AssociationMapping;
 use Doctrine\ORM\Mapping\ClassMetadata;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * Tests a self referential many-to-many association mapping (from a model to the same model, without inheritance).
  * For simplicity the relation duplicates entries in the association table
diff --git a/tests/Doctrine/Tests/ORM/Functional/ManyToManyUnidirectionalAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/ManyToManyUnidirectionalAssociationTest.php
index ba83d5315..241b3c2fb 100644
--- a/tests/Doctrine/Tests/ORM/Functional/ManyToManyUnidirectionalAssociationTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/ManyToManyUnidirectionalAssociationTest.php
@@ -7,8 +7,6 @@ use Doctrine\Tests\Models\ECommerce\ECommerceProduct;
 use Doctrine\ORM\Mapping\AssociationMapping;
 use Doctrine\ORM\Mapping\ClassMetadata;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * Tests a unidirectional many-to-many association mapping (without inheritance).
  * Inverse side is not present.
diff --git a/tests/Doctrine/Tests/ORM/Functional/MappedSuperclassTest.php b/tests/Doctrine/Tests/ORM/Functional/MappedSuperclassTest.php
index f4439b9ad..700340766 100644
--- a/tests/Doctrine/Tests/ORM/Functional/MappedSuperclassTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/MappedSuperclassTest.php
@@ -2,8 +2,6 @@
 
 namespace Doctrine\Tests\ORM\Functional;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * MappedSuperclassTest
  *
diff --git a/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php b/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php
index 73e222118..79f37c1b0 100644
--- a/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php
@@ -17,8 +17,6 @@ use Doctrine\Tests\Models\Company\CompanyFixContract;
 use Doctrine\Tests\Models\Company\CompanyEmployee;
 use Doctrine\Tests\Models\Company\CompanyPerson;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * NativeQueryTest
  *
diff --git a/tests/Doctrine/Tests/ORM/Functional/NewOperatorTest.php b/tests/Doctrine/Tests/ORM/Functional/NewOperatorTest.php
index 4b65f676b..98fe0dcb2 100644
--- a/tests/Doctrine/Tests/ORM/Functional/NewOperatorTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/NewOperatorTest.php
@@ -7,8 +7,6 @@ use Doctrine\Tests\Models\CMS\CmsEmail;
 use Doctrine\Tests\Models\CMS\CmsAddress;
 use Doctrine\Tests\Models\CMS\CmsPhonenumber;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * @group DDC-1574
  */
@@ -587,4 +585,4 @@ class ClassWithPrivateConstructor
     {
         $this->foo = $foo;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/NotifyPolicyTest.php b/tests/Doctrine/Tests/ORM/Functional/NotifyPolicyTest.php
index 069e11c23..ab6aa61cf 100644
--- a/tests/Doctrine/Tests/ORM/Functional/NotifyPolicyTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/NotifyPolicyTest.php
@@ -5,8 +5,6 @@ use Doctrine\Common\Collections\ArrayCollection,
     Doctrine\Common\NotifyPropertyChanged,
     Doctrine\Common\PropertyChangedListener;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * NativeQueryTest
  *
diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToManyBidirectionalAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToManyBidirectionalAssociationTest.php
index f513395d7..c904a1474 100644
--- a/tests/Doctrine/Tests/ORM/Functional/OneToManyBidirectionalAssociationTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/OneToManyBidirectionalAssociationTest.php
@@ -6,8 +6,6 @@ use Doctrine\Tests\Models\ECommerce\ECommerceProduct;
 use Doctrine\Tests\Models\ECommerce\ECommerceFeature;
 use Doctrine\Common\Collections\Criteria;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * Tests a bidirectional one-to-one association mapping (without inheritance).
  */
diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToManyOrphanRemovalTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToManyOrphanRemovalTest.php
index 28101ccc7..c17a8e07c 100644
--- a/tests/Doctrine/Tests/ORM/Functional/OneToManyOrphanRemovalTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/OneToManyOrphanRemovalTest.php
@@ -6,8 +6,6 @@ use Doctrine\Tests\Models\CMS\CmsUser,
     Doctrine\Tests\Models\CMS\CmsAddress,
     Doctrine\Tests\Models\CMS\CmsPhonenumber;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * Tests a bidirectional one-to-many association mapping with orphan removal.
  */
@@ -72,4 +70,4 @@ class OneToManyOrphanRemovalTest extends \Doctrine\Tests\OrmFunctionalTestCase
 
         $this->assertEquals(0, count($result), 'CmsPhonenumber should be removed by orphanRemoval');
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToManySelfReferentialAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToManySelfReferentialAssociationTest.php
index d16217157..ab077fe4a 100644
--- a/tests/Doctrine/Tests/ORM/Functional/OneToManySelfReferentialAssociationTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/OneToManySelfReferentialAssociationTest.php
@@ -6,8 +6,6 @@ use Doctrine\Tests\Models\ECommerce\ECommerceCategory;
 use Doctrine\ORM\Mapping\AssociationMapping;
 use Doctrine\ORM\Mapping\ClassMetadata;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * Tests a bidirectional one-to-one association mapping (without inheritance).
  */
diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToManyUnidirectionalAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToManyUnidirectionalAssociationTest.php
index dff09784a..b4db3b90e 100644
--- a/tests/Doctrine/Tests/ORM/Functional/OneToManyUnidirectionalAssociationTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/OneToManyUnidirectionalAssociationTest.php
@@ -6,8 +6,6 @@ use Doctrine\Tests\Models\Routing\RoutingRoute;
 use Doctrine\Tests\Models\Routing\RoutingLocation;
 use Doctrine\Tests\Models\Routing\RoutingLeg;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * Tests a bidirectional one-to-one association mapping (without inheritance).
  */
diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToOneBidirectionalAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToOneBidirectionalAssociationTest.php
index ced524c45..4ecfd5f90 100644
--- a/tests/Doctrine/Tests/ORM/Functional/OneToOneBidirectionalAssociationTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/OneToOneBidirectionalAssociationTest.php
@@ -7,8 +7,6 @@ use Doctrine\Tests\Models\ECommerce\ECommerceCustomer;
 use Doctrine\ORM\Mapping\AssociationMapping;
 use Doctrine\ORM\Mapping\ClassMetadata;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * Tests a bidirectional one-to-one association mapping (without inheritance).
  */
diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToOneEagerLoadingTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToOneEagerLoadingTest.php
index 2ed239231..fb6ed5ab7 100644
--- a/tests/Doctrine/Tests/ORM/Functional/OneToOneEagerLoadingTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/OneToOneEagerLoadingTest.php
@@ -2,8 +2,6 @@
 
 namespace Doctrine\Tests\ORM\Functional;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * @group DDC-952
  */
diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToOneOrphanRemovalTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToOneOrphanRemovalTest.php
index 53a1a6c2b..98e307800 100644
--- a/tests/Doctrine/Tests/ORM/Functional/OneToOneOrphanRemovalTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/OneToOneOrphanRemovalTest.php
@@ -7,8 +7,6 @@ use Doctrine\Tests\Models\CMS\CmsUser,
     Doctrine\Tests\Models\CMS\CmsAddress,
     Doctrine\Tests\Models\CMS\CmsPhonenumber;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * Tests a bidirectional one-to-one association mapping with orphan removal.
  */
@@ -91,4 +89,4 @@ class OneToOneOrphanRemovalTest extends \Doctrine\Tests\OrmFunctionalTestCase
 
         $this->assertEquals(0, count($result), 'CmsEmail should be removed by orphanRemoval');
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToOneSelfReferentialAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToOneSelfReferentialAssociationTest.php
index 326e7aec1..4d173f3dc 100644
--- a/tests/Doctrine/Tests/ORM/Functional/OneToOneSelfReferentialAssociationTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/OneToOneSelfReferentialAssociationTest.php
@@ -6,8 +6,6 @@ use Doctrine\Tests\Models\ECommerce\ECommerceCustomer;
 use Doctrine\ORM\Mapping\AssociationMapping;
 use Doctrine\ORM\Mapping\ClassMetadata;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * Tests a self referential one-to-one association mapping (without inheritance).
  * Relation is defined as the mentor that a customer choose. The mentor could
diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToOneUnidirectionalAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToOneUnidirectionalAssociationTest.php
index 1ffae6b13..61bb8c611 100644
--- a/tests/Doctrine/Tests/ORM/Functional/OneToOneUnidirectionalAssociationTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/OneToOneUnidirectionalAssociationTest.php
@@ -8,8 +8,6 @@ use Doctrine\ORM\Mapping\AssociationMapping;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Query;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * Tests a unidirectional one-to-one association mapping (without inheritance).
  * Inverse side is not present.
diff --git a/tests/Doctrine/Tests/ORM/Functional/OrderedCollectionTest.php b/tests/Doctrine/Tests/ORM/Functional/OrderedCollectionTest.php
index c2e131cb3..d85357bac 100644
--- a/tests/Doctrine/Tests/ORM/Functional/OrderedCollectionTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/OrderedCollectionTest.php
@@ -7,8 +7,6 @@ use Doctrine\Tests\Models\Routing\RoutingLocation;
 use Doctrine\Tests\Models\Routing\RoutingLeg;
 use Doctrine\Tests\Models\Routing\RoutingRouteBooking;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 class OrderedCollectionTest extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     protected $locations = array();
@@ -110,4 +108,4 @@ class OrderedCollectionTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->assertEquals("Berlin", $route->legs[0]->fromLocation->getName());
         $this->assertEquals("Bonn", $route->legs[1]->fromLocation->getName());
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/OrderedJoinedTableInheritanceCollectionTest.php b/tests/Doctrine/Tests/ORM/Functional/OrderedJoinedTableInheritanceCollectionTest.php
index 8c0d37b98..cef464574 100644
--- a/tests/Doctrine/Tests/ORM/Functional/OrderedJoinedTableInheritanceCollectionTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/OrderedJoinedTableInheritanceCollectionTest.php
@@ -4,8 +4,6 @@ namespace Doctrine\Tests\ORM\Functional;
 
 use Doctrine\ORM\Query;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * Functional tests for the Single Table Inheritance mapping strategy.
  *
@@ -130,4 +128,4 @@ class OJTIC_Cat extends OJTIC_Pet
 class OJTIC_Dog extends OJTIC_Pet
 {
 
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/PostFlushEventTest.php b/tests/Doctrine/Tests/ORM/Functional/PostFlushEventTest.php
index 819887196..779879cd9 100644
--- a/tests/Doctrine/Tests/ORM/Functional/PostFlushEventTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/PostFlushEventTest.php
@@ -1,9 +1,10 @@
 <?php
+
 namespace Doctrine\Tests\ORM\Functional;
+
 use Doctrine\Tests\Models\CMS\CmsUser;
 use Doctrine\ORM\Event\PostFlushEventArgs;
 use Doctrine\ORM\Events;
-require_once __DIR__ . '/../../TestInit.php';
 
 /**
  * PostFlushEventTest
diff --git a/tests/Doctrine/Tests/ORM/Functional/PostLoadEventTest.php b/tests/Doctrine/Tests/ORM/Functional/PostLoadEventTest.php
index 65e438cc1..6cc464bab 100644
--- a/tests/Doctrine/Tests/ORM/Functional/PostLoadEventTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/PostLoadEventTest.php
@@ -8,8 +8,6 @@ use Doctrine\Tests\Models\CMS\CmsEmail;
 use Doctrine\ORM\Event\LifecycleEventArgs;
 use Doctrine\ORM\Events;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * PostLoadEventTest
  *
@@ -249,4 +247,4 @@ class PostLoadListener
         // Expected to be mocked out
         echo 'Should never be called!';
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/QueryCacheTest.php b/tests/Doctrine/Tests/ORM/Functional/QueryCacheTest.php
index faffdd7bc..443c8c89a 100644
--- a/tests/Doctrine/Tests/ORM/Functional/QueryCacheTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/QueryCacheTest.php
@@ -5,8 +5,6 @@ namespace Doctrine\Tests\ORM\Functional;
 use Doctrine\Tests\Models\CMS\CmsUser;
 use Doctrine\Common\Cache\ArrayCache;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * QueryCacheTest
  *
diff --git a/tests/Doctrine/Tests/ORM/Functional/QueryDqlFunctionTest.php b/tests/Doctrine/Tests/ORM/Functional/QueryDqlFunctionTest.php
index 7f3180a6c..a28f0ccaa 100644
--- a/tests/Doctrine/Tests/ORM/Functional/QueryDqlFunctionTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/QueryDqlFunctionTest.php
@@ -4,8 +4,6 @@ namespace Doctrine\Tests\ORM\Functional;
 
 use Doctrine\Tests\Models\Company\CompanyManager;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * Functional Query tests.
  *
@@ -399,4 +397,4 @@ class QueryDqlFunctionTest extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->_em->flush();
         $this->_em->clear();
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/QueryTest.php b/tests/Doctrine/Tests/ORM/Functional/QueryTest.php
index 0cba58413..795deba19 100644
--- a/tests/Doctrine/Tests/ORM/Functional/QueryTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/QueryTest.php
@@ -12,8 +12,6 @@ use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\Query\Parameter;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * Functional Query tests.
  *
diff --git a/tests/Doctrine/Tests/ORM/Functional/ReadOnlyTest.php b/tests/Doctrine/Tests/ORM/Functional/ReadOnlyTest.php
index 2519a9c57..0cfbdc16e 100644
--- a/tests/Doctrine/Tests/ORM/Functional/ReadOnlyTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/ReadOnlyTest.php
@@ -2,8 +2,6 @@
 
 namespace Doctrine\Tests\ORM\Functional;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * Functional Query tests.
  *
diff --git a/tests/Doctrine/Tests/ORM/Functional/ReferenceProxyTest.php b/tests/Doctrine/Tests/ORM/Functional/ReferenceProxyTest.php
index d03b2fcdc..5c44c732e 100644
--- a/tests/Doctrine/Tests/ORM/Functional/ReferenceProxyTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/ReferenceProxyTest.php
@@ -8,8 +8,6 @@ use Doctrine\Tests\Models\ECommerce\ECommerceProduct;
 use Doctrine\Tests\Models\ECommerce\ECommerceShipping;
 use Doctrine\Tests\Models\Company\CompanyAuction;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * Tests the generation of a proxy object for lazy loading.
  * @author Giorgio Sironi <piccoloprincipeazzurro@gmail.com>
diff --git a/tests/Doctrine/Tests/ORM/Functional/ResultCacheTest.php b/tests/Doctrine/Tests/ORM/Functional/ResultCacheTest.php
index 5846d92a0..08ca99dd9 100644
--- a/tests/Doctrine/Tests/ORM/Functional/ResultCacheTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/ResultCacheTest.php
@@ -6,8 +6,6 @@ use Doctrine\Tests\Models\CMS\CmsUser;
 use Doctrine\Tests\Models\CMS\CmsArticle;
 use Doctrine\Common\Cache\ArrayCache;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * ResultCacheTest
  *
diff --git a/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php b/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php
index 4e9390cc6..590d5151e 100644
--- a/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php
@@ -25,8 +25,6 @@ use Doctrine\Tests\Models\Company\CompanyAuction;
 use Doctrine\Tests\Models\Company\CompanyFlexContract;
 use Doctrine\Tests\Models\Company\CompanyFlexUltraContract;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * Tests SQLFilter functionality.
  *
diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/CompanySchemaTest.php b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/CompanySchemaTest.php
index a1e6daca5..5e9fcda37 100644
--- a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/CompanySchemaTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/CompanySchemaTest.php
@@ -4,8 +4,6 @@ namespace Doctrine\Tests\ORM\Functional\SchemaTool;
 
 use Doctrine\DBAL\Schema\Schema;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 /**
  * Functional tests for the Class Table Inheritance mapping strategy.
  *
diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/MySqlSchemaToolTest.php b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/MySqlSchemaToolTest.php
index 4ac97c84b..244d44ed6 100644
--- a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/MySqlSchemaToolTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/MySqlSchemaToolTest.php
@@ -5,8 +5,6 @@ namespace Doctrine\Tests\ORM\Functional\SchemaTool;
 use Doctrine\ORM\Tools\SchemaTool,
     Doctrine\ORM\Mapping\ClassMetadata;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 class MySqlSchemaToolTest extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     protected function setUp() {
diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/PostgreSqlSchemaToolTest.php b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/PostgreSqlSchemaToolTest.php
index cc4b231d6..5fd9a95fc 100644
--- a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/PostgreSqlSchemaToolTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/PostgreSqlSchemaToolTest.php
@@ -5,8 +5,6 @@ namespace Doctrine\Tests\ORM\Functional\SchemaTool;
 use Doctrine\ORM\Tools\SchemaTool,
     Doctrine\ORM\Mapping\ClassMetadata;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 class PostgreSqlSchemaToolTest extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     protected function setUp()
diff --git a/tests/Doctrine/Tests/ORM/Functional/SequenceEmulatedIdentityStrategyTest.php b/tests/Doctrine/Tests/ORM/Functional/SequenceEmulatedIdentityStrategyTest.php
index adaa2cd21..38a6e4d2d 100644
--- a/tests/Doctrine/Tests/ORM/Functional/SequenceEmulatedIdentityStrategyTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/SequenceEmulatedIdentityStrategyTest.php
@@ -4,8 +4,6 @@ namespace Doctrine\Tests\ORM\Functional;
 
 use Doctrine\DBAL\Schema\Sequence;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 class SequenceEmulatedIdentityStrategyTest extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     /**
diff --git a/tests/Doctrine/Tests/ORM/Functional/SequenceGeneratorTest.php b/tests/Doctrine/Tests/ORM/Functional/SequenceGeneratorTest.php
index 8a71cc1f1..6cb00f686 100644
--- a/tests/Doctrine/Tests/ORM/Functional/SequenceGeneratorTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/SequenceGeneratorTest.php
@@ -2,8 +2,6 @@
 
 namespace Doctrine\Tests\ORM\Functional;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * Description of SequenceGeneratorTest
  *
@@ -50,4 +48,4 @@ class SequenceEntity
      * @SequenceGenerator(allocationSize=5,sequenceName="person_id_seq")
      */
     public $id;
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/StandardEntityPersisterTest.php b/tests/Doctrine/Tests/ORM/Functional/StandardEntityPersisterTest.php
index de103eb07..31f28db3b 100644
--- a/tests/Doctrine/Tests/ORM/Functional/StandardEntityPersisterTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/StandardEntityPersisterTest.php
@@ -9,8 +9,6 @@ use Doctrine\Tests\Models\ECommerce\ECommerceCart,
 
 use Doctrine\ORM\Mapping\AssociationMapping;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * Tests capabilities of the persister.
  * @author Giorgio Sironi <piccoloprincipeazzurro@gmail.com>
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1040Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1040Test.php
index 93dc0eea6..1b7c5b521 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1040Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1040Test.php
@@ -5,7 +5,6 @@ namespace Doctrine\Tests\ORM\Functional\Ticket;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Tests\Models\CMS\CmsArticle;
 use Doctrine\Tests\Models\CMS\CmsUser;
-require_once __DIR__ . '/../../../TestInit.php';
 
 /**
  * @group DDC-1040
@@ -78,4 +77,4 @@ class DDC1040Test extends \Doctrine\Tests\OrmFunctionalTestCase
 
         $this->assertSame($article, $farticle);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1041Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1041Test.php
index 5b30c043e..0cf14aecc 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1041Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1041Test.php
@@ -3,7 +3,6 @@
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
 use Doctrine\Common\Collections\ArrayCollection;
-require_once __DIR__ . '/../../../TestInit.php';
 
 /**
  * @group DDC-1041
@@ -30,4 +29,4 @@ class DDC1041Test extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->assertNull($this->_em->getReference('Doctrine\Tests\Models\Company\CompanyFlexContract', $id));
         $this->assertNull($this->_em->getPartialReference('Doctrine\Tests\Models\Company\CompanyFlexContract', $id));
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1043Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1043Test.php
index 31bd8350f..babb43844 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1043Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1043Test.php
@@ -3,7 +3,6 @@
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
 use Doctrine\Common\Collections\ArrayCollection;
-require_once __DIR__ . '/../../../TestInit.php';
 
 /**
  * @group DDC-1043
@@ -33,4 +32,4 @@ class DDC1043Test extends \Doctrine\Tests\OrmFunctionalTestCase
         $user = $this->_em->find("Doctrine\Tests\Models\CMS\CmsUser", $user->id);
         $this->assertSame("44", $user->status);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1050Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1050Test.php
index 31c0733e0..7e9d4a651 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1050Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1050Test.php
@@ -3,7 +3,6 @@
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
 use Doctrine\Common\Collections\ArrayCollection;
-require_once __DIR__ . '/../../../TestInit.php';
 
 /**
  * @group DDC-1050
@@ -34,4 +33,4 @@ class DDC1050Test extends \Doctrine\Tests\OrmFunctionalTestCase
         $e = microtime(true);
         echo __FUNCTION__ . " - " . ($e - $s) . " seconds" . PHP_EOL;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1080Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1080Test.php
index 2b9d579a5..a6ad88045 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1080Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1080Test.php
@@ -2,8 +2,6 @@
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 /**
  * @group DDC-1080
  */
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1113Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1113Test.php
index 3e8a2fc0a..5bb007fd0 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1113Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1113Test.php
@@ -4,8 +4,6 @@ namespace Doctrine\Tests\ORM\Functional\Ticket;
 
 use Doctrine\Common\Collections\ArrayCollection;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 /**
  * @group DDC-1113
  * @group DDC-1306
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1129Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1129Test.php
index c481aa395..70d2e9fea 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1129Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1129Test.php
@@ -3,7 +3,6 @@
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
 use Doctrine\Common\Collections\ArrayCollection;
-require_once __DIR__ . '/../../../TestInit.php';
 
 /**
  * @group DDC-1129
@@ -43,4 +42,4 @@ class DDC1129Test extends \Doctrine\Tests\OrmFunctionalTestCase
         $changeSet = $uow->getEntityChangeSet($article);
         $this->assertEquals(0, count($changeSet), "No changesets should be computed.");
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1151Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1151Test.php
index fe975f69d..8e67b514f 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1151Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1151Test.php
@@ -2,8 +2,6 @@
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 /**
  * @group DDC-1151
  */
@@ -53,4 +51,4 @@ class DDC1151Group
 {
     /** @Id @Column(type="integer") @GeneratedValue */
     public $id;
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1163Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1163Test.php
index 1e8cae6db..dad902b35 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1163Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1163Test.php
@@ -2,8 +2,6 @@
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 /**
  * @group DDC-1163
  */
@@ -212,4 +210,4 @@ class DDC1163Tag
         $this->product = $product;
     }
 
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC117Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC117Test.php
index 17ecbafd6..7bd576a63 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC117Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC117Test.php
@@ -10,8 +10,6 @@ use Doctrine\Tests\Models\DDC117\DDC117ApproveChanges;
 use Doctrine\Tests\Models\DDC117\DDC117Editor;
 use Doctrine\Tests\Models\DDC117\DDC117Link;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 /**
  * @group DDC-117
  */
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1181Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1181Test.php
index 32856ace1..5a6d2e599 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1181Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1181Test.php
@@ -2,8 +2,6 @@
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 class DDC1181Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     public function setUp()
@@ -98,4 +96,4 @@ class DDC1181Room
 {
     /** @Id @Column(type="integer") @GeneratedValue */
     public $id;
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1193Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1193Test.php
index 6465fa675..5855ee73a 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1193Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1193Test.php
@@ -1,8 +1,6 @@
 <?php
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 use DateTime, Doctrine\DBAL\Types\Type;
 
 class DDC1193Test extends \Doctrine\Tests\OrmFunctionalTestCase
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1209Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1209Test.php
index bddbbdf44..b750cc040 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1209Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1209Test.php
@@ -4,8 +4,6 @@ namespace Doctrine\Tests\ORM\Functional\Ticket;
 
 use Doctrine\Common\Collections\ArrayCollection;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 class DDC1209Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     protected function setUp()
@@ -122,4 +120,4 @@ class DateTime2 extends \DateTime
     {
         return $this->format('Y');
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1225Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1225Test.php
index be7ecd62e..a6003e81e 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1225Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1225Test.php
@@ -5,8 +5,6 @@ namespace Doctrine\Tests\ORM\Functional\Ticket;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Tests\Models\CMS\CmsEmployee;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 /**
  * @group DDC-1225
  */
@@ -82,4 +80,4 @@ class DDC1225_TestEntity2
      * @Column(type="integer")
      */
     private $id;
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1228Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1228Test.php
index 6e14e2111..4d159fde0 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1228Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1228Test.php
@@ -5,8 +5,6 @@ namespace Doctrine\Tests\ORM\Functional\Ticket;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Tests\Models\CMS\CmsEmployee;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 /**
  * @group DDC-1228
  * @group DDC-1226
@@ -133,4 +131,4 @@ class DDC1228Profile
     {
         $this->name = $name;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1238Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1238Test.php
index 6783928ef..ba14b6317 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1238Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1238Test.php
@@ -5,8 +5,6 @@ namespace Doctrine\Tests\ORM\Functional\Ticket;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Tests\Models\CMS\CmsEmployee;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 /**
  * @group DDC-1238
  */
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1250Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1250Test.php
index 3a756da9a..5b46d880e 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1250Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1250Test.php
@@ -5,8 +5,6 @@ namespace Doctrine\Tests\ORM\Functional\Ticket;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Tests\Models\CMS\CmsEmployee;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 /**
  * @group DDC-1250
  */
@@ -93,4 +91,4 @@ lifecycleCallbacks: { }
 repositoryClass: Entities\ClientsHistoryRepository
 
 
- */
\ No newline at end of file
+ */
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1276Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1276Test.php
index a4f54b55f..154fa29a0 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1276Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1276Test.php
@@ -6,8 +6,6 @@ use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Tests\Models\CMS\CmsUser;
 use Doctrine\Tests\Models\CMS\CmsGroup;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 /**
  * @group DDC-1276
  */
@@ -47,4 +45,4 @@ class DDC1276Test extends \Doctrine\Tests\OrmFunctionalTestCase
 
         $this->_em->flush();
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1300Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1300Test.php
index 38278dc1c..f51c8d44a 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1300Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1300Test.php
@@ -2,8 +2,6 @@
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 /**
  * @group DDC-1300
  */
@@ -105,4 +103,4 @@ class DDC1300FooLocale
      */
     public $_title = null;
 
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1301Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1301Test.php
index 502101bf9..f8ccc5a3e 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1301Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1301Test.php
@@ -4,8 +4,6 @@ namespace Doctrine\Tests\ORM\Functional\Ticket;
 
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 /**
  * @author asm89
  *
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1306Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1306Test.php
index b143b0030..64f1cab43 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1306Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1306Test.php
@@ -7,8 +7,6 @@ use Doctrine\Tests\Models\CMS\CmsUser;
 use Doctrine\Tests\Models\CMS\CmsGroup;
 use Doctrine\Tests\Models\CMS\CmsPhonenumber;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 /**
  * @group DDC-1306
  */
@@ -51,4 +49,4 @@ class DDC1306Test extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->_em->remove($user);
         $this->_em->flush();
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1335Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1335Test.php
index 0500a0e00..5cc168a7f 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1335Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1335Test.php
@@ -4,8 +4,6 @@ namespace Doctrine\Tests\ORM\Functional\Ticket;
 
 use DateTime;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 /**
  * @group DDC-1335
  */
@@ -215,4 +213,4 @@ class DDC1335Phone
         $this->user     = $user;
         $this->numericalValue   = $number;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1383Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1383Test.php
index f6b5a2460..ad5fc4317 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1383Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1383Test.php
@@ -3,8 +3,6 @@
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 use Doctrine\ORM\UnitOfWork;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 /**
  * @group DDC-1383
  */
@@ -96,4 +94,4 @@ class DDC1383Entity extends DDC1383AbstractEntity
 	{
 		$this->reference = $reference;
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1392Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1392Test.php
index 095b1976c..2e0df824b 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1392Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1392Test.php
@@ -1,9 +1,8 @@
 <?php
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
-use Doctrine\ORM\UnitOfWork;
 
-require_once __DIR__ . '/../../../TestInit.php';
+use Doctrine\ORM\UnitOfWork;
 
 /**
  * @group DDC-1392
@@ -124,4 +123,4 @@ class DDC1392File
     {
         return $this->fileId;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1400Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1400Test.php
index 2523b5b72..fa4ee8473 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1400Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1400Test.php
@@ -1,9 +1,8 @@
 <?php
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
-use Doctrine\ORM\UnitOfWork;
 
-require_once __DIR__ . '/../../../TestInit.php';
+use Doctrine\ORM\UnitOfWork;
 
 /**
  * @group DDC-1400
@@ -128,4 +127,4 @@ class DDC1400UserState
      */
     public $articleId;
 
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1404Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1404Test.php
index cc1d7c9ee..5f45cf9b9 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1404Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1404Test.php
@@ -2,8 +2,6 @@
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 /**
  * @group DDC-1404
  */
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC142Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC142Test.php
index 398ceceda..c985d61ac 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC142Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC142Test.php
@@ -5,8 +5,6 @@ namespace Doctrine\Tests\ORM\Functional\Ticket;
 use Doctrine\Tests\Models\Quote\User;
 use Doctrine\Tests\Models\Quote\Address;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 /**
  * @group DDC-1845
  * @group DDC-142
@@ -86,4 +84,4 @@ class DDC142Test extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->assertNull($this->_em->find('Doctrine\Tests\Models\Quote\User', $id));
     }
 
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1430Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1430Test.php
index 9ce9277cb..9725220de 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1430Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1430Test.php
@@ -2,8 +2,6 @@
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 /**
  * @group DDC-1430
  */
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC144Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC144Test.php
index dd6391a74..9e6cc9b08 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC144Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC144Test.php
@@ -2,8 +2,6 @@
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 class DDC144Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     protected function setUp() {
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1452Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1452Test.php
index aef2d10a9..6d6429b93 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1452Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1452Test.php
@@ -5,8 +5,6 @@ namespace Doctrine\Tests\ORM\Functional\Ticket;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\UnitOfWork;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 /**
  * @group DDC-1452
  */
@@ -124,4 +122,4 @@ class DDC1452EntityB
      * @ManyToOne(targetEntity="DDC1452EntityA")
      */
     public $entityATo;
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1454Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1454Test.php
index eaf9dd3f9..162072965 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1454Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1454Test.php
@@ -4,8 +4,6 @@ namespace Doctrine\Tests\ORM\Functional\Ticket;
 
 use Doctrine\ORM\UnitOfWork;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 /**
  * @group DDC-1454
  */
@@ -66,4 +64,4 @@ class DDC1454File
         return $this->fileId;
     }
 
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1458Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1458Test.php
index 745b51c28..330dc722b 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1458Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1458Test.php
@@ -6,8 +6,6 @@ use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Tests\Models\CMS\CmsUser;
 use Doctrine\Tests\Models\CMS\CmsGroup;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 class DDC1258Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     public function setUp()
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1461Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1461Test.php
index e6aa2e6bc..e1a849210 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1461Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1461Test.php
@@ -5,7 +5,6 @@ namespace Doctrine\Tests\ORM\Functional\Ticket;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Tests\Models\CMS\CmsArticle;
 use Doctrine\Tests\Models\CMS\CmsUser;
-require_once __DIR__ . '/../../../TestInit.php';
 
 /**
  * @group DDC-1461
@@ -83,4 +82,4 @@ class DDC1461TwitterAccount
      * @OneToOne(targetEntity="DDC1461User", fetch="EAGER")
      */
     public $user;
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1514Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1514Test.php
index 2e3b2fbc5..14bbfdb21 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1514Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1514Test.php
@@ -5,8 +5,6 @@ namespace Doctrine\Tests\ORM\Functional\Ticket;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\UnitOfWork;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 /**
  * @group DDC-1514
  */
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1545Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1545Test.php
index 6af9cc547..195219e4b 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1545Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1545Test.php
@@ -8,8 +8,6 @@ use Doctrine\Tests\Models\CMS\CmsComment;
 use Doctrine\Tests\Models\CMS\CmsArticle;
 use Doctrine\Tests\Models\CMS\CmsUser;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 /**
  * @group DDC-1545
  */
@@ -198,4 +196,4 @@ class DDC1545Test extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->assertNotNull($article->user);
         $this->assertEquals($user2->id, $article->user->id);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC163Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC163Test.php
index 3126d5491..cea515ce3 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC163Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC163Test.php
@@ -4,8 +4,6 @@ namespace Doctrine\Tests\ORM\Functional\Ticket;
 
 use Doctrine\Tests\Models\Company\CompanyPerson;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 class DDC163Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     protected function setUp()
@@ -62,4 +60,4 @@ class DDC163Test extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->assertEquals('p1', $result[0]['person_name']);
         $this->assertEquals('p2', $result[0]['friend_name']);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC168Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC168Test.php
index 0b5378040..75924f135 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC168Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC168Test.php
@@ -4,8 +4,6 @@ namespace Doctrine\Tests\ORM\Functional\Ticket;
 
 use Doctrine\Tests\Models\Company\CompanyEmployee;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 class DDC168Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     protected $oldMetadata;
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1690Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1690Test.php
index fd2288eed..ed1cb4257 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1690Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1690Test.php
@@ -1,11 +1,10 @@
 <?php
+
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
 use Doctrine\Common\NotifyPropertyChanged,
     Doctrine\Common\PropertyChangedListener;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 class DDC1690Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     protected function setUp() {
@@ -157,4 +156,4 @@ class DDC1690Child extends NotifyBaseEntity {
     function getParent() {
         return $this->parent;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1719Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1719Test.php
index 93130f56b..ee23f9dea 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1719Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1719Test.php
@@ -4,8 +4,6 @@ namespace Doctrine\Tests\ORM\Functional\Ticket;
 
 use Doctrine\Tests\Models\Quote\SimpleEntity;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 /**
  * @group DDC-1719
  */
@@ -91,4 +89,4 @@ class DDC1719Test extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->assertNull($e2);
     }
 
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1757Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1757Test.php
index 488f469b1..b02f401b7 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1757Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1757Test.php
@@ -4,8 +4,6 @@ namespace Doctrine\Tests\ORM\Functional\Ticket;
 
 use Doctrine\ORM\UnitOfWork;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 class DDC1757Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     public function testFailingCase()
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1787Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1787Test.php
index 9e3037bed..39fe48367 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1787Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1787Test.php
@@ -2,8 +2,6 @@
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 /**
  * @group DDC-1787
  */
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1843Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1843Test.php
index 1aa623fbb..bf52e570b 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1843Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1843Test.php
@@ -4,8 +4,6 @@ namespace Doctrine\Tests\ORM\Functional\Ticket;
 
 use Doctrine\Tests\Models\Quote\Group;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 /**
  * @group DDC-1845
  * @group DDC-1843
@@ -133,4 +131,4 @@ class DDC1843Test extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->assertNull($e4);
     }
 
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1884Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1884Test.php
index de02e3067..b3199fcc7 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1884Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1884Test.php
@@ -6,8 +6,6 @@ use Doctrine\Tests\Models\Taxi\Car,
     Doctrine\Tests\Models\Taxi\Ride,
     Doctrine\Tests\Models\Taxi\PaidRide;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 /**
  * @group DDC-1884
  * @author Sander Coolen <sander@jibber.nl>
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1925Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1925Test.php
index 869da8322..12e9b57e2 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1925Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1925Test.php
@@ -4,8 +4,6 @@ namespace Doctrine\Tests\ORM\Functional\Ticket;
 
 use Doctrine\Common\Collections\ArrayCollection;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 /**
  * @group DDC-1925
  * @group DDC-1210
@@ -179,4 +177,4 @@ class DDC1925User
     {
         return $this->title;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC192Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC192Test.php
index 18eb76943..bbe489b33 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC192Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC192Test.php
@@ -2,8 +2,6 @@
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 class DDC192Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     public function testSchemaCreation()
@@ -62,4 +60,4 @@ class DDC192Phonenumber
     }
 
     public function getUser() { return $this->User; }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC199Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC199Test.php
index 9084ec0a6..eef2b66d0 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC199Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC199Test.php
@@ -2,8 +2,6 @@
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 class DDC199Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     protected function setUp()
@@ -97,4 +95,4 @@ class DDC199RelatedClass
      * @JoinColumn(name="parent_id", referencedColumnName="id")
      */
     public $parent;
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2012Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2012Test.php
index ac93906da..549cf23cb 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2012Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2012Test.php
@@ -2,8 +2,6 @@
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 use Doctrine\DBAL\Types\Type;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 
@@ -175,4 +173,4 @@ class DDC2012TsVectorType extends Type
     {
         return self::MYTYPE;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC211Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC211Test.php
index 6104c9cae..34f2a05b5 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC211Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC211Test.php
@@ -2,8 +2,6 @@
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 class DDC211Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     protected function setUp()
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2182Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2182Test.php
index e450b60a8..72cd2066f 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2182Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2182Test.php
@@ -4,8 +4,6 @@ namespace Doctrine\Tests\ORM\Functional\Ticket;
 
 use Doctrine\ORM\UnitOfWork;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 class DDC2182Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     public function testPassColumnOptionsToJoinColumns()
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2231Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2231Test.php
index b222e0218..d6ff17c55 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2231Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2231Test.php
@@ -3,13 +3,9 @@
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
 use Doctrine\Common\Persistence\Mapping\ClassMetadata;
-
 use Doctrine\Common\Persistence\ObjectManager;
-
 use Doctrine\Common\Persistence\ObjectManagerAware;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 /**
  * @group DDC-2231
  */
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC237Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC237Test.php
index 413e56413..3ff5cd9b4 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC237Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC237Test.php
@@ -2,8 +2,6 @@
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 class DDC237Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     protected function setUp()
@@ -109,4 +107,4 @@ class DDC237EntityZ
      * @JoinColumn(name="y_id", referencedColumnName="id")
      */
     public $y;
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2415Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2415Test.php
index a440007a0..0283e6457 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2415Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2415Test.php
@@ -2,8 +2,6 @@
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Id\AbstractIdGenerator;
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
@@ -103,4 +101,4 @@ class DDC2415Generator extends AbstractIdGenerator
     {
         return md5($entity->getName());
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2645Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2645Test.php
index 0c2ea6d0a..d6a77f7db 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2645Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2645Test.php
@@ -2,8 +2,6 @@
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 /**
  * @group DDC-2645
  */
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC279Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC279Test.php
index 6d41ea8d8..2f1be3d32 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC279Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC279Test.php
@@ -2,8 +2,6 @@
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 class DDC279Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     protected function setUp()
@@ -130,4 +128,4 @@ class DDC279EntityZ
      * @column(type="string")
      */
     public $data;
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2931Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2931Test.php
index ed96e829e..c91be7714 100755
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2931Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2931Test.php
@@ -4,8 +4,6 @@ namespace Doctrine\Tests\ORM\Functional\Ticket;
 
 use Doctrine\ORM\Query;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 /**
  * @group DDC-2931
  */
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC309Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC309Test.php
index 325ce8d75..af1fcdc87 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC309Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC309Test.php
@@ -1,8 +1,6 @@
 <?php
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 class DDC309Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     protected function setUp()
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC331Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC331Test.php
index 8e5354f33..88da3268f 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC331Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC331Test.php
@@ -2,8 +2,6 @@
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 use Doctrine\Tests\Models\Company\CompanyPerson,
     Doctrine\Tests\Models\Company\CompanyEmployee,
     Doctrine\Tests\Models\Company\CompanyManager,
@@ -36,4 +34,4 @@ class DDC331Test extends \Doctrine\Tests\OrmFunctionalTestCase
             strtolower($q->getSql())
         );
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC345Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC345Test.php
index 757b5ab0b..255790d7c 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC345Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC345Test.php
@@ -2,8 +2,6 @@
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 class DDC345Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     protected function setUp()
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC353Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC353Test.php
index df783593a..03d28bb2e 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC353Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC353Test.php
@@ -1,9 +1,8 @@
 <?php
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
-use Doctrine\ORM\UnitOfWork;
 
-require_once __DIR__ . '/../../../TestInit.php';
+use Doctrine\ORM\UnitOfWork;
 
 class DDC353Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC371Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC371Test.php
index 2a99519cb..37e94c542 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC371Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC371Test.php
@@ -3,8 +3,6 @@ namespace Doctrine\Tests\ORM\Functional\Ticket;
 
 use Doctrine\ORM\Query;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 /**
  * @group DDC-371
  */
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC381Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC381Test.php
index 9b47bc842..941685a0d 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC381Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC381Test.php
@@ -1,9 +1,8 @@
 <?php
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
-use Doctrine\ORM\UnitOfWork;
 
-require_once __DIR__ . '/../../../TestInit.php';
+use Doctrine\ORM\UnitOfWork;
 
 class DDC381Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
@@ -60,4 +59,4 @@ class DDC381Entity
     {
 
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC422Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC422Test.php
index 3a6dbdb4c..07f374b36 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC422Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC422Test.php
@@ -1,7 +1,6 @@
 <?php
-namespace Doctrine\Tests\ORM\Functional\Ticket;
 
-require_once __DIR__ . '/../../../TestInit.php';
+namespace Doctrine\Tests\ORM\Functional\Ticket;
 
 class DDC422Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC425Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC425Test.php
index 084da5623..d3d3e27ba 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC425Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC425Test.php
@@ -1,8 +1,6 @@
 <?php
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 use DateTime, Doctrine\DBAL\Types\Type;
 
 class DDC425Test extends \Doctrine\Tests\OrmFunctionalTestCase
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC440Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC440Test.php
index 2b374a85d..d7ff7ad3b 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC440Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC440Test.php
@@ -2,8 +2,6 @@
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 class DDC440Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
 
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC444Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC444Test.php
index d89e67a2f..437ade7f0 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC444Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC444Test.php
@@ -2,8 +2,6 @@
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 class DDC444Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     public function setUp()
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC448Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC448Test.php
index 4ca13260d..814fbb958 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC448Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC448Test.php
@@ -1,8 +1,6 @@
 <?php
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 class DDC448Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     protected function setUp()
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC493Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC493Test.php
index 253ae61df..efdf5def7 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC493Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC493Test.php
@@ -1,7 +1,6 @@
 <?php
-namespace Doctrine\Tests\ORM\Functional\Ticket;
 
-require_once __DIR__ . '/../../../TestInit.php';
+namespace Doctrine\Tests\ORM\Functional\Ticket;
 
 class DDC493Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC501Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC501Test.php
index 215a537f7..7ec3dad13 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC501Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC501Test.php
@@ -8,8 +8,6 @@ use Doctrine\Tests\Models\CMS\CmsPhonenumber;
 use Doctrine\Tests\Models\CMS\CmsAddress;
 use Doctrine\ORM\UnitOfWork;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 /**
  * ----------------- !! NOTE !! --------------------
  * To reproduce the manyToMany-Bug it's necessary
@@ -121,4 +119,4 @@ class DDC501Test extends OrmFunctionalTestCase
                 ->getSingleResult();
     }
 
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC512Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC512Test.php
index 97245efa7..090477801 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC512Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC512Test.php
@@ -1,8 +1,6 @@
 <?php
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 class DDC512Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     protected function setUp()
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC513Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC513Test.php
index d16af4c1d..fdd1947e5 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC513Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC513Test.php
@@ -1,7 +1,6 @@
 <?php
-namespace Doctrine\Tests\ORM\Functional\Ticket;
 
-require_once __DIR__ . '/../../../TestInit.php';
+namespace Doctrine\Tests\ORM\Functional\Ticket;
 
 class DDC513Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC518Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC518Test.php
index 2a3450666..073bb3351 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC518Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC518Test.php
@@ -1,7 +1,6 @@
 <?php
-namespace Doctrine\Tests\ORM\Functional\Ticket;
 
-require_once __DIR__ . '/../../../TestInit.php';
+namespace Doctrine\Tests\ORM\Functional\Ticket;
 
 class DDC518Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
@@ -33,4 +32,4 @@ class DDC518Test extends \Doctrine\Tests\OrmFunctionalTestCase
 
         $this->assertSame($article->user, $managedArticle->user);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC522Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC522Test.php
index f029e95e9..04a39318a 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC522Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC522Test.php
@@ -4,8 +4,6 @@ namespace Doctrine\Tests\ORM\Functional\Ticket;
 
 use Doctrine\Tests\Models\Company\CompanyPerson;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 /**
  * Tests that join columns (foreign keys) can be named the same as the association
  * fields they're used on without causing issues.
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC531Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC531Test.php
index 5e22c2cbe..50f96968d 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC531Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC531Test.php
@@ -2,8 +2,6 @@
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 class DDC531Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     protected function setUp()
@@ -85,4 +83,4 @@ class DDC531Item
  */
 class DDC531SubItem extends DDC531Item
 {
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC588Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC588Test.php
index 3f899d786..b5ace06b0 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC588Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC588Test.php
@@ -1,7 +1,6 @@
 <?php
-namespace Doctrine\Tests\ORM\Functional\Ticket;
 
-require_once __DIR__ . '/../../../TestInit.php';
+namespace Doctrine\Tests\ORM\Functional\Ticket;
 
 class DDC588Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC599Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC599Test.php
index 681e03639..ed91bd59d 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC599Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC599Test.php
@@ -1,7 +1,6 @@
 <?php
-namespace Doctrine\Tests\ORM\Functional\Ticket;
 
-require_once __DIR__ . '/../../../TestInit.php';
+namespace Doctrine\Tests\ORM\Functional\Ticket;
 
 class DDC599Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
@@ -129,4 +128,4 @@ class DDC599Child
      * @JoinColumn(name="parentId", referencedColumnName="id")
      */
     public $parent;
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC618Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC618Test.php
index 91faaefc6..9cbe951c5 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC618Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC618Test.php
@@ -4,8 +4,6 @@ namespace Doctrine\Tests\ORM\Functional\Ticket;
 
 use DateTime;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 /**
  * @group DDC-618
  */
@@ -182,4 +180,4 @@ class DDC618Book
         $this->title = $title;
         $this->author = $author;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC633Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC633Test.php
index 2ec438325..d3cb049b5 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC633Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC633Test.php
@@ -4,8 +4,6 @@ namespace Doctrine\Tests\ORM\Functional\Ticket;
 
 use DateTime;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 class DDC633Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     protected function setUp()
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC656Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC656Test.php
index f2bbc2aa9..e7bb65a3f 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC656Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC656Test.php
@@ -4,8 +4,6 @@ namespace Doctrine\Tests\ORM\Functional\Ticket;
 
 use DateTime;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 class DDC656Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     protected function setUp()
@@ -79,4 +77,4 @@ class DDC656Entity
     public function setType($type) {
         $this->type = $type;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC657Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC657Test.php
index 2d4279ba3..f2fe56f7b 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC657Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC657Test.php
@@ -2,8 +2,6 @@
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 use Doctrine\Tests\Models\Generic\DateTimeModel;
 
 /**
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC698Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC698Test.php
index facb4097d..f4713c8ab 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC698Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC698Test.php
@@ -4,8 +4,6 @@ namespace Doctrine\Tests\ORM\Functional\Ticket;
 
 use DateTime;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 class DDC698Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     protected function setUp()
@@ -104,4 +102,4 @@ class DDC698Privilege
      * @ManyToMany(targetEntity="DDC698Role", mappedBy="privilege")
      */
 	protected $roles;
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC719Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC719Test.php
index 67bb9524c..428fe057a 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC719Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC719Test.php
@@ -2,8 +2,6 @@
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 class DDC719Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     protected function setUp()
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC729Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC729Test.php
index 376249745..0dc89a3b3 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC729Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC729Test.php
@@ -2,8 +2,6 @@
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 class DDC729Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     public function setUp()
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC735Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC735Test.php
index 77ef6e148..41f7b293b 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC735Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC735Test.php
@@ -4,8 +4,6 @@ namespace Doctrine\Tests\ORM\Functional\Ticket;
 
 use Doctrine\Common\Collections\ArrayCollection;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 class DDC735Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     protected function setUp()
@@ -119,4 +117,4 @@ class DDC735Review
     {
         return $this->id;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC736Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC736Test.php
index 2dfeeec6d..a93c91c7e 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC736Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC736Test.php
@@ -7,8 +7,6 @@ use Doctrine\Tests\Models\ECommerce\ECommerceCustomer;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\Query\AST;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 class DDC736Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     protected function setUp()
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC742Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC742Test.php
index 334c2c623..6c3b8f1fa 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC742Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC742Test.php
@@ -4,8 +4,6 @@ namespace Doctrine\Tests\ORM\Functional\Ticket;
 
 use Doctrine\Common\Collections\ArrayCollection;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 /**
  * @group non-cacheable
  */
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC748Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC748Test.php
index 9954a697b..84a35a7e7 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC748Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC748Test.php
@@ -7,8 +7,6 @@ use Doctrine\Tests\Models\CMS\CmsUser;
 use Doctrine\Tests\Models\CMS\CmsArticle;
 use Doctrine\Tests\Models\CMS\CmsAddress;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 class DDC748Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     protected function setUp()
@@ -61,4 +59,4 @@ class DDC748Test extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->assertSame($user, $address->user);
         $this->assertSame($user->address, $address);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC758Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC758Test.php
index 4873b022a..716ec6f5e 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC758Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC758Test.php
@@ -7,8 +7,6 @@ use Doctrine\Tests\Models\CMS\CmsUser;
 use Doctrine\Tests\Models\CMS\CmsPhonenumber;
 use Doctrine\Tests\Models\CMS\CmsGroup;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 class DDC758Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
 
@@ -182,4 +180,4 @@ class DDC758Test extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->assertEquals(0, sizeof($cmsGroups[0]->users));
         $this->assertEquals(0, sizeof($cmsGroups[1]->users));
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC767Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC767Test.php
index 7ba337ecd..eb3b052b0 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC767Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC767Test.php
@@ -6,8 +6,6 @@ use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Tests\Models\CMS\CmsUser;
 use Doctrine\Tests\Models\CMS\CmsGroup;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 class DDC767Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     protected function setUp()
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC809Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC809Test.php
index c586afac6..7527bba98 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC809Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC809Test.php
@@ -6,8 +6,6 @@ use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Tests\Models\CMS\CmsUser;
 use Doctrine\Tests\Models\CMS\CmsGroup;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 class DDC809Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     public function setUp()
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC812Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC812Test.php
index 4a80358d4..5b37a4792 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC812Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC812Test.php
@@ -5,8 +5,6 @@ namespace Doctrine\Tests\ORM\Functional\Ticket;
 use Doctrine\Tests\Models\CMS\CmsArticle;
 use Doctrine\Tests\Models\CMS\CmsComment;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 class DDC812Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     protected function setUp()
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC832Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC832Test.php
index 599218b07..8bc7c69f0 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC832Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC832Test.php
@@ -6,8 +6,6 @@ use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Tests\Models\CMS\CmsUser;
 use Doctrine\Tests\Models\CMS\CmsGroup;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 class DDC832Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     public function setUp()
@@ -191,4 +189,4 @@ class DDC832JoinedTreeIndex extends DDC832JoinedIndex
         $this->lft = $lft;
         $this->rgt = $rgt;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC837Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC837Test.php
index d44c3af7d..ef4484ee7 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC837Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC837Test.php
@@ -1,7 +1,6 @@
 <?php
-namespace Doctrine\Tests\ORM\Functional\Ticket;
 
-require_once __DIR__ . '/../../../TestInit.php';
+namespace Doctrine\Tests\ORM\Functional\Ticket;
 
 class DDC837Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
@@ -195,4 +194,4 @@ class DDC837Aggregate
     {
         return $this->sysname;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC849Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC849Test.php
index b17e60566..78cfd2958 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC849Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC849Test.php
@@ -6,8 +6,6 @@ use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Tests\Models\CMS\CmsUser;
 use Doctrine\Tests\Models\CMS\CmsGroup;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 class DDC849Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     private $user;
@@ -81,4 +79,4 @@ class DDC849Test extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->assertFalse($this->user->groups->contains($group1));
         $this->assertFalse($this->user->groups->contains($group2));
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC881Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC881Test.php
index 4ef3c08fa..22e39f849 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC881Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC881Test.php
@@ -2,8 +2,6 @@
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 class DDC881Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
 
@@ -212,4 +210,4 @@ class DDC881PhoneCall
     {
         return $this->phonenumber;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC933Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC933Test.php
index fb8035dbc..ca03cc179 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC933Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC933Test.php
@@ -6,8 +6,6 @@ use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Tests\Models\CMS\CmsUser;
 use Doctrine\Tests\Models\CMS\CmsGroup;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 class DDC933Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     public function setUp()
@@ -36,4 +34,4 @@ class DDC933Test extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->_em->lock($manager, \Doctrine\DBAL\LockMode::PESSIMISTIC_READ);
         $this->_em->rollback();
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC949Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC949Test.php
index a3734b75a..fa8be3848 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC949Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC949Test.php
@@ -5,8 +5,6 @@ namespace Doctrine\Tests\ORM\Functional\Ticket;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Tests\Models\Generic\BooleanModel;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 class DDC949Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     public function setUp()
@@ -40,4 +38,4 @@ class DDC949Test extends \Doctrine\Tests\OrmFunctionalTestCase
         $this->assertInstanceOf('Doctrine\Tests\Models\Generic\BooleanModel', $false, "False model not found");
         $this->assertFalse($false->booleanField, "False Boolean Model should be false.");
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC960Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC960Test.php
index 99a29a57a..ce39b9e01 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC960Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC960Test.php
@@ -4,8 +4,6 @@ namespace Doctrine\Tests\ORM\Functional\Ticket;
 
 use Doctrine\Common\Collections\ArrayCollection;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 class DDC960Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     protected function setUp()
@@ -89,4 +87,4 @@ class DDC960Child extends DDC960Root
     {
         $this->name = $name;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC992Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC992Test.php
index 001e3801f..25363b0b3 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC992Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC992Test.php
@@ -4,8 +4,6 @@ namespace Doctrine\Tests\ORM\Functional\Ticket;
 
 use Doctrine\Common\Collections\ArrayCollection;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 /**
  * @group DDC-992
  */
@@ -144,4 +142,4 @@ class DDC992Role
         $this->extends = new ArrayCollection;
         $this->extendedBy = new ArrayCollection;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket2481Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket2481Test.php
index e18310244..91521b5d5 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket2481Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket2481Test.php
@@ -2,8 +2,6 @@
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 class Ticket2481Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     protected function setUp()
@@ -41,4 +39,4 @@ class Ticket2481Product
    * @GeneratedValue(strategy="AUTO")
    */
   public $id;
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket69.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket69.php
index 1ca35115d..d9ac1cc6a 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket69.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket69.php
@@ -4,8 +4,6 @@ namespace Doctrine\Tests\ORM\Functional\Ticket;
 
 use Doctrine\ORM\Query;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 /**
  * Functional tests for the Single Table Inheritance mapping strategy.
  *
diff --git a/tests/Doctrine/Tests/ORM/Functional/TypeTest.php b/tests/Doctrine/Tests/ORM/Functional/TypeTest.php
index 9ed8cf050..47064d5e2 100644
--- a/tests/Doctrine/Tests/ORM/Functional/TypeTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/TypeTest.php
@@ -10,8 +10,6 @@ use Doctrine\Tests\Models\Generic\SerializationModel;
 use Doctrine\ORM\Mapping\AssociationMapping;
 use Doctrine\DBAL\Types\Type as DBALType;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 class TypeTest extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     protected function setUp()
diff --git a/tests/Doctrine/Tests/ORM/Functional/TypeValueSqlTest.php b/tests/Doctrine/Tests/ORM/Functional/TypeValueSqlTest.php
index 537f238ca..aae0fbc71 100644
--- a/tests/Doctrine/Tests/ORM/Functional/TypeValueSqlTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/TypeValueSqlTest.php
@@ -7,8 +7,6 @@ use Doctrine\Tests\Models\CustomType\CustomTypeParent;
 use Doctrine\Tests\Models\CustomType\CustomTypeUpperCase;
 use Doctrine\DBAL\Types\Type as DBALType;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 class TypeValueSqlTest extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     protected function setUp()
diff --git a/tests/Doctrine/Tests/ORM/Hydration/ArrayHydratorTest.php b/tests/Doctrine/Tests/ORM/Hydration/ArrayHydratorTest.php
index 96b622be2..3fa34975d 100644
--- a/tests/Doctrine/Tests/ORM/Hydration/ArrayHydratorTest.php
+++ b/tests/Doctrine/Tests/ORM/Hydration/ArrayHydratorTest.php
@@ -5,8 +5,6 @@ namespace Doctrine\Tests\ORM\Hydration;
 use Doctrine\Tests\Mocks\HydratorMockStatement;
 use Doctrine\ORM\Query\ResultSetMapping;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 class ArrayHydratorTest extends HydrationTestCase
 {
     public function provideDataForUserEntityResult()
@@ -1144,4 +1142,4 @@ class ArrayHydratorTest extends HydrationTestCase
         $this->assertTrue(isset($result[2]));
         $this->assertEquals(2, $result[2][$userEntityKey]['id']);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Hydration/CustomHydratorTest.php b/tests/Doctrine/Tests/ORM/Hydration/CustomHydratorTest.php
index 09be6bcd3..1135e988d 100644
--- a/tests/Doctrine/Tests/ORM/Hydration/CustomHydratorTest.php
+++ b/tests/Doctrine/Tests/ORM/Hydration/CustomHydratorTest.php
@@ -4,8 +4,6 @@ namespace Doctrine\Tests\ORM\Hydration;
 
 use PDO, Doctrine\ORM\Internal\Hydration\AbstractHydrator;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 class CustomHydratorTest extends HydrationTestCase
 {
     public function testCustomHydrator()
@@ -26,4 +24,4 @@ class CustomHydrator extends AbstractHydrator
     {
         return $this->_stmt->fetchAll(PDO::FETCH_ASSOC);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Hydration/HydrationTestCase.php b/tests/Doctrine/Tests/ORM/Hydration/HydrationTestCase.php
index 660240391..d9c95c76a 100644
--- a/tests/Doctrine/Tests/ORM/Hydration/HydrationTestCase.php
+++ b/tests/Doctrine/Tests/ORM/Hydration/HydrationTestCase.php
@@ -2,8 +2,6 @@
 
 namespace Doctrine\Tests\ORM\Hydration;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 use Doctrine\ORM\Query\ParserResult;
 use Doctrine\ORM\Query\Parser;
 
@@ -27,4 +25,4 @@ class HydrationTestCase extends \Doctrine\Tests\OrmTestCase
         $parserResult->setMixedQuery($isMixedQuery);
         return $parserResult;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Hydration/ObjectHydratorTest.php b/tests/Doctrine/Tests/ORM/Hydration/ObjectHydratorTest.php
index 33636b4ec..91fffcb6d 100644
--- a/tests/Doctrine/Tests/ORM/Hydration/ObjectHydratorTest.php
+++ b/tests/Doctrine/Tests/ORM/Hydration/ObjectHydratorTest.php
@@ -11,8 +11,6 @@ use Doctrine\ORM\Query;
 
 use Doctrine\Tests\Models\CMS\CmsUser;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 class ObjectHydratorTest extends HydrationTestCase
 {
     public function provideDataForUserEntityResult()
diff --git a/tests/Doctrine/Tests/ORM/Hydration/ResultSetMappingTest.php b/tests/Doctrine/Tests/ORM/Hydration/ResultSetMappingTest.php
index 700e3fe05..079381d4f 100644
--- a/tests/Doctrine/Tests/ORM/Hydration/ResultSetMappingTest.php
+++ b/tests/Doctrine/Tests/ORM/Hydration/ResultSetMappingTest.php
@@ -5,8 +5,6 @@ namespace Doctrine\Tests\ORM\Hydration;
 use Doctrine\ORM\Query\ResultSetMapping;
 use Doctrine\ORM\Mapping\ClassMetadata;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * Description of ResultSetMappingTest
  *
diff --git a/tests/Doctrine/Tests/ORM/Hydration/ScalarHydratorTest.php b/tests/Doctrine/Tests/ORM/Hydration/ScalarHydratorTest.php
index c8c376f7c..83e3c3c19 100644
--- a/tests/Doctrine/Tests/ORM/Hydration/ScalarHydratorTest.php
+++ b/tests/Doctrine/Tests/ORM/Hydration/ScalarHydratorTest.php
@@ -5,8 +5,6 @@ namespace Doctrine\Tests\ORM\Hydration;
 use Doctrine\Tests\Mocks\HydratorMockStatement;
 use Doctrine\ORM\Query\ResultSetMapping;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 class ScalarHydratorTest extends HydrationTestCase
 {
     /**
@@ -98,4 +96,4 @@ class ScalarHydratorTest extends HydrationTestCase
 
         $result = $hydrator->hydrateAll($stmt, $rsm);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Hydration/SimpleObjectHydratorTest.php b/tests/Doctrine/Tests/ORM/Hydration/SimpleObjectHydratorTest.php
index 400b5829f..bd8a8d00d 100644
--- a/tests/Doctrine/Tests/ORM/Hydration/SimpleObjectHydratorTest.php
+++ b/tests/Doctrine/Tests/ORM/Hydration/SimpleObjectHydratorTest.php
@@ -5,8 +5,6 @@ namespace Doctrine\Tests\ORM\Hydration;
 use Doctrine\Tests\Mocks\HydratorMockStatement;
 use Doctrine\ORM\Query\ResultSetMapping;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 class SimpleObjectHydratorTest extends HydrationTestCase
 {
     /**
diff --git a/tests/Doctrine/Tests/ORM/Hydration/SingleScalarHydratorTest.php b/tests/Doctrine/Tests/ORM/Hydration/SingleScalarHydratorTest.php
index f6abe2471..219c7384c 100644
--- a/tests/Doctrine/Tests/ORM/Hydration/SingleScalarHydratorTest.php
+++ b/tests/Doctrine/Tests/ORM/Hydration/SingleScalarHydratorTest.php
@@ -5,8 +5,6 @@ namespace Doctrine\Tests\ORM\Hydration;
 use Doctrine\Tests\Mocks\HydratorMockStatement;
 use Doctrine\ORM\Query\ResultSetMapping;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 class SingleScalarHydratorTest extends HydrationTestCase
 {
     /** Result set provider for the HYDRATE_SINGLE_SCALAR tests */
@@ -75,4 +73,4 @@ class SingleScalarHydratorTest extends HydrationTestCase
             } catch (\Doctrine\ORM\NonUniqueResultException $e) {}
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Id/AssignedGeneratorTest.php b/tests/Doctrine/Tests/ORM/Id/AssignedGeneratorTest.php
index 3a009e5ea..cd7331054 100644
--- a/tests/Doctrine/Tests/ORM/Id/AssignedGeneratorTest.php
+++ b/tests/Doctrine/Tests/ORM/Id/AssignedGeneratorTest.php
@@ -4,8 +4,6 @@ namespace Doctrine\Tests\ORM\Id;
 
 use Doctrine\ORM\Id\AssignedGenerator;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * AssignedGeneratorTest
  *
diff --git a/tests/Doctrine/Tests/ORM/Id/SequenceGeneratorTest.php b/tests/Doctrine/Tests/ORM/Id/SequenceGeneratorTest.php
index 6e50d5ad0..413384971 100644
--- a/tests/Doctrine/Tests/ORM/Id/SequenceGeneratorTest.php
+++ b/tests/Doctrine/Tests/ORM/Id/SequenceGeneratorTest.php
@@ -4,8 +4,6 @@ namespace Doctrine\Tests\ORM\Id;
 
 use Doctrine\ORM\Id\SequenceGenerator;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * Description of SequenceGeneratorTest
  *
diff --git a/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php
index 3464b2cf2..49e387e5d 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php
@@ -10,8 +10,6 @@ use Doctrine\Tests\Models\Cache\City;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 abstract class AbstractMappingDriverTest extends \Doctrine\Tests\OrmTestCase
 {
     abstract protected function _loadDriver();
diff --git a/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php
index df4c8cc27..61a15056a 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php
@@ -5,8 +5,6 @@ namespace Doctrine\Tests\ORM\Mapping;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Events;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 class AnnotationDriverTest extends AbstractMappingDriverTest
 {
     /**
@@ -354,4 +352,4 @@ class InvalidFetchOption
      * @OneToMany(targetEntity="Doctrine\Tests\Models\CMS\CmsUser", fetch="eager")
      */
     private $collection;
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php b/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php
index c1e5a12f9..2eee28b85 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php
@@ -5,8 +5,6 @@ namespace Doctrine\Tests\ORM\Mapping;
 use Doctrine\ORM\Mapping\ClassMetadataFactory;
 use Doctrine\ORM\Tools\SchemaTool;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 class BasicInheritanceMappingTest extends \Doctrine\Tests\OrmTestCase
 {
     private $_factory;
diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php
index 7f07af2ad..4b9008f1e 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php
@@ -10,8 +10,6 @@ use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\Common\EventManager;
 use Doctrine\ORM\Mapping\ClassMetadataFactory;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 class ClassMetadataFactoryTest extends \Doctrine\Tests\OrmTestCase
 {
     public function testGetMetadataForSingleClass()
diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataLoadEventTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataLoadEventTest.php
index 70aae70d4..2d949aeef 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataLoadEventTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataLoadEventTest.php
@@ -5,8 +5,6 @@ namespace Doctrine\Tests\ORM\Mapping;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Events;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 class ClassMetadataLoadEventTest extends \Doctrine\Tests\OrmTestCase
 {
     /**
diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
index aa284db89..2c35dc192 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
@@ -5,7 +5,6 @@ namespace Doctrine\Tests\ORM\Mapping;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Events;
 
-require_once __DIR__ . '/../../TestInit.php';
 require_once __DIR__ . '/../../Models/Global/GlobalNamespaceModel.php';
 
 class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
diff --git a/tests/Doctrine/Tests/ORM/Mapping/NamingStrategyTest.php b/tests/Doctrine/Tests/ORM/Mapping/NamingStrategyTest.php
index 0c56aa810..61decf2e7 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/NamingStrategyTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/NamingStrategyTest.php
@@ -6,8 +6,6 @@ use Doctrine\ORM\Mapping\UnderscoreNamingStrategy;
 use Doctrine\ORM\Mapping\DefaultNamingStrategy;
 use Doctrine\ORM\Mapping\NamingStrategy;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * @group DDC-559
  */
@@ -295,4 +293,4 @@ class NamingStrategyTest extends \Doctrine\Tests\OrmTestCase
     {
         $this->assertEquals($expected, $strategy->joinKeyColumnName($propertyEntityName, $referencedColumnName, $propertyName));
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Mapping/PHPMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/PHPMappingDriverTest.php
index c9da3dc7a..5d06983ca 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/PHPMappingDriverTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/PHPMappingDriverTest.php
@@ -6,8 +6,6 @@ use Doctrine\ORM\Mapping\ClassMetadata,
     Doctrine\Common\Persistence\Mapping\Driver\PHPDriver,
     Doctrine\ORM\Tools\Export\ClassMetadataExporter;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 class PHPMappingDriverTest extends AbstractMappingDriverTest
 {
     protected function _loadDriver()
@@ -35,4 +33,4 @@ class PHPMappingDriverTest extends AbstractMappingDriverTest
     {
         $this->createClassMetadata('Doctrine\Tests\Models\DDC889\DDC889Class');
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Mapping/QuoteStrategyTest.php b/tests/Doctrine/Tests/ORM/Mapping/QuoteStrategyTest.php
index 2e64e0a8d..0cb60fde4 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/QuoteStrategyTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/QuoteStrategyTest.php
@@ -6,8 +6,6 @@ use Doctrine\ORM\Mapping\DefaultQuoteStrategy;
 use Doctrine\ORM\Mapping\QuoteStrategy;
 use Doctrine\ORM\Mapping\ClassMetadata;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * @group DDC-1845
  */
@@ -194,4 +192,4 @@ class QuoteStrategyTest extends \Doctrine\Tests\OrmTestCase
 class MyQuoteStrategy extends \Doctrine\ORM\Mapping\DefaultQuoteStrategy
 {
 
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Mapping/StaticPHPMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/StaticPHPMappingDriverTest.php
index 77eafe127..e82be422c 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/StaticPHPMappingDriverTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/StaticPHPMappingDriverTest.php
@@ -6,8 +6,6 @@ use Doctrine\ORM\Mapping\ClassMetadata,
     Doctrine\Common\Persistence\Mapping\Driver\StaticPHPDriver,
     Doctrine\ORM\Tools\Export\ClassMetadataExporter;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 class StaticPHPMappingDriverTest extends AbstractMappingDriverTest
 {
     protected function _loadDriver()
@@ -25,4 +23,4 @@ class StaticPHPMappingDriverTest extends AbstractMappingDriverTest
     {
         $this->createClassMetadata('Doctrine\Tests\Models\DDC889\DDC889Class');
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php
index 6d3ed77d1..09adb0617 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php
@@ -7,8 +7,6 @@ use Doctrine\ORM\Mapping\ClassMetadata,
     Doctrine\ORM\Mapping\Driver\XmlDriver,
     Doctrine\ORM\Mapping\Driver\YamlDriver;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 class XmlMappingDriverTest extends AbstractMappingDriverTest
 {
     protected function _loadDriver()
diff --git a/tests/Doctrine/Tests/ORM/Mapping/YamlMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/YamlMappingDriverTest.php
index 555184458..95d6c7f9a 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/YamlMappingDriverTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/YamlMappingDriverTest.php
@@ -6,8 +6,6 @@ use Doctrine\ORM\Mapping\ClassMetadata,
     Doctrine\ORM\Mapping\Driver\XmlDriver,
     Doctrine\ORM\Mapping\Driver\YamlDriver;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 class YamlMappingDriverTest extends AbstractMappingDriverTest
 {
     protected function _loadDriver()
@@ -85,4 +83,4 @@ class DDC2069Entity
     public $name;
 
     public $value;
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Performance/DDC2602Test.php b/tests/Doctrine/Tests/ORM/Performance/DDC2602Test.php
index e5537000a..5b307eba1 100644
--- a/tests/Doctrine/Tests/ORM/Performance/DDC2602Test.php
+++ b/tests/Doctrine/Tests/ORM/Performance/DDC2602Test.php
@@ -6,8 +6,6 @@ use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Event\LifecycleEventArgs;
 use Doctrine\ORM\Events;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * @group performance
  * @group DDC-2602
diff --git a/tests/Doctrine/Tests/ORM/Performance/HydrationPerformanceTest.php b/tests/Doctrine/Tests/ORM/Performance/HydrationPerformanceTest.php
index 1a5d8799e..ab6e3259c 100644
--- a/tests/Doctrine/Tests/ORM/Performance/HydrationPerformanceTest.php
+++ b/tests/Doctrine/Tests/ORM/Performance/HydrationPerformanceTest.php
@@ -2,8 +2,6 @@
 
 namespace Doctrine\Tests\ORM\Performance;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 use Doctrine\Tests\Mocks\HydratorMockStatement,
     Doctrine\ORM\Query\ResultSetMapping,
     Doctrine\ORM\Query;
diff --git a/tests/Doctrine/Tests/ORM/Performance/InheritancePersisterPerformanceTest.php b/tests/Doctrine/Tests/ORM/Performance/InheritancePersisterPerformanceTest.php
index 1c192648a..b18fe2850 100644
--- a/tests/Doctrine/Tests/ORM/Performance/InheritancePersisterPerformanceTest.php
+++ b/tests/Doctrine/Tests/ORM/Performance/InheritancePersisterPerformanceTest.php
@@ -5,8 +5,6 @@ namespace Doctrine\Tests\ORM\Performance;
 use Doctrine\ORM\Tools\SchemaTool;
 use Doctrine\ORM\Query;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
 * @group performance
  */
@@ -63,4 +61,4 @@ class InheritancePersisterPerformanceTest extends \Doctrine\Tests\OrmFunctionalT
         echo "99 CompanyContract: " . number_format(microtime(true) - $start, 6) . "\n";
         $this->assertEquals(99, count($contracts));
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Performance/InsertPerformanceTest.php b/tests/Doctrine/Tests/ORM/Performance/InsertPerformanceTest.php
index 1c378df6d..f387d1d23 100644
--- a/tests/Doctrine/Tests/ORM/Performance/InsertPerformanceTest.php
+++ b/tests/Doctrine/Tests/ORM/Performance/InsertPerformanceTest.php
@@ -2,8 +2,6 @@
 
 namespace Doctrine\Tests\ORM\Performance;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 use Doctrine\Tests\Models\CMS\CmsUser;
 
 /**
diff --git a/tests/Doctrine/Tests/ORM/Performance/PersisterPerformanceTest.php b/tests/Doctrine/Tests/ORM/Performance/PersisterPerformanceTest.php
index ec432689d..d3315b426 100644
--- a/tests/Doctrine/Tests/ORM/Performance/PersisterPerformanceTest.php
+++ b/tests/Doctrine/Tests/ORM/Performance/PersisterPerformanceTest.php
@@ -11,8 +11,6 @@ use Doctrine\Tests\Models\CMS\CmsGroup;
 use Doctrine\Tests\Models\CMS\CmsArticle;
 use Doctrine\Tests\Models\CMS\CmsComment;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * @group performance
  */
diff --git a/tests/Doctrine/Tests/ORM/Performance/UnitOfWorkPerformanceTest.php b/tests/Doctrine/Tests/ORM/Performance/UnitOfWorkPerformanceTest.php
index 932082813..f2aeda714 100644
--- a/tests/Doctrine/Tests/ORM/Performance/UnitOfWorkPerformanceTest.php
+++ b/tests/Doctrine/Tests/ORM/Performance/UnitOfWorkPerformanceTest.php
@@ -2,8 +2,6 @@
 
 namespace Doctrine\Tests\ORM\Performance;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 use Doctrine\Tests\Models\CMS\CmsUser;
 
 /**
@@ -48,4 +46,4 @@ class UnitOfWorkPerformanceTest extends \Doctrine\Tests\OrmPerformanceTestCase
 
         echo ' Compute ChangeSet '.$n.' objects in ' . ($e - $s) . ' seconds' . PHP_EOL;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterTypeValueSqlTest.php b/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterTypeValueSqlTest.php
index 15c83a379..653ec2d52 100644
--- a/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterTypeValueSqlTest.php
+++ b/tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterTypeValueSqlTest.php
@@ -9,8 +9,6 @@ use Doctrine\Tests\Models\CustomType\CustomTypeChild;
 use Doctrine\Tests\Models\CustomType\CustomTypeFriend;
 use Doctrine\Common\Collections\Expr\Comparison;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 class BasicEntityPersisterTypeValueSqlTest extends \Doctrine\Tests\OrmTestCase
 {
     protected $_persister;
diff --git a/tests/Doctrine/Tests/ORM/Query/DeleteSqlGenerationTest.php b/tests/Doctrine/Tests/ORM/Query/DeleteSqlGenerationTest.php
index 1b2cd245e..21679c894 100644
--- a/tests/Doctrine/Tests/ORM/Query/DeleteSqlGenerationTest.php
+++ b/tests/Doctrine/Tests/ORM/Query/DeleteSqlGenerationTest.php
@@ -21,8 +21,6 @@
 
 namespace Doctrine\Tests\ORM\Query;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * Test case for testing the saving and referencing of query identifiers.
  *
diff --git a/tests/Doctrine/Tests/ORM/Query/ExprTest.php b/tests/Doctrine/Tests/ORM/Query/ExprTest.php
index 7179bd1bb..91135128c 100644
--- a/tests/Doctrine/Tests/ORM/Query/ExprTest.php
+++ b/tests/Doctrine/Tests/ORM/Query/ExprTest.php
@@ -22,8 +22,6 @@ namespace Doctrine\Tests\ORM\Query;
 use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\Query;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * Test case for the DQL Expr class used for generating DQL snippets through
  * a programmatic interface
diff --git a/tests/Doctrine/Tests/ORM/Query/FilterCollectionTest.php b/tests/Doctrine/Tests/ORM/Query/FilterCollectionTest.php
index 42266bf50..455949de0 100644
--- a/tests/Doctrine/Tests/ORM/Query/FilterCollectionTest.php
+++ b/tests/Doctrine/Tests/ORM/Query/FilterCollectionTest.php
@@ -2,8 +2,6 @@
 
 namespace Doctrine\Tests\ORM\Query;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 use Doctrine\ORM\Mapping\ClassMetaData,
     Doctrine\ORM\Query\Filter\SQLFilter;
 
@@ -92,4 +90,4 @@ class MyFilter extends SQLFilter
         // getParameter applies quoting automatically
         return $targetTableAlias . '.id = ' . $this->getParameter('id');
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Query/LanguageRecognitionTest.php b/tests/Doctrine/Tests/ORM/Query/LanguageRecognitionTest.php
index 2d3d5fa93..d7fa0cbf8 100644
--- a/tests/Doctrine/Tests/ORM/Query/LanguageRecognitionTest.php
+++ b/tests/Doctrine/Tests/ORM/Query/LanguageRecognitionTest.php
@@ -4,8 +4,6 @@ namespace Doctrine\Tests\ORM\Query;
 use Doctrine\ORM\Query,
     Doctrine\ORM\Query\QueryException;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 class LanguageRecognitionTest extends \Doctrine\Tests\OrmTestCase
 {
     private $_em;
diff --git a/tests/Doctrine/Tests/ORM/Query/LexerTest.php b/tests/Doctrine/Tests/ORM/Query/LexerTest.php
index 1798cc1ed..7e0b4b8fb 100644
--- a/tests/Doctrine/Tests/ORM/Query/LexerTest.php
+++ b/tests/Doctrine/Tests/ORM/Query/LexerTest.php
@@ -4,8 +4,6 @@ namespace Doctrine\Tests\ORM\Query;
 
 use Doctrine\ORM\Query\Lexer;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 class LexerTest extends \Doctrine\Tests\OrmTestCase
 {
     //private $_lexer;
diff --git a/tests/Doctrine/Tests/ORM/Query/ParameterTypeInfererTest.php b/tests/Doctrine/Tests/ORM/Query/ParameterTypeInfererTest.php
index 95bd59c13..8b4635d99 100644
--- a/tests/Doctrine/Tests/ORM/Query/ParameterTypeInfererTest.php
+++ b/tests/Doctrine/Tests/ORM/Query/ParameterTypeInfererTest.php
@@ -23,8 +23,6 @@ use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Types\Type;
 use PDO;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 class ParameterTypeInfererTest extends \Doctrine\Tests\OrmTestCase
 {
 
diff --git a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php
index adcd0e6c0..205189f49 100644
--- a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php
+++ b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php
@@ -5,8 +5,6 @@ namespace Doctrine\Tests\ORM\Query;
 use Doctrine\DBAL\Types\Type as DBALType;
 use Doctrine\ORM\Query;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase
 {
     private $_em;
diff --git a/tests/Doctrine/Tests/ORM/Query/UpdateSqlGenerationTest.php b/tests/Doctrine/Tests/ORM/Query/UpdateSqlGenerationTest.php
index 83be0d70a..de71ba9b7 100644
--- a/tests/Doctrine/Tests/ORM/Query/UpdateSqlGenerationTest.php
+++ b/tests/Doctrine/Tests/ORM/Query/UpdateSqlGenerationTest.php
@@ -23,8 +23,6 @@ namespace Doctrine\Tests\ORM\Query;
 
 use Doctrine\DBAL\Types\Type as DBALType;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * Test case for testing the saving and referencing of query identifiers.
  *
diff --git a/tests/Doctrine/Tests/ORM/QueryBuilderTest.php b/tests/Doctrine/Tests/ORM/QueryBuilderTest.php
index 0c38e4f6b..fe545927d 100644
--- a/tests/Doctrine/Tests/ORM/QueryBuilderTest.php
+++ b/tests/Doctrine/Tests/ORM/QueryBuilderTest.php
@@ -28,8 +28,6 @@ use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\Query\Parameter;
 use Doctrine\ORM\Query\ParameterTypeInferer;
 
-require_once __DIR__ . '/../TestInit.php';
-
 /**
  * Test case for the QueryBuilder class used to build DQL query string in a
  * object oriented way.
diff --git a/tests/Doctrine/Tests/ORM/Tools/ConvertDoctrine1SchemaTest.php b/tests/Doctrine/Tests/ORM/Tools/ConvertDoctrine1SchemaTest.php
index c0af3a7f3..22f04c318 100644
--- a/tests/Doctrine/Tests/ORM/Tools/ConvertDoctrine1SchemaTest.php
+++ b/tests/Doctrine/Tests/ORM/Tools/ConvertDoctrine1SchemaTest.php
@@ -31,8 +31,6 @@ use Doctrine\Tests\Mocks\DriverMock;
 use Doctrine\Common\EventManager;
 use Doctrine\ORM\Tools\DisconnectedClassMetadataFactory;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 /**
  * Test case for converting a Doctrine 1 style schema to Doctrine 2 mapping files
  *
diff --git a/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php b/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php
index b030d75b5..fb6c0652f 100644
--- a/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php
+++ b/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php
@@ -10,8 +10,6 @@ use Doctrine\ORM\Mapping\ClassMetadataFactory;
 use Doctrine\Tests\Models\DDC2372\DDC2372User;
 use Doctrine\Tests\Models\DDC2372\DDC2372Admin;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 class EntityGeneratorTest extends \Doctrine\Tests\OrmTestCase
 {
 
diff --git a/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php b/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php
index 229b3d67a..3376b7443 100644
--- a/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php
+++ b/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php
@@ -33,8 +33,6 @@ use Doctrine\Common\EventManager;
 use Doctrine\ORM\Tools\DisconnectedClassMetadataFactory;
 use Doctrine\ORM\Mapping\ClassMetadataFactory;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 /**
  * Test case for ClassMetadataExporter
  *
diff --git a/tests/Doctrine/Tests/ORM/Tools/Export/AnnotationClassMetadataExporterTest.php b/tests/Doctrine/Tests/ORM/Tools/Export/AnnotationClassMetadataExporterTest.php
index c60281cf3..9fa20941c 100644
--- a/tests/Doctrine/Tests/ORM/Tools/Export/AnnotationClassMetadataExporterTest.php
+++ b/tests/Doctrine/Tests/ORM/Tools/Export/AnnotationClassMetadataExporterTest.php
@@ -21,8 +21,6 @@
 
 namespace Doctrine\Tests\ORM\Tools\Export;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 /**
  * Test case for AnnotationClassMetadataExporterTest
  *
@@ -39,4 +37,4 @@ class AnnotationClassMetadataExporterTest extends AbstractClassMetadataExporterT
     {
         return 'annotation';
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Tools/Export/PhpClassMetadataExporterTest.php b/tests/Doctrine/Tests/ORM/Tools/Export/PhpClassMetadataExporterTest.php
index a9d443a9d..2ad37588f 100644
--- a/tests/Doctrine/Tests/ORM/Tools/Export/PhpClassMetadataExporterTest.php
+++ b/tests/Doctrine/Tests/ORM/Tools/Export/PhpClassMetadataExporterTest.php
@@ -21,8 +21,6 @@
 
 namespace Doctrine\Tests\ORM\Tools\Export;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 /**
  * Test case for PhpClassMetadataExporterTest
  *
@@ -39,4 +37,4 @@ class PhpClassMetadataExporterTest extends AbstractClassMetadataExporterTest
     {
         return 'php';
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Tools/Export/XmlClassMetadataExporterTest.php b/tests/Doctrine/Tests/ORM/Tools/Export/XmlClassMetadataExporterTest.php
index 309aa9b70..e5392ddcc 100644
--- a/tests/Doctrine/Tests/ORM/Tools/Export/XmlClassMetadataExporterTest.php
+++ b/tests/Doctrine/Tests/ORM/Tools/Export/XmlClassMetadataExporterTest.php
@@ -21,8 +21,6 @@
 
 namespace Doctrine\Tests\ORM\Tools\Export;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 /**
  * Test case for XmlClassMetadataExporterTest
  *
@@ -39,4 +37,4 @@ class XmlClassMetadataExporterTest extends AbstractClassMetadataExporterTest
     {
         return 'xml';
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Doctrine/Tests/ORM/Tools/Export/YamlClassMetadataExporterTest.php b/tests/Doctrine/Tests/ORM/Tools/Export/YamlClassMetadataExporterTest.php
index 406101ac7..85c6e1c5e 100644
--- a/tests/Doctrine/Tests/ORM/Tools/Export/YamlClassMetadataExporterTest.php
+++ b/tests/Doctrine/Tests/ORM/Tools/Export/YamlClassMetadataExporterTest.php
@@ -21,8 +21,6 @@
 
 namespace Doctrine\Tests\ORM\Tools\Export;
 
-require_once __DIR__ . '/../../../TestInit.php';
-
 /**
  * Test case for YamlClassMetadataExporterTest
  *
diff --git a/tests/Doctrine/Tests/ORM/Tools/ResolveTargetEntityListenerTest.php b/tests/Doctrine/Tests/ORM/Tools/ResolveTargetEntityListenerTest.php
index 66b3ac43e..3b4219623 100644
--- a/tests/Doctrine/Tests/ORM/Tools/ResolveTargetEntityListenerTest.php
+++ b/tests/Doctrine/Tests/ORM/Tools/ResolveTargetEntityListenerTest.php
@@ -6,8 +6,6 @@ use Doctrine\ORM\Events;
 use Doctrine\ORM\Mapping\ClassMetadataFactory;
 use Doctrine\ORM\Tools\ResolveTargetEntityListener;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 class ResolveTargetEntityListenerTest extends \Doctrine\Tests\OrmTestCase
 {
     /**
diff --git a/tests/Doctrine/Tests/ORM/Tools/SchemaToolTest.php b/tests/Doctrine/Tests/ORM/Tools/SchemaToolTest.php
index aa80c145d..5b4bf7a90 100644
--- a/tests/Doctrine/Tests/ORM/Tools/SchemaToolTest.php
+++ b/tests/Doctrine/Tests/ORM/Tools/SchemaToolTest.php
@@ -7,8 +7,6 @@ use Doctrine\ORM\Tools\ToolEvents;
 use Doctrine\ORM\Tools\Event\GenerateSchemaTableEventArgs;
 use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 class SchemaToolTest extends \Doctrine\Tests\OrmTestCase
 {
     public function testAddUniqueIndexForUniqueFieldAnnotation()
diff --git a/tests/Doctrine/Tests/ORM/Tools/SchemaValidatorTest.php b/tests/Doctrine/Tests/ORM/Tools/SchemaValidatorTest.php
index 6f2e91236..422fda86f 100644
--- a/tests/Doctrine/Tests/ORM/Tools/SchemaValidatorTest.php
+++ b/tests/Doctrine/Tests/ORM/Tools/SchemaValidatorTest.php
@@ -4,8 +4,6 @@ namespace Doctrine\Tests\ORM\Tools;
 
 use Doctrine\ORM\Tools\SchemaValidator;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 class SchemaValidatorTest extends \Doctrine\Tests\OrmTestCase
 {
     /**
diff --git a/tests/Doctrine/Tests/ORM/Tools/SetupTest.php b/tests/Doctrine/Tests/ORM/Tools/SetupTest.php
index 553e48043..3a6055f1e 100644
--- a/tests/Doctrine/Tests/ORM/Tools/SetupTest.php
+++ b/tests/Doctrine/Tests/ORM/Tools/SetupTest.php
@@ -5,8 +5,6 @@ namespace Doctrine\Tests\ORM\Tools;
 use Doctrine\ORM\Tools\Setup;
 use Doctrine\Common\Cache\ArrayCache;
 
-require_once __DIR__ . '/../../TestInit.php';
-
 class SetupTest extends \Doctrine\Tests\OrmTestCase
 {
     private $originalAutoloaderCount;
diff --git a/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php b/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php
index 97f60f859..a64f2b428 100644
--- a/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php
+++ b/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php
@@ -10,8 +10,6 @@ use Doctrine\Tests\Mocks\EntityPersisterMock;
 use Doctrine\Tests\Models\Forum\ForumUser;
 use Doctrine\Tests\Models\Forum\ForumAvatar;
 
-require_once __DIR__ . '/../TestInit.php';
-
 /**
  * UnitOfWork tests.
  */