diff --git a/modules/system/system.test b/modules/system/system.test
index ec71093..e237ac8 100644
--- a/modules/system/system.test
+++ b/modules/system/system.test
@@ -1275,6 +1275,38 @@ class DateTimeFunctionalTest extends DrupalWebTestCase {
 
 
   /**
+   * Test the default date type formats are consistent.
+   */
+  function testDefaultDateFormats() {
+    // These are the default format values from format_date().
+    $default_formats = array(
+      'short' => 'm/d/Y - H:i',
+      'medium' => 'D, m/d/Y - H:i',
+      'long' => 'l, F j, Y - H:i',
+    );
+
+    // Clear the date format variables.
+    variable_del('date_format_short');
+    variable_del('date_format_medium');
+    variable_del('date_format_long');
+
+    $this->drupalGet('admin/config/regional/date-time');
+
+    foreach ($default_formats as $format_name => $format_value) {
+      // Check that the configuration fields match the default format.
+      $this->assertFieldByXPath(
+        "//select[@name=date_format_{$format_name}]/option[@selected='selected']",
+        $format_value,
+        t('The @type format type matches the expected format @format',
+        array(
+          '@type' => $format_name,
+          '@format' => $format_value,
+        )
+      ));
+    }
+  }
+
+  /**
    * Test time zones and DST handling.
    */
   function testTimeZoneHandling() {