diff --git modules/filter/filter.install modules/filter/filter.install
index f8850ad..2d9c6af 100644
--- modules/filter/filter.install
+++ modules/filter/filter.install
@@ -205,7 +205,7 @@ function filter_update_7001() {
     if (variable_get('filter_html_' . $format_id, 1) == 2) {
       $insert->values(array(
         'format' => $format_id,
-        'filter' => 'filter',
+        'module' => 'filter',
         'delta' => 4,
         'weight' => 0,
       ));
diff --git modules/simpletest/tests/upgrade/drupal-6.filled.database.php modules/simpletest/tests/upgrade/drupal-6.filled.database.php
index 25092e7..7afa044 100644
--- modules/simpletest/tests/upgrade/drupal-6.filled.database.php
+++ modules/simpletest/tests/upgrade/drupal-6.filled.database.php
@@ -1034,6 +1034,12 @@ db_insert('filter_formats')->fields(array(
   'roles' => '',
   'cache' => '1',
 ))
+->values(array(
+  'format' => '3',
+  'name' => 'Escape HTML Filter',
+  'roles' => '',
+  'cache' => '1',
+))
 ->execute();
 
 db_create_table('filters', array(
@@ -19749,6 +19755,12 @@ db_insert('variable')->fields(array(
   'name' => 'filter_html_1',
   'value' => 'i:1;',
 ))
+// Add the Escape HTML filter to the custom input format 'Escape HTML Filter'
+// to test that the filter may be upgraded to its Drupal 7 equivalent.
+->values(array(
+  'name' => 'filter_html_3',
+  'value' => 'i:2;',
+))
 ->values(array(
   'name' => 'install_profile',
   'value' => 's:7:"default";',