diff --git modules/system/system.test modules/system/system.test
index d32b3ae..2852493 100644
--- modules/system/system.test
+++ modules/system/system.test
@@ -935,7 +935,7 @@ class DateTimeFunctionalTest extends DrupalWebTestCase {
   }
 
   function setUp() {
-    parent::setUp();
+    parent::setUp(array('locale'));
 
     // Create admin user and log in admin user.
     $this->admin_user = $this->drupalCreateUser(array('administer site configuration'));
@@ -1044,6 +1044,70 @@ class DateTimeFunctionalTest extends DrupalWebTestCase {
     $this->assertEqual($this->getUrl(), url('admin/config/regional/date-time/formats', array('absolute' => TRUE)), t('Correct page redirection.'));
     $this->assertText(t('Removed date format'), 'Custom date format removed successfully.');
   }
+
+  /**
+   * Test if the date formats are stored properly.
+   */
+  function testDateFormatStorage() {
+    $date_format = array(
+      'type' => 'short',
+      'format' => 'dmYHis',
+      'locked' => 0,
+      'is_new' => 1,
+    );
+    system_date_format_save($date_format);
+
+    $query = db_select('date_formats', 'df');
+    $query->addField('df', 'format');
+    $query->condition('type', 'short');
+    $query->condition('format', 'dmYHis');
+    $format = $query->execute()->fetchColumn();
+    $this->verbose($format);
+    $this->assertEqual('dmYHis', $format, 'Unlocalized date format resides in general table.');
+
+    $query = db_select('date_format_locale', 'dfl');
+    $query->addField('dfl', 'format');
+    $query->condition('type', 'short');
+    $query->condition('format', 'dmYHis');
+    $format = $query->execute()->fetchColumn();
+    $this->assertFalse($format, 'Unlocalized date format resides not in localized table.');
+
+    // Enable German language
+    locale_add_language('de', NULL, NULL, LANGUAGE_LTR, '', '', TRUE, 'en');
+
+    $date_format = array(
+      'type' => 'short',
+      'format' => 'YMDHis',
+      'locales' => array('de', 'tr'),
+      'locked' => 0,
+      'is_new' => 1,
+    );
+    system_date_format_save($date_format);
+
+    $query = db_select('date_format_locale', 'dfl');
+    $query->addField('dfl', 'format');
+    $query->condition('type', 'short');
+    $query->condition('format', 'YMDHis');
+    $query->condition('language', 'de');
+    $format = $query->execute()->fetchColumn();
+    $this->assertEqual('YMDHis', $format, 'Localized date format resides in localized table.');
+
+    $query = db_select('date_formats', 'df');
+    $query->addField('df', 'format');
+    $query->condition('type', 'short');
+    $query->condition('format', 'YMDHis');
+    $format = $query->execute()->fetchColumn();
+    $this->assertEqual('YMDHis', $format, 'Localized date format resides in general table too.');
+
+    $query = db_select('date_format_locale', 'dfl');
+    $query->addField('dfl', 'format');
+    $query->condition('type', 'short');
+    $query->condition('format', 'YMDHis');
+    $query->condition('language', 'tr');
+    $format = $query->execute()->fetchColumn();
+    $this->assertFalse($format, 'Localized date format for disabled language is ignored.');
+
+  }
 }
 
 class PageTitleFiltering extends DrupalWebTestCase {