diff --git a/tests/Doctrine/Tests/ORM/Functional/InstanceOfAbstractTest.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfAbstractTest.php
similarity index 88%
rename from tests/Doctrine/Tests/ORM/Functional/InstanceOfAbstractTest.php
rename to tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfAbstractTest.php
index 1b826a461..b17ca2c2d 100644
--- a/tests/Doctrine/Tests/ORM/Functional/InstanceOfAbstractTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfAbstractTest.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Doctrine\Tests\ORM\Functional {
+namespace Doctrine\Tests\ORM\Functional\Ticket {
 
     use Doctrine\Tests\ORM\Functional\InstanceOfAbstractTest\Employee;
     use Doctrine\Tests\ORM\Functional\InstanceOfAbstractTest\Person;
     use Doctrine\Tests\OrmFunctionalTestCase;
 
-    class InstanceOfAbstractTest extends OrmFunctionalTestCase
+    class Ticket4646InstanceOfAbstractTest extends OrmFunctionalTestCase
     {
         protected function setUp()
         {
@@ -30,15 +30,15 @@ namespace Doctrine\Tests\ORM\Functional {
             $this->assertCount(1, $result);
 
             foreach ($result as $r) {
-                $this->assertInstanceOf(InstanceOfAbstractTest\Person::class, $r);
-                $this->assertInstanceOf(InstanceOfAbstractTest\Employee::class, $r);
+                $this->assertInstanceOf(Person::class, $r);
+                $this->assertInstanceOf(Employee::class, $r);
                 $this->assertSame('bar', $r->getName());
             }
         }
 
         private function loadData()
         {
-            $employee = new InstanceOfAbstractTest\Employee();
+            $employee = new Employee();
             $employee->setName('bar');
             $employee->setDepartement('qux');
 
diff --git a/tests/Doctrine/Tests/ORM/Functional/InstanceOfMultiLevelTest.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfMultiLevelTest.php
similarity index 95%
rename from tests/Doctrine/Tests/ORM/Functional/InstanceOfMultiLevelTest.php
rename to tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfMultiLevelTest.php
index 131f053a2..79f0d5363 100644
--- a/tests/Doctrine/Tests/ORM/Functional/InstanceOfMultiLevelTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfMultiLevelTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Doctrine\Tests\ORM\Functional {
+namespace Doctrine\Tests\ORM\Functional\Ticket {
 
     use Doctrine\Tests\ORM\Functional\InstanceOfMultiLevelTest\Employee;
     use Doctrine\Tests\ORM\Functional\InstanceOfMultiLevelTest\Engineer;
     use Doctrine\Tests\ORM\Functional\InstanceOfMultiLevelTest\Person;
     use Doctrine\Tests\OrmFunctionalTestCase;
 
-    class InstanceOfMultiLevelTest extends OrmFunctionalTestCase
+    class Ticket4646InstanceOfMultiLevelTest extends OrmFunctionalTestCase
     {
         protected function setUp()
         {
@@ -33,7 +33,7 @@ namespace Doctrine\Tests\ORM\Functional {
 
             foreach ($result as $r) {
                 $this->assertInstanceOf(Person::class, $r);
-                if ($r instanceof InstanceOfMultiLevelTest\Engineer) {
+                if ($r instanceof Engineer) {
                     $this->assertEquals('foobar', $r->getName());
                     $this->assertEquals('doctrine', $r->getSpecialization());
                 } elseif ($r instanceof Employee) {
diff --git a/tests/Doctrine/Tests/ORM/Functional/InstanceOfTest.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfTest.php
similarity index 86%
rename from tests/Doctrine/Tests/ORM/Functional/InstanceOfTest.php
rename to tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfTest.php
index fce0075b6..326b83393 100644
--- a/tests/Doctrine/Tests/ORM/Functional/InstanceOfTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfTest.php
@@ -1,10 +1,12 @@
 <?php
 
-namespace Doctrine\Tests\ORM\Functional {
+namespace Doctrine\Tests\ORM\Functional\Ticket {
 
+    use Doctrine\Tests\ORM\Functional\InstanceOfTest\Employee;
+    use Doctrine\Tests\ORM\Functional\InstanceOfTest\Person;
     use Doctrine\Tests\OrmFunctionalTestCase;
 
-    class InstanceOfTest extends OrmFunctionalTestCase
+    class Ticket4646InstanceOfTest extends OrmFunctionalTestCase
     {
         protected function setUp()
         {
@@ -28,8 +30,8 @@ namespace Doctrine\Tests\ORM\Functional {
             $this->assertCount(2, $result);
 
             foreach ($result as $r) {
-                $this->assertInstanceOf(InstanceOfTest\Person::class, $r);
-                if ($r instanceof InstanceOfTest\Employee) {
+                $this->assertInstanceOf(Person::class, $r);
+                if ($r instanceof Employee) {
                     $this->assertEquals('bar', $r->getName());
                 } else {
                     $this->assertEquals('foo', $r->getName());
@@ -39,10 +41,10 @@ namespace Doctrine\Tests\ORM\Functional {
 
         private function loadData()
         {
-            $person = new InstanceOfTest\Person();
+            $person = new Person();
             $person->setName('foo');
 
-            $employee = new InstanceOfTest\Employee();
+            $employee = new Employee();
             $employee->setName('bar');
             $employee->setDepartement('qux');