diff --git a/tests/notification/ext/test/notification/type/test.php b/tests/notification/ext/test/notification/type/test.php
index 7f3b4a4ef1..f325efba6e 100644
--- a/tests/notification/ext/test/notification/type/test.php
+++ b/tests/notification/ext/test/notification/type/test.php
@@ -28,26 +28,26 @@ class test extends \phpbb\notification\type\base
 		return 'test';
 	}
 
-	public static function get_item_id($post)
+	public static function get_item_id($type_data)
 	{
-		return (int) $post['post_id'];
+		return (int) $type_data['post_id'];
 	}
 
-	public static function get_item_parent_id($post)
+	public static function get_item_parent_id($type_data)
 	{
-		return (int) $post['topic_id'];
+		return (int) $type_data['topic_id'];
 	}
 
-	public function find_users_for_notification($post, $options = array())
+	public function find_users_for_notification($type_data, $options = array())
 	{
 		return $this->check_user_notification_options(array(0), $options);
 	}
 
-	public function create_insert_array($post, $pre_create_data = array())
+	public function create_insert_array($type_data, $pre_create_data = array())
 	{
-		$this->notification_time = $post['post_time'];
+		$this->notification_time = $type_data['post_time'];
 
-		parent::create_insert_array($post, $pre_create_data);
+		parent::create_insert_array($type_data, $pre_create_data);
 	}
 
 	public function create_update_array($type_data)
diff --git a/tests/template/template_test_case.php b/tests/template/template_test_case.php
index 52c76b13a5..fc24600799 100644
--- a/tests/template/template_test_case.php
+++ b/tests/template/template_test_case.php
@@ -120,21 +120,11 @@ class phpbb_template_template_test_case extends phpbb_test_case
 		// Test the engine can be used
 		$this->setup_engine();
 
-		$this->template->clear_cache();
-
 		global $phpbb_filesystem;
 
 		$phpbb_filesystem = new \phpbb\filesystem\filesystem();
 	}
 
-	protected function tearDown(): void
-	{
-		if ($this->template)
-		{
-			$this->template->clear_cache();
-		}
-	}
-
 	protected function run_template($file, array $vars, array $block_vars, array $destroy, $expected, $lang_vars = array())
 	{
 		$this->template->set_filenames(array('test' => $file));
diff --git a/tests/text_formatter/s9e/factory_test.php b/tests/text_formatter/s9e/factory_test.php
index 6e2de36058..9ab32999d8 100644
--- a/tests/text_formatter/s9e/factory_test.php
+++ b/tests/text_formatter/s9e/factory_test.php
@@ -271,7 +271,7 @@ class phpbb_textformatter_s9e_factory_test extends phpbb_database_test_case
 		$log = $this->getMockBuilder('phpbb\\log\\log_interface')->getMock();
 		$log->expects($this->once())
 			->method('add')
-			->with('critical', null, null, 'LOG_BBCODE_CONFIGURATION_ERROR', false, ['[x !x]{TEXT}[/x]', 'Cannot interpret the BBCode definition']);
+			->with('critical', ANONYMOUS, '', 'LOG_BBCODE_CONFIGURATION_ERROR', false, ['[x !x]{TEXT}[/x]', 'Cannot interpret the BBCode definition']);
 
 		$container = new phpbb_mock_container_builder;
 		$container->set('log', $log);
diff --git a/tests/text_formatter/s9e/renderer_test.php b/tests/text_formatter/s9e/renderer_test.php
index d0ca520ea0..51f4f923b4 100644
--- a/tests/text_formatter/s9e/renderer_test.php
+++ b/tests/text_formatter/s9e/renderer_test.php
@@ -437,8 +437,8 @@ class phpbb_textformatter_s9e_renderer_test extends phpbb_test_case
 	{
 		return isset($vars['renderer'])
 			&& $vars['renderer'] instanceof \phpbb\textformatter\s9e\renderer
-			&& isset($vars['xml'])
-			&& $vars['xml'] === '<t>...</t>';
+			&& isset($vars['text'])
+			&& $vars['text'] === '<t>...</t>';
 	}
 
 	public function render_after_event_callback($vars)