diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyCompositeIdForeignKeyTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyCompositeIdForeignKeyTest.php
index 21e281219..877d1a279 100644
--- a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyCompositeIdForeignKeyTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyCompositeIdForeignKeyTest.php
@@ -19,13 +19,8 @@ class ManyToManyCompositeIdForeignKeyTest extends OrmFunctionalTestCase
 {
     public function setUp()
     {
-        if (DBALType::hasType('rot13')) {
-            DBALType::overrideType('rot13', 'Doctrine\Tests\DbalTypes\Rot13Type');
-        } else {
-            DBALType::addType('rot13', 'Doctrine\Tests\DbalTypes\Rot13Type');
-        }
-
         $this->useModelSet('vct_manytomany_compositeid_foreignkey');
+
         parent::setUp();
 
         $auxiliary = new Entity\AuxiliaryEntity();
diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyCompositeIdTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyCompositeIdTest.php
index a21e964a2..6b56073a3 100644
--- a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyCompositeIdTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyCompositeIdTest.php
@@ -18,13 +18,8 @@ class ManyToManyCompositeIdTest extends OrmFunctionalTestCase
 {
     public function setUp()
     {
-        if (DBALType::hasType('rot13')) {
-            DBALType::overrideType('rot13', 'Doctrine\Tests\DbalTypes\Rot13Type');
-        } else {
-            DBALType::addType('rot13', 'Doctrine\Tests\DbalTypes\Rot13Type');
-        }
-
         $this->useModelSet('vct_manytomany_compositeid');
+
         parent::setUp();
 
         $inversed = new Entity\InversedManyToManyCompositeIdEntity();
diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyExtraLazyTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyExtraLazyTest.php
index 5d3173f40..3d1df24b8 100644
--- a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyExtraLazyTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyExtraLazyTest.php
@@ -19,12 +19,6 @@ class ManyToManyExtraLazyTest extends OrmFunctionalTestCase
 {
     public function setUp()
     {
-        if (DBALType::hasType('rot13')) {
-            DBALType::overrideType('rot13', 'Doctrine\Tests\DbalTypes\Rot13Type');
-        } else {
-            DBALType::addType('rot13', 'Doctrine\Tests\DbalTypes\Rot13Type');
-        }
-
         $this->useModelSet('vct_manytomany_extralazy');
         parent::setUp();
 
diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyTest.php
index 0d99b27e2..66193fb14 100644
--- a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyTest.php
@@ -18,13 +18,8 @@ class ManyToManyTest extends OrmFunctionalTestCase
 {
     public function setUp()
     {
-        if (DBALType::hasType('rot13')) {
-            DBALType::overrideType('rot13', 'Doctrine\Tests\DbalTypes\Rot13Type');
-        } else {
-            DBALType::addType('rot13', 'Doctrine\Tests\DbalTypes\Rot13Type');
-        }
-
         $this->useModelSet('vct_manytomany');
+
         parent::setUp();
 
         $inversed = new Entity\InversedManyToManyEntity();
diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyCompositeIdForeignKeyTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyCompositeIdForeignKeyTest.php
index 656847a15..17a8ea873 100644
--- a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyCompositeIdForeignKeyTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyCompositeIdForeignKeyTest.php
@@ -19,13 +19,8 @@ class OneToManyCompositeIdForeignKeyTest extends OrmFunctionalTestCase
 {
     public function setUp()
     {
-        if (DBALType::hasType('rot13')) {
-            DBALType::overrideType('rot13', 'Doctrine\Tests\DbalTypes\Rot13Type');
-        } else {
-            DBALType::addType('rot13', 'Doctrine\Tests\DbalTypes\Rot13Type');
-        }
-
         $this->useModelSet('vct_onetomany_compositeid_foreignkey');
+
         parent::setUp();
 
         $auxiliary = new Entity\AuxiliaryEntity();
diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyCompositeIdTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyCompositeIdTest.php
index 3f65e5c25..c094afa78 100644
--- a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyCompositeIdTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyCompositeIdTest.php
@@ -18,13 +18,8 @@ class OneToManyCompositeIdTest extends OrmFunctionalTestCase
 {
     public function setUp()
     {
-        if (DBALType::hasType('rot13')) {
-            DBALType::overrideType('rot13', 'Doctrine\Tests\DbalTypes\Rot13Type');
-        } else {
-            DBALType::addType('rot13', 'Doctrine\Tests\DbalTypes\Rot13Type');
-        }
-
         $this->useModelSet('vct_onetomany_compositeid');
+
         parent::setUp();
 
         $inversed = new Entity\InversedOneToManyCompositeIdEntity();
diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyExtraLazyTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyExtraLazyTest.php
index 17429089a..bb9006782 100644
--- a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyExtraLazyTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyExtraLazyTest.php
@@ -19,13 +19,8 @@ class OneToManyExtraLazyTest extends OrmFunctionalTestCase
 {
     public function setUp()
     {
-        if (DBALType::hasType('rot13')) {
-            DBALType::overrideType('rot13', 'Doctrine\Tests\DbalTypes\Rot13Type');
-        } else {
-            DBALType::addType('rot13', 'Doctrine\Tests\DbalTypes\Rot13Type');
-        }
-
         $this->useModelSet('vct_onetomany_extralazy');
+
         parent::setUp();
 
         $inversed = new Entity\InversedOneToManyExtraLazyEntity();
diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyTest.php
index cb8d0f08a..e83453714 100644
--- a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyTest.php
@@ -18,13 +18,8 @@ class OneToManyTest extends OrmFunctionalTestCase
 {
     public function setUp()
     {
-        if (DBALType::hasType('rot13')) {
-            DBALType::overrideType('rot13', 'Doctrine\Tests\DbalTypes\Rot13Type');
-        } else {
-            DBALType::addType('rot13', 'Doctrine\Tests\DbalTypes\Rot13Type');
-        }
-
         $this->useModelSet('vct_onetomany');
+
         parent::setUp();
 
         $inversed = new Entity\InversedOneToManyEntity();
diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneCompositeIdForeignKeyTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneCompositeIdForeignKeyTest.php
index fc0c6b463..4a595c21f 100644
--- a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneCompositeIdForeignKeyTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneCompositeIdForeignKeyTest.php
@@ -19,12 +19,6 @@ class OneToOneCompositeIdForeignKeyTest extends OrmFunctionalTestCase
 {
     public function setUp()
     {
-        if (DBALType::hasType('rot13')) {
-            DBALType::overrideType('rot13', 'Doctrine\Tests\DbalTypes\Rot13Type');
-        } else {
-            DBALType::addType('rot13', 'Doctrine\Tests\DbalTypes\Rot13Type');
-        }
-
         $this->useModelSet('vct_onetoone_compositeid_foreignkey');
         parent::setUp();
 
diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneCompositeIdTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneCompositeIdTest.php
index 262792169..96daa6016 100644
--- a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneCompositeIdTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneCompositeIdTest.php
@@ -18,12 +18,6 @@ class OneToOneCompositeIdTest extends OrmFunctionalTestCase
 {
     public function setUp()
     {
-        if (DBALType::hasType('rot13')) {
-            DBALType::overrideType('rot13', 'Doctrine\Tests\DbalTypes\Rot13Type');
-        } else {
-            DBALType::addType('rot13', 'Doctrine\Tests\DbalTypes\Rot13Type');
-        }
-
         $this->useModelSet('vct_onetoone_compositeid');
         parent::setUp();
 
diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneTest.php
index fdf4fbabc..15e45f9fe 100644
--- a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneTest.php
@@ -18,13 +18,8 @@ class OneToOneTest extends OrmFunctionalTestCase
 {
     public function setUp()
     {
-        if (DBALType::hasType('rot13')) {
-            DBALType::overrideType('rot13', 'Doctrine\Tests\DbalTypes\Rot13Type');
-        } else {
-            DBALType::addType('rot13', 'Doctrine\Tests\DbalTypes\Rot13Type');
-        }
-
         $this->useModelSet('vct_onetoone');
+
         parent::setUp();
 
         $inversed = new Entity\InversedOneToOneEntity();