diff --git a/tests/DataDict/MysqlTestCase.php b/tests/DataDict/MysqlTestCase.php
new file mode 100644
index 000000000..e217b8c07
--- /dev/null
+++ b/tests/DataDict/MysqlTestCase.php
@@ -0,0 +1,85 @@
+<?php
+class Doctrine_DataDict_Mysql_TestCase extends Doctrine_Driver_UnitTestCase {
+    public function __construct() {
+        parent::__construct('mysql');
+    }
+    public function testGetNativeDefinitionSupportsIntegerType() {
+        $a = array('type' => 'integer', 'length' => 20, 'fixed' => false);
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'BIGINT');
+        
+        $a['length'] = 4;
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'INT');
+
+        $a['length'] = 2;
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'SMALLINT');
+    }
+
+    public function testGetNativeDefinitionSupportsFloatType() {
+        $a = array('type' => 'float', 'length' => 20, 'fixed' => false);
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'DOUBLE');
+    }
+    public function testGetNativeDefinitionSupportsBooleanType() {
+        $a = array('type' => 'boolean', 'fixed' => false);
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'TINYINT(1)');
+    }
+    public function testGetNativeDefinitionSupportsDateType() {
+        $a = array('type' => 'date', 'fixed' => false);
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'DATE');
+    }
+    public function testGetNativeDefinitionSupportsTimestampType() {
+        $a = array('type' => 'timestamp', 'fixed' => false);
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'DATETIME');
+    }
+    public function testGetNativeDefinitionSupportsTimeType() {
+        $a = array('type' => 'time', 'fixed' => false);
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'TIME');
+    }
+    public function testGetNativeDefinitionSupportsClobType() {
+        $a = array('type' => 'clob');
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'LONGTEXT');
+    }
+    public function testGetNativeDefinitionSupportsBlobType() {
+        $a = array('type' => 'blob');
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'LONGBLOB');
+    }
+    public function testGetNativeDefinitionSupportsCharType() {
+        $a = array('type' => 'char', 'length' => 10);
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'CHAR(10)');
+    }
+    public function testGetNativeDefinitionSupportsVarcharType() {
+        $a = array('type' => 'varchar', 'length' => 10);
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'VARCHAR(10)');
+    }
+    public function testGetNativeDefinitionSupportsArrayType() {
+        $a = array('type' => 'array', 'length' => 40);
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'VARCHAR(40)');
+    }
+    public function testGetNativeDefinitionSupportsStringType() {
+        $a = array('type' => 'string');
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'TEXT');
+    }
+    public function testGetNativeDefinitionSupportsArrayType2() {
+        $a = array('type' => 'array');
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'TEXT');
+    }
+    public function testGetNativeDefinitionSupportsObjectType() {
+        $a = array('type' => 'object');
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'TEXT');
+    }
+}
diff --git a/tests/DataDict/PgsqlTestCase.php b/tests/DataDict/PgsqlTestCase.php
index a1f3561b9..9156e5810 100644
--- a/tests/DataDict/PgsqlTestCase.php
+++ b/tests/DataDict/PgsqlTestCase.php
@@ -5,10 +5,9 @@ class Doctrine_DataDict_Pgsql_TestCase extends Doctrine_Driver_UnitTestCase {
     }
 
     public function getDeclaration($type) {
-        return $this->dataDict->getDoctrineDeclaration(array('type' => $type, 'name' => 'colname', 'length' => 2, 'fixed' => true));
+        return $this->dataDict->getPortableDeclaration(array('type' => $type, 'name' => 'colname', 'length' => 2, 'fixed' => true));
     }
-    public function testGetDoctrineDefinition() {
-
+    public function testGetPortableDeclarationSupportsIntegers() {
         $this->assertEqual($this->getDeclaration('smallint'), array(array('integer', 'boolean'), 2, false, null));
         $this->assertEqual($this->getDeclaration('int2'), array(array('integer', 'boolean'), 2, false, null));
 
@@ -18,16 +17,16 @@ class Doctrine_DataDict_Pgsql_TestCase extends Doctrine_Driver_UnitTestCase {
         $this->assertEqual($this->getDeclaration('serial'), array(array('integer'), 4, false, null));
         $this->assertEqual($this->getDeclaration('serial4'), array(array('integer'), 4, false, null));
 
-
         $this->assertEqual($this->getDeclaration('bigint'), array(array('integer'), 8, false, null));
         $this->assertEqual($this->getDeclaration('int8'), array(array('integer'), 8, false, null));
         $this->assertEqual($this->getDeclaration('bigserial'), array(array('integer'), 8, false, null));
         $this->assertEqual($this->getDeclaration('serial8'), array(array('integer'), 8, false, null));
-
+    }
+    public function testGetPortableDeclarationSupportsBooleans() {
         $this->assertEqual($this->getDeclaration('bool'), array(array('boolean'), 1, false, null));
         $this->assertEqual($this->getDeclaration('boolean'), array(array('boolean'), 1, false, null));
-
     }
+
     public function testGetNativeDefinitionSupportsIntegerType() {
         $a = array('type' => 'integer', 'length' => 20, 'fixed' => false);