diff --git a/tests/event/fixtures/trigger_many_vars.test b/tests/event/fixtures/trigger_many_vars.test
index fadfcffefc..da72f4c57f 100644
--- a/tests/event/fixtures/trigger_many_vars.test
+++ b/tests/event/fixtures/trigger_many_vars.test
@@ -39,7 +39,27 @@
 	*		post_id, topic_id, forum_id, submit, preview, save, load,
 	*		delete, cancel, refresh, error, page_data, message_parser
 	*/
-	$vars = array('post_data', 'moderators', 'mode', 'page_title', 's_topic_icons', 'form_enctype');
-	$vars = array_merge($vars, array('s_action', 's_hidden_fields', 'post_id', 'topic_id', 'forum_id', 'submit', 'preview'));
-	$vars = array_merge($vars, array('save', 'load', 'delete', 'cancel', 'refresh', 'error', 'page_data', 'message_parser'));
+	$vars = array(
+		'post_data',
+		'moderators',
+		'mode',
+		'page_title',
+		's_topic_icons',
+		'form_enctype',
+		's_action',
+		's_hidden_fields',
+		'post_id',
+		'topic_id',
+		'forum_id',
+		'submit',
+		'preview',
+		'save',
+		'load',
+		'delete',
+		'cancel',
+		'refresh',
+		'error',
+		'page_data',
+		'message_parser',
+	);
 	extract($phpbb_dispatcher->trigger_event('core.posting_modify_template_vars', compact($vars)));
diff --git a/tests/event/php_exporter_test.php b/tests/event/php_exporter_test.php
index 5df7713bdf..03f6974af1 100644
--- a/tests/event/php_exporter_test.php
+++ b/tests/event/php_exporter_test.php
@@ -343,47 +343,77 @@ class phpbb_event_php_exporter_test extends phpbb_test_case
 				array(
 					'/**',
 					'*/',
-					'$phpbb_dispatcher->dispatch(\'test\');',
+					'$phpbb_dispatcher->trigger_event(\'test\', compact($vars));',
 				),
 				2,
-				3,
+				1,
 			),
 			array(
 				array(
 					'/**',
 					'*/',
 					'$vars = $bertie;',
-					'$phpbb_dispatcher->dispatch(\'test\');',
+					'$phpbb_dispatcher->trigger_event(\'test\', compact($vars));',
 				),
 				3,
-				3,
-			),
-			array(
-				array(
-					'/**',
-					'*/',
-					'$vars = array();',
-					'$phpbb_dispatcher->dispatch(\'test\');',
-				),
-				3,
-				3,
-			),
-			array(
-				array(
-					'/**',
-					'*/',
-					'$vars = array(\'test2\', \'\');',
-					'$phpbb_dispatcher->dispatch(\'test\');',
-				),
-				3,
-				4,
+				1,
 			),
 			array(
 				array(
 					'/**',
 					'*/',
 					'$vars = array(\'$bertie\');',
-					'$phpbb_dispatcher->dispatch(\'test\');',
+					'$phpbb_dispatcher->trigger_event(\'test\', compact($vars));',
+				),
+				3,
+				1,
+			),
+			array(
+				array(
+					'/**',
+					'*/',
+					'$vars = array();',
+					'$phpbb_dispatcher->trigger_event(\'test\', compact($vars));',
+				),
+				3,
+				1,
+			),
+			array(
+				array(
+					'/**',
+					'*/',
+					'$vars = array(\'t1\', \'t2\', \'t3\', \'t4\', \'t5\', \'t6\', \'t7\');',
+					'$phpbb_dispatcher->trigger_event(\'test\', compact($vars));',
+				),
+				3,
+				2,
+			),
+			array(
+				array(
+					'/**',
+					'*/',
+					'$vars = array(\'test2\', \'\');',
+					'$phpbb_dispatcher->trigger_event(\'test\', compact($vars));',
+				),
+				3,
+				3,
+			),
+			array(
+				array(
+					'/**',
+					'*/',
+					'$vars = array(\'bertie\'\');',
+					'$phpbb_dispatcher->trigger_event(\'test\', compact($vars));',
+				),
+				3,
+				3,
+			),
+			array(
+				array(
+					'/**',
+					'*/',
+					'$vars = array(\'bertie\',\'basically_valid\');',
+					'$phpbb_dispatcher->trigger_event(\'test\', compact($vars));',
 				),
 				3,
 				3,