diff --git a/tests/DataDict/PgsqlTestCase.php b/tests/DataDict/PgsqlTestCase.php
index 4a1176dd1..f3da5985a 100644
--- a/tests/DataDict/PgsqlTestCase.php
+++ b/tests/DataDict/PgsqlTestCase.php
@@ -1,9 +1,14 @@
 <?php
 class Doctrine_DataDict_Pgsql_TestCase extends Doctrine_Driver_UnitTestCase {
+    public function __construct() {
+        parent::__construct('pgsql');
+    }
+
     public function getDeclaration($type) {
         return $this->dataDict->getDoctrineDeclaration(array('type' => $type, 'name' => 'colname', 'length' => 2, 'fixed' => true));
     }
     public function testGetDoctrineDefinition() {
+
         $this->assertEqual($this->getDeclaration('smallint'), array(array('integer', 'boolean'), 2, false, null));
         $this->assertEqual($this->getDeclaration('int2'), array(array('integer', 'boolean'), 2, false, null));
 
diff --git a/tests/DataDict/SqliteTestCase.php b/tests/DataDict/SqliteTestCase.php
index ef5e87797..fa88af253 100644
--- a/tests/DataDict/SqliteTestCase.php
+++ b/tests/DataDict/SqliteTestCase.php
@@ -1,20 +1,43 @@
 <?php
 class Doctrine_DataDict_Sqlite_TestCase extends Doctrine_Driver_UnitTestCase {
-    public function getDeclaration($type) {
-        return $this->dataDict->getDoctrineDeclaration(array('type' => $type, 'name' => 'colname', 'length' => 2, 'fixed' => true));
+    public function __construct() {
+        parent::__construct('sqlite');
     }
-    public function testGetDoctrineDefinition() {
-        $this->assertEqual($this->getDeclaration('boolean'), array(array('boolean'), 1, false, null));
 
-        $this->assertEqual($this->getDeclaration('tinyint'), array(array('integer', 'boolean'), 1, false, null));
-        $this->assertEqual($this->getDeclaration('smallint'), array(array('integer'), 2, false, null));
-        $this->assertEqual($this->getDeclaration('mediumint'), array(array('integer'), 2, false, null));
-        $this->assertEqual($this->getDeclaration('int'), array(array('integer'), 4, false, null));
-        $this->assertEqual($this->getDeclaration('integer'), array(array('integer'), 4, false, null));
-        $this->assertEqual($this->getDeclaration('serial'), array(array('integer'), 4, false, null));
-        $this->assertEqual($this->getDeclaration('bigint'), array(array('integer'), 8, false, null));
-        $this->assertEqual($this->getDeclaration('bigserial'), array(array('integer'), 8, false, null));
+    public function testBooleanMapsToBooleanType() {
+        $this->assertDeclarationType('boolean', 'boolean');
+    }
+    public function testIntegersMapToIntegerType() {
+        $this->assertDeclarationType('tinyint', array('integer', 'boolean'));
+        $this->assertDeclarationType('smallint', 'integer');
+        $this->assertDeclarationType('mediumint', 'integer');
+        $this->assertDeclarationType('int', 'integer');
+        $this->assertDeclarationType('integer', 'integer');
+        $this->assertDeclarationType('serial', 'integer');
+        $this->assertDeclarationType('bigint', 'integer');
+        $this->assertDeclarationType('bigserial', 'integer');
+    }
+    public function testBlobsMapToBlobType( ){
+        $this->assertDeclarationType('tinyblob', 'blob');
+        $this->assertDeclarationType('mediumblob', 'blob');
+        $this->assertDeclarationType('longblob', 'blob');
+        $this->assertDeclarationType('blob', 'blob');
+    }
+    public function testDecimalMapsToDecimal() {
+        $this->assertDeclarationType('decimal', 'decimal');
+        $this->assertDeclarationType('numeric', 'decimal');
+    }
+    public function testFloatRealAndDoubleMapToFloat() {
+        $this->assertDeclarationType('float', 'float');
+        $this->assertDeclarationType('double', 'float');
+        $this->assertDeclarationType('real', 'float');
+    }
+    public function testYearMapsToIntegerAndDate() {
+         $this->assertDeclarationType('year', array('integer','date'));
+    }
+    public function testSomething( ){
         /**
+
         $this->assertEqual($this->getDeclaration('clob'), array(array('integer', 'boolean'), 1, false, null));
         $this->assertEqual($this->getDeclaration('tinytext'), array(array('integer'), 2, false, null));
         $this->assertEqual($this->getDeclaration('mediumtext'), array(array('integer'), 2, false, null));
@@ -28,17 +51,7 @@ class Doctrine_DataDict_Sqlite_TestCase extends Doctrine_Driver_UnitTestCase {
         $this->assertEqual($this->getDeclaration('datetime'), array(array('integer'), 8, false, null));
         $this->assertEqual($this->getDeclaration('timestamp'), array(array('integer'), 8, false, null));
         $this->assertEqual($this->getDeclaration('time'), array(array('integer'), 8, false, null));
-        */
-        $this->assertEqual($this->getDeclaration('float'), array(array('float'), 8, false, null));
-        $this->assertEqual($this->getDeclaration('double'), array(array('float'), 8, false, null));
-        $this->assertEqual($this->getDeclaration('real'), array(array('float'), 8, false, null));
 
-        $this->assertEqual($this->getDeclaration('decimal'), array(array('decimal'), 8, false, null));
-        $this->assertEqual($this->getDeclaration('numeric'), array(array('decimal'), 8, false, null));
-
-        $this->assertEqual($this->getDeclaration('tinyblob'), array(array('blob'), 8, false, null));
-        $this->assertEqual($this->getDeclaration('mediumblob'), array(array('blob'), 8, false, null));
-        $this->assertEqual($this->getDeclaration('longblob'), array(array('blob'), 8, false, null));
-        $this->assertEqual($this->getDeclaration('blob'), array(array('blob'), 8, false, null));
+                */
     }
 }