diff --git a/tests/Ticket381TestCase.php b/tests/Ticket/Ticket381TestCase.php
similarity index 96%
rename from tests/Ticket381TestCase.php
rename to tests/Ticket/Ticket381TestCase.php
index ba5483606..91e4adb60 100644
--- a/tests/Ticket381TestCase.php
+++ b/tests/Ticket/Ticket381TestCase.php
@@ -30,7 +30,7 @@
  * @since       1.0
  * @version     $Revision$
  */
-class Doctrine_Ticket381_TestCase extends Doctrine_UnitTestCase {
+class Doctrine_Ticket_381_TestCase extends Doctrine_UnitTestCase {
 
     public function prepareData() 
     { }
diff --git a/tests/TicketNjeroTestCase.php b/tests/Ticket/TicketNjeroTestCase.php
similarity index 87%
rename from tests/TicketNjeroTestCase.php
rename to tests/Ticket/TicketNjeroTestCase.php
index 667d20658..5cbedb7d4 100644
--- a/tests/TicketNjeroTestCase.php
+++ b/tests/Ticket/TicketNjeroTestCase.php
@@ -1,6 +1,6 @@
 <?php 
 /**
- * Doctrine_TicketNjero_TestCase
+ * Doctrine_Ticket_Njero_TestCase
  *
  * @package     Doctrine
  * @author      Jeff Rafter <lists@jeffrafter.com>
@@ -11,17 +11,17 @@
  * @version     $Revision$
  */
 
-class Doctrine_TicketNjero_TestCase extends Doctrine_UnitTestCase
+class Doctrine_Ticket_Njero_TestCase extends Doctrine_UnitTestCase
 {
     public function prepareData() { }
     public function prepareTables()
     {
-    	$this->tables[] = 'CoverageCodeN';
-    	$this->tables[] = 'PolicyCodeN';
-    	$this->tables[] = 'LiabilityCodeN';
-    	$this->tables[] = 'PolicyN';
-    	$this->tables[] = 'RateN';
-    	parent::prepareTables();    	
+        $this->tables[] = 'CoverageCodeN';
+        $this->tables[] = 'PolicyCodeN';
+        $this->tables[] = 'LiabilityCodeN';
+        $this->tables[] = 'PolicyN';
+        $this->tables[] = 'RateN';
+        parent::prepareTables();    
     }
 
     public function testHasOneMultiLevelRelations()