diff --git a/tests/AllTests.php b/tests/AllTests.php
new file mode 100644
index 000000000..79ff0b7bc
--- /dev/null
+++ b/tests/AllTests.php
@@ -0,0 +1,33 @@
+<?php
+if (!defined('PHPUnit_MAIN_METHOD')) {
+    define('PHPUnit_MAIN_METHOD', 'AllTests::main');
+}
+
+require_once 'PHPUnit/Framework.php';
+require_once 'PHPUnit/TextUI/TestRunner.php';
+require_once 'lib/Doctrine_TestSuite.php';
+
+require_once 'Dbal/AllTests.php';
+require_once 'Orm/AllTests.php';
+
+class AllTests
+{
+    public static function main()
+    {
+        PHPUnit_TextUI_TestRunner::run(self::suite());
+    }
+
+    public static function suite()
+    {
+        $suite = new Doctrine_TestSuite('Doctrine');
+
+        $suite->addTest(Dbal_AllTests::suite());
+        $suite->addTest(Orm_AllTests::suite());
+        
+        return $suite;
+    }
+}
+
+if (PHPUnit_MAIN_METHOD == 'AllTests::main') {
+    AllTests::main();
+}
\ No newline at end of file
diff --git a/tests/Dbal/AllTests.php b/tests/Dbal/AllTests.php
new file mode 100644
index 000000000..72394ec4e
--- /dev/null
+++ b/tests/Dbal/AllTests.php
@@ -0,0 +1,31 @@
+<?php
+if (!defined('PHPUnit_MAIN_METHOD')) {
+    define('PHPUnit_MAIN_METHOD', 'Dbal_AllTests::main');
+}
+
+require_once 'PHPUnit/Framework.php';
+require_once 'PHPUnit/TextUI/TestRunner.php';
+require_once 'lib/Doctrine_TestSuite.php';
+
+require_once 'Dbal/Component/AllTests.php';
+
+class Dbal_AllTests
+{
+    public static function main()
+    {
+        PHPUnit_TextUI_TestRunner::run(self::suite());
+    }
+
+    public static function suite()
+    {
+        $suite = new Doctrine_TestSuite('Doctrine Dbal');
+
+        $suite->addTest(Dbal_Component_AllTests::suite());
+        
+        return $suite;
+    }
+}
+
+if (PHPUnit_MAIN_METHOD == 'Dbal_AllTests::main') {
+    Dbal_AllTests::main();
+}
\ No newline at end of file
diff --git a/tests/Dbal/Component/AllTests.php b/tests/Dbal/Component/AllTests.php
new file mode 100644
index 000000000..d92bd2155
--- /dev/null
+++ b/tests/Dbal/Component/AllTests.php
@@ -0,0 +1,31 @@
+<?php
+if (!defined('PHPUnit_MAIN_METHOD')) {
+    define('PHPUnit_MAIN_METHOD', 'Dbal_Component_AllTests::main');
+}
+
+require_once 'PHPUnit/Framework.php';
+require_once 'PHPUnit/TextUI/TestRunner.php';
+require_once 'lib/Doctrine_TestSuite.php';
+
+require_once 'Dbal/Component/TestTest.php';
+
+class Dbal_Component_AllTests
+{
+    public static function main()
+    {
+        PHPUnit_TextUI_TestRunner::run(self::suite());
+    }
+
+    public static function suite()
+    {
+        $suite = new Doctrine_TestSuite('Doctrine Dbal Component');
+
+        $suite->addTestSuite('Dbal_Component_TestTest');
+
+        return $suite;
+    }
+}
+
+if (PHPUnit_MAIN_METHOD == 'Dbal_Component_AllTests::main') {
+    Dbal_Component_AllTests::main();
+}
\ No newline at end of file
diff --git a/tests/Dbal/Component/TestTest.php b/tests/Dbal/Component/TestTest.php
new file mode 100644
index 000000000..9805c75e5
--- /dev/null
+++ b/tests/Dbal/Component/TestTest.php
@@ -0,0 +1,10 @@
+<?php
+require_once 'lib/Doctrine_TestCase.php';
+ 
+class Dbal_Component_TestTest extends Doctrine_TestCase
+{
+    public function testTest()
+    {
+        $this->assertEquals(0, 0);
+    }
+}
\ No newline at end of file
diff --git a/tests/Orm/AllTests.php b/tests/Orm/AllTests.php
new file mode 100644
index 000000000..d3dd27cd2
--- /dev/null
+++ b/tests/Orm/AllTests.php
@@ -0,0 +1,31 @@
+<?php
+if (!defined('PHPUnit_MAIN_METHOD')) {
+    define('PHPUnit_MAIN_METHOD', 'Orm_AllTests::main');
+}
+
+require_once 'PHPUnit/Framework.php';
+require_once 'PHPUnit/TextUI/TestRunner.php';
+require_once 'lib/Doctrine_TestSuite.php';
+
+require_once 'Orm/Component/AllTests.php';
+
+class Orm_AllTests
+{
+    public static function main()
+    {
+        PHPUnit_TextUI_TestRunner::run(self::suite());
+    }
+
+    public static function suite()
+    {
+        $suite = new Doctrine_TestSuite('Doctrine Orm');
+
+        $suite->addTest(Orm_Component_AllTests::suite());
+        
+        return $suite;
+    }
+}
+
+if (PHPUnit_MAIN_METHOD == 'Orm_AllTests::main') {
+    Orm_AllTests::main();
+}
\ No newline at end of file
diff --git a/tests/Orm/Component/AllTests.php b/tests/Orm/Component/AllTests.php
new file mode 100644
index 000000000..3075ef6ea
--- /dev/null
+++ b/tests/Orm/Component/AllTests.php
@@ -0,0 +1,31 @@
+<?php
+if (!defined('PHPUnit_MAIN_METHOD')) {
+    define('PHPUnit_MAIN_METHOD', 'Dbal_Component_AllTests::main');
+}
+
+require_once 'PHPUnit/Framework.php';
+require_once 'PHPUnit/TextUI/TestRunner.php';
+require_once 'lib/Doctrine_TestSuite.php';
+
+require_once 'Orm/Component/TestTest.php';
+
+class Orm_Component_AllTests
+{
+    public static function main()
+    {
+        PHPUnit_TextUI_TestRunner::run(self::suite());
+    }
+
+    public static function suite()
+    {
+        $suite = new Doctrine_TestSuite('Doctrine Dbal Component');
+
+        $suite->addTestSuite('Orm_Component_TestTest');
+
+        return $suite;
+    }
+}
+
+if (PHPUnit_MAIN_METHOD == 'Dbal_Component_AllTests::main') {
+    Dbal_Component_AllTests::main();
+}
\ No newline at end of file
diff --git a/tests/Orm/Component/TestTest.php b/tests/Orm/Component/TestTest.php
new file mode 100644
index 000000000..6eff072c6
--- /dev/null
+++ b/tests/Orm/Component/TestTest.php
@@ -0,0 +1,10 @@
+<?php
+require_once 'lib/Doctrine_TestCase.php';
+ 
+class Orm_Component_TestTest extends Doctrine_TestCase
+{
+    public function testTest()
+    {
+        $this->assertEquals(0, 0);
+    }
+}
\ No newline at end of file
diff --git a/tests/lib/Doctrine_TestCase.php b/tests/lib/Doctrine_TestCase.php
new file mode 100644
index 000000000..8f6627ed4
--- /dev/null
+++ b/tests/lib/Doctrine_TestCase.php
@@ -0,0 +1,7 @@
+<?php
+require_once 'PHPUnit/Framework.php';
+
+class Doctrine_TestCase extends PHPUnit_Framework_TestCase
+{
+  
+}
\ No newline at end of file
diff --git a/tests/lib/Doctrine_TestSuite.php b/tests/lib/Doctrine_TestSuite.php
new file mode 100644
index 000000000..16eae17f9
--- /dev/null
+++ b/tests/lib/Doctrine_TestSuite.php
@@ -0,0 +1,7 @@
+<?php
+require_once 'PHPUnit/Framework.php';
+
+class Doctrine_TestSuite extends PHPUnit_Framework_TestSuite
+{
+  
+}
\ No newline at end of file