diff --git a/tests/Doctrine/Tests/Models/VersionedOneToMany/Article.php b/tests/Doctrine/Tests/Models/VersionedManyToOne/Article.php
similarity index 77%
rename from tests/Doctrine/Tests/Models/VersionedOneToMany/Article.php
rename to tests/Doctrine/Tests/Models/VersionedManyToOne/Article.php
index 919480162..0e5b1683f 100644
--- a/tests/Doctrine/Tests/Models/VersionedOneToMany/Article.php
+++ b/tests/Doctrine/Tests/Models/VersionedManyToOne/Article.php
@@ -1,13 +1,15 @@
 <?php
 
-namespace Doctrine\Tests\Models\VersionedOneToMany;
+namespace Doctrine\Tests\Models\VersionedManyToOne;
 
 /**
  * @Entity
- * @Table(name="article")
+ * @Table(name="versioned_many_to_one_article")
  */
 class Article
 {
+    const CLASSNAME = __CLASS__;
+
     /**
      * @Id
      * @Column(name="id", type="integer")
diff --git a/tests/Doctrine/Tests/Models/VersionedOneToMany/Category.php b/tests/Doctrine/Tests/Models/VersionedManyToOne/Category.php
similarity index 68%
rename from tests/Doctrine/Tests/Models/VersionedOneToMany/Category.php
rename to tests/Doctrine/Tests/Models/VersionedManyToOne/Category.php
index f5d293651..cb8840672 100644
--- a/tests/Doctrine/Tests/Models/VersionedOneToMany/Category.php
+++ b/tests/Doctrine/Tests/Models/VersionedManyToOne/Category.php
@@ -1,13 +1,15 @@
 <?php
 
-namespace Doctrine\Tests\Models\VersionedOneToMany;
+namespace Doctrine\Tests\Models\VersionedManyToOne;
 
 /**
  * @Entity
- * @Table(name="category")
+ * @Table(name="versioned_many_to_one_category")
  */
 class Category
 {
+    const CLASSNAME = __CLASS__;
+
     /**
      * @Id
      * @Column(name="id", type="integer")
@@ -15,11 +17,6 @@ class Category
      */
     public $id;
 
-    /**
-     * @Column(name="name")
-     */
-    public $name;
-
     /**
      * Version column
      *
diff --git a/tests/Doctrine/Tests/ORM/Functional/MergeVersionedOneToManyTest.php b/tests/Doctrine/Tests/ORM/Functional/MergeVersionedManyToOneTest.php
similarity index 56%
rename from tests/Doctrine/Tests/ORM/Functional/MergeVersionedOneToManyTest.php
rename to tests/Doctrine/Tests/ORM/Functional/MergeVersionedManyToOneTest.php
index f1c3145da..b534a5cb4 100644
--- a/tests/Doctrine/Tests/ORM/Functional/MergeVersionedOneToManyTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/MergeVersionedManyToOneTest.php
@@ -4,27 +4,19 @@ namespace Doctrine\Tests\ORM\Functional;
 
 use Doctrine\ORM\OptimisticLockException;
 use Doctrine\ORM\ORMException;
-use Doctrine\Tests\Models\VersionedOneToMany\Article;
-use Doctrine\Tests\Models\VersionedOneToMany\Category;
+use Doctrine\Tests\Models\VersionedManyToOne\Article;
+use Doctrine\Tests\Models\VersionedManyToOne\Category;
 
 /**
  * @group MergeVersionedOneToMany
  */
-class MergeVersionedOneToManyTest extends \Doctrine\Tests\OrmFunctionalTestCase
+class MergeVersionedManyToOneTest extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     protected function setUp()
     {
-        parent::setUp();
+        $this->useModelSet('versioned_many_to_one');
 
-        try {
-            $this->_schemaTool->createSchema(
-                [
-                    $this->_em->getClassMetadata('Doctrine\Tests\Models\VersionedOneToMany\Category'),
-                    $this->_em->getClassMetadata('Doctrine\Tests\Models\VersionedOneToMany\Article'),
-                ]
-            );
-        } catch (ORMException $e) {
-        }
+        parent::setUp();
     }
 
     /**
@@ -34,10 +26,9 @@ class MergeVersionedOneToManyTest extends \Doctrine\Tests\OrmFunctionalTestCase
     public function testSetVersionOnCreate()
     {
         $category = new Category();
-        $category->name = 'Category';
+        $article  = new Article();
 
-        $article = new Article();
-        $article->name = 'Article';
+        $article->name     = 'Article';
         $article->category = $category;
 
         $this->_em->persist($article);
diff --git a/tests/Doctrine/Tests/OrmFunctionalTestCase.php b/tests/Doctrine/Tests/OrmFunctionalTestCase.php
index d54c9cdf3..b8a705707 100644
--- a/tests/Doctrine/Tests/OrmFunctionalTestCase.php
+++ b/tests/Doctrine/Tests/OrmFunctionalTestCase.php
@@ -282,6 +282,10 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
             'Doctrine\Tests\Models\Pagination\User',
             'Doctrine\Tests\Models\Pagination\User1',
         ),
+        'versioned_many_to_one' => array(
+            'Doctrine\Tests\Models\VersionedManyToOne\Category',
+            'Doctrine\Tests\Models\VersionedManyToOne\Article',
+        ),
     );
 
     /**
@@ -543,6 +547,11 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
             $conn->executeUpdate('DELETE FROM pagination_user');
         }
 
+        if (isset($this->_usedModelSets['versioned_many_to_one'])) {
+            $conn->executeUpdate('DELETE FROM versioned_many_to_one_article');
+            $conn->executeUpdate('DELETE FROM versioned_many_to_one_category');
+        }
+
         $this->_em->clear();
     }