diff --git a/tests/AllTests.php b/tests/AllTests.php
index eba623745..e243bfb4d 100644
--- a/tests/AllTests.php
+++ b/tests/AllTests.php
@@ -8,7 +8,6 @@ require_once 'lib/DoctrineTestInit.php';
 // Suites
 require_once 'Dbal/AllTests.php';
 require_once 'Orm/AllTests.php';
-require_once 'Ticket/AllTests.php';
 
 class AllTests
 {
@@ -23,7 +22,6 @@ class AllTests
 
         $suite->addTest(Dbal_AllTests::suite());
         $suite->addTest(Orm_AllTests::suite());
-        $suite->addTest(Ticket_AllTests::suite());
 
         return $suite;
     }
diff --git a/tests/Dbal/AllTests.php b/tests/Dbal/AllTests.php
index 307d86ebf..4c50cb84d 100644
--- a/tests/Dbal/AllTests.php
+++ b/tests/Dbal/AllTests.php
@@ -7,6 +7,7 @@ require_once 'lib/DoctrineTestInit.php';
 
 // Suites
 require_once 'Dbal/Component/AllTests.php';
+require_once 'Dbal/Ticket/AllTests.php';
 
 class Dbal_AllTests
 {
@@ -20,6 +21,7 @@ class Dbal_AllTests
         $suite = new Doctrine_DbalTestSuite('Doctrine Dbal');
 
         $suite->addTest(Dbal_Component_AllTests::suite());
+        $suite->addTest(Dbal_Ticket_AllTests::suite());
         
         return $suite;
     }
diff --git a/tests/Dbal/Ticket/1Test.php b/tests/Dbal/Ticket/1Test.php
new file mode 100644
index 000000000..6d2539d97
--- /dev/null
+++ b/tests/Dbal/Ticket/1Test.php
@@ -0,0 +1,10 @@
+<?php
+require_once 'lib/DoctrineTestInit.php';
+ 
+class Dbal_Ticket_1Test extends Doctrine_DbalTestCase
+{
+    public function testTest()
+    {
+        $this->assertEquals(0, 0);
+    }
+}
\ No newline at end of file
diff --git a/tests/Dbal/Ticket/AllTests.php b/tests/Dbal/Ticket/AllTests.php
new file mode 100644
index 000000000..2a4a362be
--- /dev/null
+++ b/tests/Dbal/Ticket/AllTests.php
@@ -0,0 +1,30 @@
+<?php
+if (!defined('PHPUnit_MAIN_METHOD')) {
+    define('PHPUnit_MAIN_METHOD', 'Ticket_AllTests::main');
+}
+
+require_once 'lib/DoctrineTestInit.php';
+
+// Tests
+require_once 'Dbal/Ticket/1Test.php';
+
+class Dbal_Ticket_AllTests
+{
+    public static function main()
+    {
+        PHPUnit_TextUI_TestRunner::run(self::suite());
+    }
+
+    public static function suite()
+    {
+        $suite = new Doctrine_TestSuite('Doctrine Orm');
+
+        $suite->addTestSuite('Dbal_Ticket_1Test');
+        
+        return $suite;
+    }
+}
+
+if (PHPUnit_MAIN_METHOD == 'Ticket_AllTests::main') {
+    Ticket_AllTests::main();
+}
\ No newline at end of file
diff --git a/tests/Orm/AllTests.php b/tests/Orm/AllTests.php
index 25ae73573..69ddb93e6 100644
--- a/tests/Orm/AllTests.php
+++ b/tests/Orm/AllTests.php
@@ -7,6 +7,7 @@ require_once 'lib/DoctrineTestInit.php';
 
 // Suites
 require_once 'Orm/Component/AllTests.php';
+require_once 'Orm/Ticket/AllTests.php';
 
 class Orm_AllTests
 {
@@ -20,6 +21,7 @@ class Orm_AllTests
         $suite = new Doctrine_OrmTestSuite('Doctrine Orm');
 
         $suite->addTest(Orm_Component_AllTests::suite());
+        $suite->addTest(Orm_Ticket_AllTests::suite());
         
         return $suite;
     }
diff --git a/tests/Ticket/1Test.php b/tests/Orm/Ticket/1Test.php
similarity index 71%
rename from tests/Ticket/1Test.php
rename to tests/Orm/Ticket/1Test.php
index 16a7f9e69..ed5fe3c2b 100644
--- a/tests/Ticket/1Test.php
+++ b/tests/Orm/Ticket/1Test.php
@@ -1,7 +1,7 @@
 <?php
 require_once 'lib/DoctrineTestInit.php';
  
-class Ticket_1Test extends Doctrine_TestCase
+class Orm_Ticket_1Test extends Doctrine_OrmTestCase
 {
     public function testTest()
     {
diff --git a/tests/Ticket/AllTests.php b/tests/Orm/Ticket/AllTests.php
similarity index 81%
rename from tests/Ticket/AllTests.php
rename to tests/Orm/Ticket/AllTests.php
index 4c5728b7c..40b26961c 100644
--- a/tests/Ticket/AllTests.php
+++ b/tests/Orm/Ticket/AllTests.php
@@ -6,9 +6,9 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
 require_once 'lib/DoctrineTestInit.php';
 
 // Tests
-require_once 'Ticket/1Test.php';
+require_once 'Orm/Ticket/1Test.php';
 
-class Ticket_AllTests
+class Orm_Ticket_AllTests
 {
     public static function main()
     {
@@ -19,7 +19,7 @@ class Ticket_AllTests
     {
         $suite = new Doctrine_TestSuite('Doctrine Orm');
 
-        $suite->addTestSuite('Ticket_1Test');
+        $suite->addTestSuite('Orm_Ticket_1Test');
         
         return $suite;
     }