diff --git a/tests/BooleanTestCase.php b/tests/DataType/BooleanTestCase.php
similarity index 94%
rename from tests/BooleanTestCase.php
rename to tests/DataType/BooleanTestCase.php
index 4ec2c1037..17288bdec 100644
--- a/tests/BooleanTestCase.php
+++ b/tests/DataType/BooleanTestCase.php
@@ -20,7 +20,7 @@
  */
 
 /**
- * Doctrine_Boolean_TestCase
+ * Doctrine_DataType_Boolean_TestCase
  *
  * @package     Doctrine
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
@@ -30,7 +30,7 @@
  * @since       1.0
  * @version     $Revision$
  */
-class Doctrine_Boolean_TestCase extends Doctrine_UnitTestCase {
+class Doctrine_DataType_Boolean_TestCase extends Doctrine_UnitTestCase {
     public function prepareData() { }
     public function prepareTables() {
         $this->tables = array("BooleanTest");
diff --git a/tests/EnumTestCase.php b/tests/DataType/EnumTestCase.php
similarity index 98%
rename from tests/EnumTestCase.php
rename to tests/DataType/EnumTestCase.php
index 25f9c1e03..c9296e5c6 100644
--- a/tests/EnumTestCase.php
+++ b/tests/DataType/EnumTestCase.php
@@ -20,7 +20,7 @@
  */
 
 /**
- * Doctrine_Enum_TestCase
+ * Doctrine_DataType_Enum_TestCase
  *
  * @package     Doctrine
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
@@ -30,7 +30,7 @@
  * @since       1.0
  * @version     $Revision$
  */
-class Doctrine_Enum_TestCase extends Doctrine_UnitTestCase 
+class Doctrine_DataType_Enum_TestCase extends Doctrine_UnitTestCase 
 {
     public function prepareData() 
     { }
diff --git a/tests/Ticket/Ticket381TestCase.php b/tests/Ticket/381TestCase.php
similarity index 100%
rename from tests/Ticket/Ticket381TestCase.php
rename to tests/Ticket/381TestCase.php
diff --git a/tests/Ticket/TicketNjeroTestCase.php b/tests/Ticket/NjeroTestCase.php
similarity index 100%
rename from tests/Ticket/TicketNjeroTestCase.php
rename to tests/Ticket/NjeroTestCase.php
diff --git a/tests/run.php b/tests/run.php
index 3d025d224..55000ccd0 100644
--- a/tests/run.php
+++ b/tests/run.php
@@ -29,7 +29,6 @@ function autoload($class) {
     // create a test case file if it doesn't exist
 
     if ( ! file_exists($file)) {
-        echo "file $file does not exist \n";
         $contents = file_get_contents('template.tpl');
         $contents = sprintf($contents, $class, $class);
 
@@ -73,7 +72,9 @@ $test = new GroupTest('Doctrine Framework Unit Tests');
 
 // DATABASE ABSTRACTION tests
 
-$test->addTestCase(new Doctrine_TicketNjero_TestCase());
+
+//TICKET test cases
+$test->addTestCase(new Doctrine_Ticket_Njero_TestCase());
 
 // Connection drivers (not yet fully tested)
 $test->addTestCase(new Doctrine_Connection_Pgsql_TestCase());
@@ -188,9 +189,9 @@ $test->addTestCase(new Doctrine_Relation_OneToOne_TestCase());
 $test->addTestCase(new Doctrine_Relation_Parser_TestCase());
 
 // Datatypes
-$test->addTestCase(new Doctrine_Enum_TestCase());
+$test->addTestCase(new Doctrine_DataType_Enum_TestCase());
 
-$test->addTestCase(new Doctrine_Boolean_TestCase());
+$test->addTestCase(new Doctrine_DataType_Boolean_TestCase());
 
 // Utility components