diff --git a/tests/Doctrine/Tests/ORM/Functional/AllTests.php b/tests/Doctrine/Tests/ORM/Functional/AllTests.php
index c0827bcfb..9d25377c4 100644
--- a/tests/Doctrine/Tests/ORM/Functional/AllTests.php
+++ b/tests/Doctrine/Tests/ORM/Functional/AllTests.php
@@ -57,9 +57,10 @@ class AllTests
         $suite->addTestSuite('Doctrine\Tests\ORM\Functional\PostgreSQLIdentityStrategyTest');
         
         $suite->addTest(Locking\AllTests::suite());
-        $suite->addTest(SchemaTool\AllTests::suite());
         $suite->addTest(Ticket\AllTests::suite());
+        $suite->addTest(SchemaTool\AllTests::suite());
 
+        
         return $suite;
     }
 }
diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/AllTests.php b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/AllTests.php
index 90826bb24..646d8c07d 100644
--- a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/AllTests.php
+++ b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/AllTests.php
@@ -21,6 +21,7 @@ class AllTests
 
         $suite->addTestSuite('Doctrine\Tests\ORM\Functional\SchemaTool\MySqlSchemaToolTest');
         $suite->addTestSuite('Doctrine\Tests\ORM\Functional\SchemaTool\PostgreSqlSchemaToolTest');
+        $suite->addTestSuite('Doctrine\Tests\ORM\Functional\SchemaTool\DDC214Test');
 
         return $suite;
     }
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC214Test.php b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DDC214Test.php
similarity index 94%
rename from tests/Doctrine/Tests/ORM/Functional/Ticket/DDC214Test.php
rename to tests/Doctrine/Tests/ORM/Functional/SchemaTool/DDC214Test.php
index 7f3df9b15..a6682b6a8 100644
--- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC214Test.php
+++ b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DDC214Test.php
@@ -1,12 +1,15 @@
 <?php
 
-namespace Doctrine\Tests\ORM\Functional\Ticket;
+namespace Doctrine\Tests\ORM\Functional\SchemaTool;
 
 use Doctrine\ORM\Tools;
 
 
 require_once __DIR__ . '/../../../TestInit.php';
 
+/**
+ * WARNING: This test should be run as last test! It can affect others very easily!
+ */
 class DDC214Test extends \Doctrine\Tests\OrmFunctionalTestCase
 {
     public function setUp() {
diff --git a/tests/Doctrine/Tests/OrmFunctionalTestCase.php b/tests/Doctrine/Tests/OrmFunctionalTestCase.php
index fe5f7642f..242464169 100644
--- a/tests/Doctrine/Tests/OrmFunctionalTestCase.php
+++ b/tests/Doctrine/Tests/OrmFunctionalTestCase.php
@@ -180,6 +180,14 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
                 $forceCreateTables = true;
             }
         }
+
+        if (isset($GLOBALS['DOCTRINE_MARK_SQL_LOGS'])) {
+            if (in_array($this->sharedFixture['conn']->getDatabasePlatform()->getName(), array("mysql", "postgresql"))) {
+                $this->sharedFixture['conn']->executeQuery('SELECT 1 /*' . get_class($this) . '*/');
+            } else if ($this->sharedFixture['conn']->getDatabasePlatform()->getName() == "oracle") {
+                $this->sharedFixture['conn']->executeQuery('SELECT 1 /*' . get_class($this) . '*/ FROM dual');
+            }
+        }
         
         if ( ! $this->_em) {
             $this->_em = $this->_getEntityManager();