Index: modules/trigger/trigger.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/trigger/trigger.install,v
retrieving revision 1.16
diff -u -p -r1.16 trigger.install
--- modules/trigger/trigger.install	4 Dec 2009 16:49:47 -0000	1.16
+++ modules/trigger/trigger.install	29 Mar 2010 00:01:19 -0000
@@ -48,6 +48,12 @@ function trigger_schema() {
 function trigger_install() {
   // Do initial synchronization of actions in code and the database.
   actions_synchronize();
+
+  // Trigger should go last to allow other modules make their changes.
+  db_update('system')
+    ->fields(array('weight' => 5))
+    ->condition('name', 'trigger')
+    ->execute();
 }
 
 /**
@@ -66,3 +72,15 @@ function trigger_update_7000() {
   }
   db_drop_field('trigger_assignments', 'op');
 }
+
+/**
+ * Set system.weight to a high value for trigger module.
+ *
+ * Trigger should go last to allow other modules make their changes.
+ */
+function trigger_update_7001() {
+  db_update('system')
+    ->fields(array('weight' => 5))
+    ->condition('name', 'trigger')
+    ->execute();
+}
Index: modules/trigger/trigger.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/trigger/trigger.test,v
retrieving revision 1.30
diff -u -p -r1.30 trigger.test
--- modules/trigger/trigger.test	27 Mar 2010 18:32:06 -0000	1.30
+++ modules/trigger/trigger.test	29 Mar 2010 00:01:19 -0000
@@ -114,7 +114,7 @@ class TriggerContentTestCase extends Tri
     $action_id = 'trigger_test_generic_any_action';
     $hash = md5($action_id);
     $edit = array('aid' => $hash);
-    $this->drupalPost('admin/structure/trigger/node', $edit, t('Assign'));
+    $this->drupalPost('admin/structure/trigger/node', $edit, t('Assign'), array(), array(), 'trigger-node-update-assign-form');
 
     $edit = array(
       'operation' => 'unpublish',
@@ -122,7 +122,8 @@ class TriggerContentTestCase extends Tri
       'nodes[2]' => TRUE,
     );
     $this->drupalPost('admin/content', $edit, t('Update'));
-    $this->assertTrue(variable_get('trigger_test_generic_any_action', 0) == 2, 'Action was triggered 2 times.');
+    $count = variable_get('trigger_test_generic_any_action', 0);
+    $this->assertTrue($count == 2, t('Action was triggered 2 times. Actual: %count', array('%count' => $count)));
   }
 
   /**