diff --git a/model/fieldtypes/Date.php b/model/fieldtypes/Date.php
index 0dfe6dec7..c7c630b31 100644
--- a/model/fieldtypes/Date.php
+++ b/model/fieldtypes/Date.php
@@ -169,7 +169,7 @@ class Date extends DBField {
 		}
 		
 		$formatD = $member->getDateFormat();
-		$zendDate = new Zend_Date($this->getValue());
+		$zendDate = new Zend_Date($this->getValue(), 'y-MM-dd');
 		
 		return $zendDate->toString($formatD);
 	}		
diff --git a/model/fieldtypes/Datetime.php b/model/fieldtypes/Datetime.php
index 7ff556fdb..933a09297 100644
--- a/model/fieldtypes/Datetime.php
+++ b/model/fieldtypes/Datetime.php
@@ -112,7 +112,7 @@ class SS_Datetime extends Date implements TemplateGlobalProvider {
 		$formatD = $member->getDateFormat();
 		$formatT = $member->getTimeFormat();
 		
-		$zendDate = new Zend_Date($this->getValue());
+		$zendDate = new Zend_Date($this->getValue(), 'y-MM-dd HH:mm:ss');
 		return $zendDate->toString($formatD).' '.$zendDate->toString($formatT);
 	}	
 
diff --git a/tests/model/DateTest.php b/tests/model/DateTest.php
index 3f471c607..16f433a85 100644
--- a/tests/model/DateTest.php
+++ b/tests/model/DateTest.php
@@ -212,7 +212,8 @@ class DateTest extends SapphireTest {
 		$fixtures = array(
 			'2000-12-31' => '31/12/2000',
 			'31-12-2000' => '31/12/2000',
-			'31/12/2000' => '31/12/2000'
+			'31/12/2000' => '31/12/2000',
+			'2014-04-01' => '01/04/2014'
 		);
 		
 		foreach($fixtures as $from => $to) {
diff --git a/tests/model/DatetimeTest.php b/tests/model/DatetimeTest.php
index 66c97fedd..a1cab8944 100644
--- a/tests/model/DatetimeTest.php
+++ b/tests/model/DatetimeTest.php
@@ -162,11 +162,12 @@ class SS_DatetimeTest extends SapphireTest {
 			'2000-12-31 1:11:01' => '31/12/2000 01:11:01',
 			'12/12/2000 1:11:01' => '12/12/2000 01:11:01',
 			'2000-12-31' => '31/12/2000 12:00:00',
+			'2014-04-01 10:11:01' => '01/04/2014 10:11:01',
 			'10:11:01' => date('d/m/Y').' 10:11:01'
 		);
 	
 		foreach($fixtures as $from => $to) {
-			$date = DBField::create_field('Datetime', $from);
+			$date = DBField::create_field('SS_Datetime', $from);
 			// With member
 			$this->assertEquals($to, $date->FormatFromSettings($member));
 			// Without member