diff --git a/modules/simpletest/tests/upgrade/drupal-6.trigger.database.php b/modules/simpletest/tests/upgrade/drupal-6.trigger.database.php
index 0962f35..e0b7fe6 100644
--- a/modules/simpletest/tests/upgrade/drupal-6.trigger.database.php
+++ b/modules/simpletest/tests/upgrade/drupal-6.trigger.database.php
@@ -74,6 +74,214 @@ 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_trigger_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 message: view'),
+))
+->values(array(
+  'aid' => 'simpletest_upgrade_trigger_presave',
+  '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 message: presave'),
+))
+->values(array(
+  'aid' => 'simpletest_upgrade_trigger_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 message: insert'),
+))
+->values(array(
+  'aid' => 'simpletest_upgrade_trigger_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 message: update'),
+))
+->values(array(
+  'aid' => 'simpletest_upgrade_trigger_delete',
+  'type' => 'system',
+  'callback' => 'system_message_action',
+  'parameters' => serialize(array(
+    'message' => t('This is a test message for the path: delete'),
+  )),
+  'description' => t('Simpletest upgrade path message: delete'),
+))
+->values(array(
+  'aid' => 'simpletest_upgrade_trigger_cron',
+  '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 message: cron'),
+))
+->values(array(
+  'aid' => 'simpletest_upgrade_trigger_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 message: login'),
+))
+->values(array(
+  'aid' => 'simpletest_upgrade_trigger_logout',
+  '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 message: logout'),
+))
+->execute();
+
+db_insert('trigger_assignments')->fields(array(
+  'hook',
+  'op',
+  'aid',
+  'weight',
+))
+->values(array(
+  'hook' => 'comment',
+  'op' => 'view',
+  'aid' => 'simpletest_upgrade_trigger_view',
+  'weight' => '1',
+))
+->values(array(
+  'hook' => 'comment',
+  'op' => 'insert',
+  'aid' => 'simpletest_upgrade_trigger_insert',
+  'weight' => '1',
+))
+->values(array(
+  'hook' => 'comment',
+  'op' => 'update',
+  'aid' => 'simpletest_upgrade_trigger_update',
+  'weight' => '1',
+))
+->values(array(
+  'hook' => 'comment',
+  'op' => 'delete',
+  'aid' => 'simpletest_upgrade_trigger_delete',
+  'weight' => '1',
+))
+
+->values(array(
+  'hook' => 'nodeapi',
+  'op' => 'view',
+  'aid' => 'simpletest_upgrade_trigger_view',
+  'weight' => '1',
+))
+->values(array(
+  'hook' => 'nodeapi',
+  'op' => 'insert',
+  'aid' => 'simpletest_upgrade_trigger_insert',
+  'weight' => '1',
+))
+->values(array(
+  'hook' => 'nodeapi',
+  'op' => 'update',
+  'aid' => 'simpletest_upgrade_trigger_update',
+  'weight' => '1',
+))
+->values(array(
+  'hook' => 'nodeapi',
+  'op' => 'delete',
+  'aid' => 'simpletest_upgrade_trigger_delete',
+  'weight' => '1',
+))
+->values(array(
+  'hook' => 'nodeapi',
+  'op' => 'presave',
+  'aid' => 'simpletest_upgrade_trigger_presave',
+  'weight' => '1',
+))
+
+->values(array(
+  'hook' => 'cron',
+  'op' => 'run',
+  'aid' => 'simpletest_upgrade_trigger_cron',
+  'weight' => '1',
+))
+
+->values(array(
+  'hook' => 'taxonomy',
+  'op' => 'insert',
+  'aid' => 'simpletest_upgrade_trigger_insert',
+  'weight' => '1',
+))
+->values(array(
+  'hook' => 'taxonomy',
+  'op' => 'update',
+  'aid' => 'simpletest_upgrade_trigger_update',
+  'weight' => '1',
+))
+->values(array(
+  'hook' => 'taxonomy',
+  'op' => 'delete',
+  'aid' => 'simpletest_upgrade_trigger_delete',
+  'weight' => '1',
+))
+
+->values(array(
+  'hook' => 'user',
+  'op' => 'view',
+  'aid' => 'simpletest_upgrade_trigger_view',
+  'weight' => '1',
+))
+->values(array(
+  'hook' => 'user',
+  'op' => 'insert',
+  'aid' => 'simpletest_upgrade_trigger_insert',
+  'weight' => '1',
+))
+->values(array(
+  'hook' => 'user',
+  'op' => 'update',
+  'aid' => 'simpletest_upgrade_trigger_update',
+  'weight' => '1',
+))
+->values(array(
+  'hook' => 'user',
+  'op' => 'delete',
+  'aid' => 'simpletest_upgrade_trigger_delete',
+  'weight' => '1',
+))
+->values(array(
+  'hook' => 'user',
+  'op' => 'login',
+  'aid' => 'simpletest_upgrade_trigger_login',
+  'weight' => '1',
+))
+->values(array(
+  'hook' => 'user',
+  'op' => 'logout',
+  'aid' => 'simpletest_upgrade_trigger_logout',
+  'weight' => '1',
+))
+->execute();
+
 db_update('system')->fields(array(
   'schema_version' => '6000',
   'status' => '1',
diff --git a/modules/simpletest/tests/upgrade/drupal-7.trigger.database.php b/modules/simpletest/tests/upgrade/drupal-7.trigger.database.php
index 996f711..93e3777 100644
--- a/modules/simpletest/tests/upgrade/drupal-7.trigger.database.php
+++ b/modules/simpletest/tests/upgrade/drupal-7.trigger.database.php
@@ -26,3 +26,197 @@ db_insert('trigger_assignments')->fields(array(
   'weight' => '1',
 ))
 ->execute();
+
+// Insert a series of actions for further testing.
+db_insert('actions')->fields(array(
+  'aid',
+  'type',
+  'callback',
+  'parameters',
+  'label',
+))
+->values(array(
+  'aid' => 'simpletest_update_trigger_view',
+  'type' => 'system',
+  'callback' => 'system_message_action',
+  'parameters' => serialize(array(
+    'message' => t('System trigger update test.'),
+  )),
+  'label' => t('Simpletest update path message: view'),
+))
+->values(array(
+  'aid' => 'simpletest_update_trigger_update',
+  'type' => 'system',
+  'callback' => 'system_message_action',
+  'parameters' => serialize(array(
+    'message' => t('System trigger update test.'),
+  )),
+  'label' => t('Simpletest update path message: update'),
+))
+->values(array(
+  'aid' => 'simpletest_update_trigger_presave',
+  'type' => 'system',
+  'callback' => 'system_message_action',
+  'parameters' => serialize(array(
+    'message' => t('System trigger update test.'),
+  )),
+  'label' => t('Simpletest update path message: presave'),
+))
+->values(array(
+  'aid' => 'simpletest_update_trigger_insert',
+  'type' => 'system',
+  'callback' => 'system_message_action',
+  'parameters' => serialize(array(
+    'message' => t('System trigger update test.'),
+  )),
+  'label' => t('Simpletest update path message: insert'),
+))
+->values(array(
+  'aid' => 'simpletest_update_trigger_delete',
+  'type' => 'system',
+  'callback' => 'system_message_action',
+  'parameters' => serialize(array(
+    'message' => t('System trigger update test.'),
+  )),
+  'label' => t('Simpletest update path message: delete'),
+))
+->values(array(
+  'aid' => 'simpletest_update_trigger_cron',
+  'type' => 'system',
+  'callback' => 'system_message_action',
+  'parameters' => serialize(array(
+    'message' => t('System trigger update test.'),
+  )),
+  'label' => t('Simpletest update path message: cron'),
+))
+->values(array(
+  'aid' => 'simpletest_update_trigger_login',
+  'type' => 'system',
+  'callback' => 'system_message_action',
+  'parameters' => serialize(array(
+    'message' => t('System trigger update test.'),
+  )),
+  'label' => t('Simpletest update path message: login'),
+))
+->values(array(
+  'aid' => 'simpletest_update_trigger_logout',
+  'type' => 'system',
+  'callback' => 'system_message_action',
+  'parameters' => serialize(array(
+    'message' => t('System trigger update test.'),
+  )),
+  'label' => t('Simpletest update path message: logout'),
+))
+->execute();
+
+// Add actions for all core triggers.
+db_insert('trigger_assignments')->fields(array(
+  'hook',
+  'aid',
+  'weight',
+))
+->values(array(
+  'hook' => 'comment_presave',
+  'aid' => 'simpletest_update_trigger_presave',
+  'weight' => '1',
+))
+->values(array(
+  'hook' => 'comment_insert',
+  'aid' => 'simpletest_update_trigger_insert',
+  'weight' => '1',
+))
+->values(array(
+  'hook' => 'comment_update',
+  'aid' => 'simpletest_update_trigger_update',
+  'weight' => '1',
+))
+->values(array(
+  'hook' => 'comment_delete',
+  'aid' => 'simpletest_update_trigger_delete',
+  'weight' => '1',
+))
+->values(array(
+  'hook' => 'comment_view',
+  'aid' => 'simpletest_update_trigger_view',
+  'weight' => '1',
+))
+
+->values(array(
+  'hook' => 'node_presave',
+  'aid' => 'simpletest_update_trigger_presave',
+  'weight' => '1',
+))
+->values(array(
+  'hook' => 'node_insert',
+  'aid' => 'simpletest_update_trigger_insert',
+  'weight' => '1',
+))
+->values(array(
+  'hook' => 'node_update',
+  'aid' => 'simpletest_update_trigger_update',
+  'weight' => '1',
+))
+->values(array(
+  'hook' => 'node_delete',
+  'aid' => 'simpletest_update_trigger_delete',
+  'weight' => '1',
+))
+->values(array(
+  'hook' => 'node_view',
+  'aid' => 'simpletest_update_trigger_view',
+  'weight' => '1',
+))
+
+->values(array(
+  'hook' => 'taxonomy_term_insert',
+  'aid' => 'simpletest_update_trigger_insert',
+  'weight' => '1',
+))
+->values(array(
+  'hook' => 'taxonomy_term_update',
+  'aid' => 'simpletest_update_trigger_update',
+  'weight' => '1',
+))
+->values(array(
+  'hook' => 'taxonomy_term_delete',
+  'aid' => 'simpletest_update_trigger_delete',
+  'weight' => '1',
+))
+
+->values(array(
+  'hook' => 'cron',
+  'aid' => 'simpletest_update_trigger_cron',
+  'weight' => '1',
+))
+
+->values(array(
+  'hook' => 'user_insert',
+  'aid' => 'simpletest_update_trigger_insert',
+  'weight' => '1',
+))
+->values(array(
+  'hook' => 'user_update',
+  'aid' => 'simpletest_update_trigger_update',
+  'weight' => '1',
+))
+->values(array(
+  'hook' => 'user_delete',
+  'aid' => 'simpletest_update_trigger_delete',
+  'weight' => '1',
+))
+->values(array(
+  'hook' => 'user_view',
+  'aid' => 'simpletest_update_trigger_view',
+  'weight' => '1',
+))
+->values(array(
+  'hook' => 'user_login',
+  'aid' => 'simpletest_update_trigger_login',
+  'weight' => '1',
+))
+->values(array(
+  'hook' => 'user_logout',
+  'aid' => 'simpletest_update_trigger_logout',
+  'weight' => '1',
+))
+->execute();
diff --git a/modules/simpletest/tests/upgrade/update.trigger.test b/modules/simpletest/tests/upgrade/update.trigger.test
index a91f7b9..867fce2 100644
--- a/modules/simpletest/tests/upgrade/update.trigger.test
+++ b/modules/simpletest/tests/upgrade/update.trigger.test
@@ -1,23 +1,23 @@
 <?php
 /**
  * @file
- * Provides upgrade path tests for the Trigger module.
+ * Provides update path tests for the Trigger module.
  */
 
 /**
- * Tests the Trigger 7.0 -> 7.x upgrade path.
+ * Tests the Trigger 7.0 -> 7.x update path.
  */
 class TriggerUpdatePathTestCase extends UpdatePathTestCase {
   public static function getInfo() {
     return array(
       'name'  => 'Trigger update path',
       'description'  => 'Trigger update path tests.',
-      'group' => 'Upgrade path',
+      'group' => 'Update path',
     );
   }
 
   public function setUp() {
-    // Use the filled upgrade path and our trigger data.
+    // Use the filled update path and our trigger data.
     $this->databaseDumpFiles = array(
       drupal_get_path('module', 'simpletest') . '/tests/upgrade/drupal-7.filled.standard_all.database.php.gz',
       drupal_get_path('module', 'simpletest') . '/tests/upgrade/drupal-7.trigger.database.php',
@@ -33,5 +33,39 @@ class TriggerUpdatePathTestCase extends UpdatePathTestCase {
    */
   public function testFilledUpgrade() {
     $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('Save content') .'</td>');
+    $this->assertRaw('<td>'. t('Simpletest update path message: presave') .'</td>');
+    $this->assertRaw('<td>'. t('Simpletest update path message: view') .'</td>');
+    $this->assertRaw('<td>'. t('Simpletest update path message: insert') .'</td>');
+    $this->assertRaw('<td>'. t('Simpletest update path message: update') .'</td>');
+    $this->assertRaw('<td>'. t('Simpletest update path message: delete') .'</td>');
+
+    $this->drupalGet('admin/structure/trigger/node');
+    $this->assertRaw('<td>'. t('Publish content') .'</td>');
+    $this->assertRaw('<td>'. t('Simpletest update path message: presave') .'</td>');
+    $this->assertRaw('<td>'. t('Simpletest update path message: view') .'</td>');
+    $this->assertRaw('<td>'. t('Simpletest update path message: insert') .'</td>');
+    $this->assertRaw('<td>'. t('Simpletest update path message: update') .'</td>');
+    $this->assertRaw('<td>'. t('Simpletest update path message: delete') .'</td>');
+
+    $this->drupalGet('admin/structure/trigger/system');
+    $this->assertNoRaw('<td>'. t('Simpletest update path message: view') .'</td>');
+    $this->assertRaw('<td>'. t('Simpletest update path message: cron') .'</td>');
+
+    $this->drupalGet('admin/structure/trigger/taxonomy');
+    $this->assertRaw('<td>'. t('Simpletest update path message: insert') .'</td>');
+    $this->assertRaw('<td>'. t('Simpletest update path message: update') .'</td>');
+    $this->assertRaw('<td>'. t('Simpletest update path message: delete') .'</td>');
+
+    $this->drupalGet('admin/structure/trigger/user');
+    $this->assertRaw('<td>'. t('Simpletest update path message: view') .'</td>');
+    $this->assertRaw('<td>'. t('Simpletest update path message: insert') .'</td>');
+    $this->assertRaw('<td>'. t('Simpletest update path message: update') .'</td>');
+    $this->assertRaw('<td>'. t('Simpletest update path message: delete') .'</td>');
+    $this->assertRaw('<td>'. t('Simpletest update path message: login') .'</td>');
+    $this->assertRaw('<td>'. t('Simpletest update path message: logout') .'</td>');
   }
 }
diff --git a/modules/simpletest/tests/upgrade/upgrade.trigger.test b/modules/simpletest/tests/upgrade/upgrade.trigger.test
index 7413bed..e5d8c42 100644
--- a/modules/simpletest/tests/upgrade/upgrade.trigger.test
+++ b/modules/simpletest/tests/upgrade/upgrade.trigger.test
@@ -30,10 +30,38 @@ 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 message: view') .'</td>');
+    $this->assertRaw('<td>'. t('Simpletest upgrade path message: insert') .'</td>');
+    $this->assertRaw('<td>'. t('Simpletest upgrade path message: update') .'</td>');
+    $this->assertRaw('<td>'. t('Simpletest upgrade path message: delete') .'</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 message: presave') .'</td>');
+    $this->assertRaw('<td>'. t('Simpletest upgrade path message: view') .'</td>');
+    $this->assertRaw('<td>'. t('Simpletest upgrade path message: insert') .'</td>');
+    $this->assertRaw('<td>'. t('Simpletest upgrade path message: update') .'</td>');
+    $this->assertRaw('<td>'. t('Simpletest upgrade path message: delete') .'</td>');
+
+    $this->drupalGet('admin/structure/trigger/system');
+    $this->assertNoRaw('<td>'. t('Simpletest upgrade path message: view') .'</td>');
+    $this->assertRaw('<td>'. t('Simpletest upgrade path message: cron') .'</td>');
+
+    $this->drupalGet('admin/structure/trigger/taxonomy');
+    $this->assertRaw('<td>'. t('Simpletest upgrade path message: insert') .'</td>');
+    $this->assertRaw('<td>'. t('Simpletest upgrade path message: update') .'</td>');
+    $this->assertRaw('<td>'. t('Simpletest upgrade path message: delete') .'</td>');
+
+    $this->drupalGet('admin/structure/trigger/user');
+    $this->assertRaw('<td>'. t('Simpletest upgrade path message: view') .'</td>');
+    $this->assertRaw('<td>'. t('Simpletest upgrade path message: insert') .'</td>');
+    $this->assertRaw('<td>'. t('Simpletest upgrade path message: update') .'</td>');
+    $this->assertRaw('<td>'. t('Simpletest upgrade path message: delete') .'</td>');
+    $this->assertRaw('<td>'. t('Simpletest upgrade path message: login') .'</td>');
+    $this->assertRaw('<td>'. t('Simpletest upgrade path message: logout') .'</td>');
   }
 }