diff --git a/modules/simpletest/tests/upgrade/drupal-6.trigger.database.php b/modules/simpletest/tests/upgrade/drupal-6.trigger.database.php
index 0962f35..3f7605a 100644
--- a/modules/simpletest/tests/upgrade/drupal-6.trigger.database.php
+++ b/modules/simpletest/tests/upgrade/drupal-6.trigger.database.php
@@ -74,6 +74,165 @@ db_insert('trigger_assignments')->fields(array(
 ))
 ->execute();
 
+// Add all the configurations for system_message_action
+db_insert('actions')->fields(array(
+  'aid',
+  'type',
+  'callback',
+  'parameters',
+  'description',
+))
+->values(array(
+  'aid' => 'simpletest_upgrade_1_view',
+  'type' => 'system',
+  'callback' => 'system_message_action',
+  'parameters' => serialize(array(
+    'message' => t('This is a test message for the upgrade path.'),
+  )),
+  'description' => t('Simpletest upgrade path view message'),
+))
+->values(array(
+  'aid' => 'simpletest_upgrade_2_insert',
+  'type' => 'system',
+  'callback' => 'system_message_action',
+  'parameters' => serialize(array(
+    'message' => t('This is a test message for the upgrade path.'),
+  )),
+  'description' => t('Simpletest upgrade path insert message'),
+))
+->values(array(
+  'aid' => 'simpletest_upgrade_3_update',
+  'type' => 'system',
+  'callback' => 'system_message_action',
+  'parameters' => serialize(array(
+    'message' => t('This is a test message for the upgrade path.'),
+  )),
+  'description' => t('Simpletest upgrade path update message'),
+))
+->values(array(
+  'aid' => 'simpletest_upgrade_4_delete',
+  'type' => 'system',
+  'callback' => 'system_message_action',
+  'parameters' => serialize(array(
+    'message' => t('This is a test message for the upgrade path.'),
+  )),
+  'description' => t('Simpletest upgrade path delete message'),
+))
+->values(array(
+  'aid' => 'simpletest_upgrade_5_login',
+  'type' => 'system',
+  'callback' => 'system_message_action',
+  'parameters' => serialize(array(
+    'message' => t('This is a test message for the upgrade path.'),
+  )),
+  'description' => t('Simpletest upgrade path login message'),
+))
+->execute();
+
+db_insert('trigger_assignments')->fields(array(
+  'hook',
+  'op',
+  'aid',
+  'weight',
+))
+->values(array(
+  'hook' => 'nodeapi',
+  'op' => 'view',
+  'aid' => 'simpletest_upgrade_1_view',
+  'weight' => '1',
+))
+->values(array(
+  'hook' => 'nodeapi',
+  'op' => 'insert',
+  'aid' => 'simpletest_upgrade_2_insert',
+  'weight' => '1',
+))
+->values(array(
+  'hook' => 'nodeapi',
+  'op' => 'update',
+  'aid' => 'simpletest_upgrade_3_update',
+  'weight' => '1',
+))
+->values(array(
+  'hook' => 'nodeapi',
+  'op' => 'delete',
+  'aid' => 'simpletest_upgrade_4_delete',
+  'weight' => '1',
+))
+->values(array(
+  'hook' => 'comment',
+  'op' => 'view',
+  'aid' => 'simpletest_upgrade_1_view',
+  'weight' => '1',
+))
+->values(array(
+  'hook' => 'comment',
+  'op' => 'insert',
+  'aid' => 'simpletest_upgrade_2_insert',
+  'weight' => '1',
+))
+->values(array(
+  'hook' => 'comment',
+  'op' => 'update',
+  'aid' => 'simpletest_upgrade_3_update',
+  'weight' => '1',
+))
+->values(array(
+  'hook' => 'comment',
+  'op' => 'delete',
+  'aid' => 'simpletest_upgrade_4_delete',
+  'weight' => '1',
+))
+->values(array(
+  'hook' => 'user',
+  'op' => 'view',
+  'aid' => 'simpletest_upgrade_1_view',
+  'weight' => '1',
+))
+->values(array(
+  'hook' => 'user',
+  'op' => 'insert',
+  'aid' => 'simpletest_upgrade_2_insert',
+  'weight' => '1',
+))
+->values(array(
+  'hook' => 'user',
+  'op' => 'update',
+  'aid' => 'simpletest_upgrade_3_update',
+  'weight' => '1',
+))
+->values(array(
+  'hook' => 'user',
+  'op' => 'delete',
+  'aid' => 'simpletest_upgrade_4_delete',
+  'weight' => '1',
+))
+->values(array(
+  'hook' => 'user',
+  'op' => 'login',
+  'aid' => 'simpletest_upgrade_5_login',
+  'weight' => '1',
+))
+->values(array(
+  'hook' => 'taxonomy',
+  'op' => 'insert',
+  'aid' => 'simpletest_upgrade_2_insert',
+  'weight' => '1',
+))
+->values(array(
+  'hook' => 'taxonomy',
+  'op' => 'update',
+  'aid' => 'simpletest_upgrade_3_update',
+  'weight' => '1',
+))
+->values(array(
+  'hook' => 'taxonomy',
+  'op' => 'delete',
+  'aid' => 'simpletest_upgrade_4_delete',
+  'weight' => '1',
+))
+->execute();
+
 db_update('system')->fields(array(
   'schema_version' => '6000',
   'status' => '1',
diff --git a/modules/simpletest/tests/upgrade/upgrade.trigger.test b/modules/simpletest/tests/upgrade/upgrade.trigger.test
index 7413bed..84f97da 100644
--- a/modules/simpletest/tests/upgrade/upgrade.trigger.test
+++ b/modules/simpletest/tests/upgrade/upgrade.trigger.test
@@ -30,10 +30,29 @@ class UpgradePathTriggerTestCase extends UpgradePathTestCase {
    */
   public function testTaxonomyUpgrade() {
     $this->assertTrue($this->performUpgrade(), t('The upgrade was completed successfully.'));
+    $this->drupalGet('admin/structure/trigger/comment');
+    $this->assertRaw('<td>'. t('Publish comment') .'</td>');
+    $this->assertRaw('<td>'. t('Simpletest upgrade path view message') .'</td>');
+    $this->assertRaw('<td>'. t('Simpletest upgrade path insert message') .'</td>');
+    $this->assertRaw('<td>'. t('Simpletest upgrade path update message') .'</td>');
+    $this->assertRaw('<td>'. t('Simpletest upgrade path delete message') .'</td>');
     $this->drupalGet('admin/structure/trigger/node');
     $this->assertRaw('<td>'. t('Make post sticky') .'</td>');
     $this->assertRaw('<td>'. t('Publish post') .'</td>');
-    $this->drupalGet('admin/structure/trigger/comment');
-    $this->assertRaw('<td>'. t('Publish comment') .'</td>');
+    $this->assertRaw('<td>'. t('Simpletest upgrade path view message') .'</td>');
+    $this->assertRaw('<td>'. t('Simpletest upgrade path insert message') .'</td>');
+    $this->assertRaw('<td>'. t('Simpletest upgrade path update message') .'</td>');
+    $this->assertRaw('<td>'. t('Simpletest upgrade path delete message') .'</td>');
+    $this->drupalGet('admin/structure/trigger/sytem');
+    $this->drupalGet('admin/structure/trigger/taxonomy');
+    $this->assertRaw('<td>'. t('Simpletest upgrade path insert message') .'</td>');
+    $this->assertRaw('<td>'. t('Simpletest upgrade path update message') .'</td>');
+    $this->assertRaw('<td>'. t('Simpletest upgrade path delete message') .'</td>');
+    $this->drupalGet('admin/structure/trigger/user');
+    $this->assertRaw('<td>'. t('Simpletest upgrade path view message') .'</td>');
+    $this->assertRaw('<td>'. t('Simpletest upgrade path insert message') .'</td>');
+    $this->assertRaw('<td>'. t('Simpletest upgrade path update message') .'</td>');
+    $this->assertRaw('<td>'. t('Simpletest upgrade path delete message') .'</td>');
+    $this->assertRaw('<td>'. t('Simpletest upgrade path login message') .'</td>');
   }
 }
diff --git a/modules/trigger/trigger.install b/modules/trigger/trigger.install
index 20d5c3a..5e68110 100644
--- a/modules/trigger/trigger.install
+++ b/modules/trigger/trigger.install
@@ -105,3 +105,31 @@ function trigger_update_7002() {
       ->execute();
   }
 }
+
+/**
+ * Renames taxonomy to taxonomy_term.
+ */
+function trigger_update_7003() {
+  $result = db_query("SELECT hook, aid FROM {trigger_assignments}");
+
+  foreach($result as $record) {
+    $pattern = array(
+      'taxonomy_view',
+      'taxonomy_insert',
+      'taxonomy_update',
+      'taxonomy_delete',
+    );
+    $replacement = array(
+      'taxonomy_term_view',
+      'taxonomy_term_insert',
+      'taxonomy_term_update',
+      'taxonomy_term_delete',
+    );
+    $new_hook = str_replace($pattern, $replacement, $record->hook);
+    db_update('trigger_assignments')
+      ->fields(array('hook' => $new_hook))
+      ->condition('hook', $record->hook)
+      ->condition('aid', $record->aid)
+      ->execute();
+  }
+}
\ No newline at end of file