diff --git a/tests/Doctrine/Tests/Models/OneToOneSingleTableInheritance/Cat.php b/tests/Doctrine/Tests/Models/OneToOneSingleTableInheritance/Cat.php
new file mode 100644
index 000000000..1e7eee014
--- /dev/null
+++ b/tests/Doctrine/Tests/Models/OneToOneSingleTableInheritance/Cat.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Doctrine\Tests\Models\OneToOneSingleTableInheritance;
+
+/** @Entity */
+class Cat extends Pet
+{
+    const CLASSNAME = __CLASS__;
+
+    /**
+     * @OneToOne(targetEntity="LitterBox")
+     *
+     * @var LitterBox
+     */
+    public $litterBox;
+}
diff --git a/tests/Doctrine/Tests/Models/OneToOneSingleTableInheritance/LitterBox.php b/tests/Doctrine/Tests/Models/OneToOneSingleTableInheritance/LitterBox.php
new file mode 100644
index 000000000..7195a83ae
--- /dev/null
+++ b/tests/Doctrine/Tests/Models/OneToOneSingleTableInheritance/LitterBox.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Doctrine\Tests\Models\OneToOneSingleTableInheritance;
+
+/**
+ * @Entity
+ * @Table(name="one_to_one_single_table_inheritance_litter_box")
+ */
+class LitterBox
+{
+    const CLASSNAME = __CLASS__;
+
+    /** @Id @Column(type="integer") @GeneratedValue(strategy="AUTO") */
+    public $id;
+}
\ No newline at end of file
diff --git a/tests/Doctrine/Tests/Models/OneToOneSingleTableInheritance/Pet.php b/tests/Doctrine/Tests/Models/OneToOneSingleTableInheritance/Pet.php
new file mode 100644
index 000000000..e779ddb09
--- /dev/null
+++ b/tests/Doctrine/Tests/Models/OneToOneSingleTableInheritance/Pet.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Doctrine\Tests\Models\OneToOneSingleTableInheritance;
+
+/**
+ * @Entity
+ * @Table(name="one_to_one_single_table_inheritance_pet")
+ * @InheritanceType("SINGLE_TABLE")
+ * @DiscriminatorMap({"cat" = "Cat"})
+ */
+abstract class Pet
+{
+    const CLASSNAME = __CLASS__;
+
+    /** @Id @Column(type="integer") @GeneratedValue(strategy="AUTO") */
+    public $id;
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToOneSingleTableInheritanceTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToOneSingleTableInheritanceTest.php
index 1692731cf..af9379327 100644
--- a/tests/Doctrine/Tests/ORM/Functional/OneToOneSingleTableInheritanceTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/OneToOneSingleTableInheritanceTest.php
@@ -7,6 +7,9 @@ use Doctrine\Tests\Models\ECommerce\ECommerceShipping;
 use Doctrine\ORM\Mapping\AssociationMapping;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Query;
+use Doctrine\Tests\Models\OneToOneSingleTableInheritance\Cat;
+use Doctrine\Tests\Models\OneToOneSingleTableInheritance\LitterBox;
+use Doctrine\Tests\Models\OneToOneSingleTableInheritance\Pet;
 use Doctrine\Tests\OrmFunctionalTestCase;
 
 class OneToOneSingleTableInheritanceTest extends OrmFunctionalTestCase
@@ -47,34 +50,3 @@ class OneToOneSingleTableInheritanceTest extends OrmFunctionalTestCase
         $this->assertSame($cat->litterBox->id, $foundCat->litterBox->id);
     }
 }
-
-/** @Entity @InheritanceType("SINGLE_TABLE") @DiscriminatorMap({"cat" = "Cat"}) */
-abstract class Pet
-{
-    const CLASSNAME = __CLASS__;
-
-    /** @Id @Column(type="integer") @GeneratedValue(strategy="AUTO") */
-    public $id;
-}
-
-/** @Entity */
-class Cat extends Pet
-{
-    const CLASSNAME = __CLASS__;
-
-    /**
-     * @OneToOne(targetEntity="LitterBox")
-     *
-     * @var LitterBox
-     */
-    public $litterBox;
-}
-
-/** @Entity */
-class LitterBox
-{
-    const CLASSNAME = __CLASS__;
-
-    /** @Id @Column(type="integer") @GeneratedValue(strategy="AUTO") */
-    public $id;
-}