diff --git a/tests/forms/MemberDatetimeOptionsetFieldTest.php b/tests/forms/MemberDatetimeOptionsetFieldTest.php
index 36e149a49..8fc54eb70 100644
--- a/tests/forms/MemberDatetimeOptionsetFieldTest.php
+++ b/tests/forms/MemberDatetimeOptionsetFieldTest.php
@@ -47,7 +47,7 @@ class MemberDatetimeOptionsetFieldTest extends SapphireTest {
 		$field = $this->createDateFormatFieldForMember($this->objFromFixture('Member', 'noformatmember'));
 		$field->setForm(new Form(new MemberDatetimeOptionsetFieldTest_Controller(), 'Form', new FieldSet(), new FieldSet())); // fake form
 		$parser = new CSSContentParser($field->Field());
-		$xmlArr = $parser->getBySelector('#Form_Form_DateFormat_MMM_d__yyyy');
+		$xmlArr = $parser->getBySelector('#Form_Form_DateFormat_MM_dd_yyyy');
 		$this->assertEquals('checked', (string) $xmlArr[0]['checked']);
 	}
 
@@ -55,7 +55,7 @@ class MemberDatetimeOptionsetFieldTest extends SapphireTest {
 		$field = $this->createTimeFormatFieldForMember($this->objFromFixture('Member', 'noformatmember'));
 		$field->setForm(new Form(new MemberDatetimeOptionsetFieldTest_Controller(), 'Form', new FieldSet(), new FieldSet())); // fake form
 		$parser = new CSSContentParser($field->Field());
-		$xmlArr = $parser->getBySelector('#Form_Form_TimeFormat_h_mm_ss_a');
+		$xmlArr = $parser->getBySelector('#Form_Form_TimeFormat_hh_mm_a');
 		$this->assertEquals('checked', (string) $xmlArr[0]['checked']);
 	}
 
diff --git a/tests/i18n/i18nTest.php b/tests/i18n/i18nTest.php
index a817b9ef0..fc7b75d5a 100644
--- a/tests/i18n/i18nTest.php
+++ b/tests/i18n/i18nTest.php
@@ -75,7 +75,7 @@ class i18nTest extends SapphireTest {
 	
 	function testDateFormatFromLocale() {
 		i18n::set_locale('en_US');
-		$this->assertEquals('MMM d, yyyy', i18n::get_date_format());
+		$this->assertEquals('MM/dd/yyyy', i18n::get_date_format());
 		i18n::set_locale('en_NZ');
 		$this->assertEquals('d/MM/yyyy', i18n::get_date_format());
 		i18n::set_locale('en_US');
@@ -83,7 +83,7 @@ class i18nTest extends SapphireTest {
 	
 	function testTimeFormatFromLocale() {
 		i18n::set_locale('en_US');
-		$this->assertEquals('h:mm:ss a', i18n::get_time_format());
+		$this->assertEquals('hh:mm a', i18n::get_time_format());
 		i18n::set_locale('de_DE');
 		$this->assertEquals('HH:mm:ss', i18n::get_time_format());
 		i18n::set_locale('en_US');
@@ -91,14 +91,14 @@ class i18nTest extends SapphireTest {
 	
 	function testDateFormatCustom() {
 		i18n::set_locale('en_US');
-		$this->assertEquals('MMM d, yyyy', i18n::get_date_format());
+		$this->assertEquals('MM/dd/yyyy', i18n::get_date_format());
 		i18n::set_date_format('d/MM/yyyy');
 		$this->assertEquals('d/MM/yyyy', i18n::get_date_format());
 	}
 	
 	function testTimeFormatCustom() {
 		i18n::set_locale('en_US');
-		$this->assertEquals('h:mm:ss a', i18n::get_time_format());
+		$this->assertEquals('hh:mm a', i18n::get_time_format());
 		i18n::set_time_format('HH:mm:ss');
 		$this->assertEquals('HH:mm:ss', i18n::get_time_format());
 	}
diff --git a/tests/security/MemberTest.php b/tests/security/MemberTest.php
index 0e6f1dfd2..2c50ef49c 100644
--- a/tests/security/MemberTest.php
+++ b/tests/security/MemberTest.php
@@ -300,8 +300,8 @@ class MemberTest extends FunctionalTest {
 	
 	function testMemberWithNoDateFormatFallsbackToGlobalLocaleDefaultFormat() {
 		$member = $this->objFromFixture('Member', 'noformatmember');
-		$this->assertEquals('MMM d, yyyy', $member->DateFormat);
-		$this->assertEquals('h:mm:ss a', $member->TimeFormat);
+		$this->assertEquals('MM/dd/yyyy', $member->DateFormat);
+		$this->assertEquals('hh:mm a', $member->TimeFormat);
 	}
 	
 	function testMemberWithNoDateFormatFallsbackToTheirLocaleDefaultFormat() {