diff --git a/lib/vendor/doctrine-dbal b/lib/vendor/doctrine-dbal
index 82cc92144..537de7ea6 160000
--- a/lib/vendor/doctrine-dbal
+++ b/lib/vendor/doctrine-dbal
@@ -1 +1 @@
-Subproject commit 82cc921447fde697bf3d9f5285d0f0b8587303d8
+Subproject commit 537de7ea6a34edbcc40bc6ca92e0a3f816b59330
diff --git a/tests/Doctrine/Tests/TestUtil.php b/tests/Doctrine/Tests/TestUtil.php
index a77812f7f..b78d06e4e 100644
--- a/tests/Doctrine/Tests/TestUtil.php
+++ b/tests/Doctrine/Tests/TestUtil.php
@@ -70,10 +70,16 @@ class TestUtil
             } else {
                 $sm = $realConn->getSchemaManager();
 
-                $tableNames = $sm->listTableNames();
-                
-                foreach ($tableNames AS $tableName) {
-                    $sm->dropTable($tableName);
+                /* @var $schema Schema */
+                $schema = $sm->createSchema();
+                $stmts = $schema->toDropSql($realConn->getDatabasePlatform());
+
+                foreach ($stmts AS $stmt) {
+                    try {
+                        $realConn->exec($stmt);
+                    } catch(\Exception $e) {
+                        // TODO: Now is this a real good idea?
+                    }
                 }
             }