diff --git a/core/modules/image/image.field.inc b/core/modules/image/image.field.inc
index 7a38df4aff70bfca97bf55c2692e1b730a450361..aef6be748538e65ef8add4b8a7554d11faa82555 100644
--- a/core/modules/image/image.field.inc
+++ b/core/modules/image/image.field.inc
@@ -404,7 +404,7 @@ function image_field_widget_process($element, &$form_state, $form) {
     '#default_value' => isset($item['alt']) ? $item['alt'] : '',
     '#description' => t('This text will be used by screen readers, search engines, or when the image cannot be loaded.'),
     // @see http://www.gawds.org/show.php?contentid=28
-    '#maxlength' => 128,
+    '#maxlength' => 512,
     '#weight' => -2,
     '#access' => (bool) $item['fid'] && $settings['alt_field'],
   );
@@ -413,7 +413,7 @@ function image_field_widget_process($element, &$form_state, $form) {
     '#title' => t('Title'),
     '#default_value' => isset($item['title']) ? $item['title'] : '',
     '#description' => t('The title is used as a tool tip when the user hovers the mouse over the image.'),
-    '#maxlength' => 128,
+    '#maxlength' => 1024,
     '#weight' => -1,
     '#access' => (bool) $item['fid'] && $settings['title_field'],
   );
diff --git a/core/modules/image/image.install b/core/modules/image/image.install
index 4d4399cc1367ba6aac2d04930a42d6da8619c60f..02be57ca4c5f810c6eb901d25f028839e12d068d 100644
--- a/core/modules/image/image.install
+++ b/core/modules/image/image.install
@@ -118,13 +118,13 @@ function image_field_schema($field) {
       'alt' => array(
         'description' => "Alternative image text, for the image's 'alt' attribute.",
         'type' => 'varchar',
-        'length' => 128,
+        'length' => 512,
         'not null' => FALSE,
       ),
       'title' => array(
         'description' => "Image title text, for the image's 'title' attribute.",
         'type' => 'varchar',
-        'length' => 128,
+        'length' => 1024,
         'not null' => FALSE,
       ),
       'width' => array(
diff --git a/core/modules/image/image.test b/core/modules/image/image.test
index 6fa015e8aec6f73d10e77b01f8e8539fb9d0287e..0fc2a4c4723d96ed8407f433b3d9507e686746c8 100644
--- a/core/modules/image/image.test
+++ b/core/modules/image/image.test
@@ -746,7 +746,10 @@ class ImageFieldDisplayTestCase extends ImageFieldTestCase {
     $widget_settings = array(
       'preview_image_style' => 'medium',
     );
-    $this->createImageField($field_name, 'article', array(), $instance_settings, $widget_settings);
+    $field = $this->createImageField($field_name, 'article', array(), $instance_settings, $widget_settings);
+    $field['deleted'] = 0;
+    $table = _field_sql_storage_tablename($field);
+    $schema = drupal_get_schema($table, TRUE);
     $instance = field_info_instance('node', $field_name, 'article');
 
     $this->drupalGet('node/add/article');
@@ -789,18 +792,17 @@ class ImageFieldDisplayTestCase extends ImageFieldTestCase {
 
     // Verify that alt/title longer than allowed results in a validation error.
     $test_size = 2000;
-    $max_size = 128;
     $edit = array(
       $field_name . '[' . LANGUAGE_NONE . '][0][alt]' => $this->randomName($test_size),
       $field_name . '[' . LANGUAGE_NONE . '][0][title]' => $this->randomName($test_size),
     );
     $this->drupalPost('node/' . $nid . '/edit', $edit, t('Save'));
     $this->assertRaw(t('Alternate text cannot be longer than %max characters but is currently %length characters long.', array(
-      '%max' => $max_size,
+      '%max' => $schema['fields'][$field_name .'_alt']['length'],
       '%length' => $test_size,
     )));
     $this->assertRaw(t('Title cannot be longer than %max characters but is currently %length characters long.', array(
-      '%max' => $max_size,
+      '%max' => $schema['fields'][$field_name .'_title']['length'],
       '%length' => $test_size,
     )));
   }