diff --git a/tests/avatar/driver_gravatar_test.php b/tests/avatar/driver_gravatar_test.php
index d0a83c2f22..27ab847ff7 100644
--- a/tests/avatar/driver_gravatar_test.php
+++ b/tests/avatar/driver_gravatar_test.php
@@ -48,27 +48,25 @@ class phpbb_avatar_driver_gravatar_test extends \phpbb_database_test_case
 		$this->config = new \phpbb\config\config(array());
 		$this->request = $this->getMockBuilder(request::class)
 			->disableOriginalConstructor()
-			->setMethods(['get_super_global'])
+			->onlyMethods(['get_super_global'])
 			->getMock();
 		$this->request->method('get_super_global')
 			->willReturn([]);
 		$this->template = $this->getMockBuilder(\phpbb\template\twig\twig::class)
 			->disableOriginalConstructor()
-			->setMethods(['assign_vars'])
+			->onlyMethods(['assign_vars'])
 			->getMock();
 		$this->template->method('assign_vars')
 			->will($this->returnCallback([$this, 'template_assign_vars']));
 		$this->user = $this->getMockBuilder(\phpbb\user::class)
 			->disableOriginalConstructor()
 			->getMock();
-		$filesystem = new \phpbb\filesystem\filesystem();
 		$imagesize = new \FastImageSize\FastImageSize();
 		$cache = $this->createMock('\phpbb\cache\driver\driver_interface');
 		$path_helper =  new \phpbb\path_helper(
 			new \phpbb\symfony_request(
 				$this->request
 			),
-			$filesystem,
 			$this->request,
 			$phpbb_root_path,
 			$phpEx
@@ -77,7 +75,7 @@ class phpbb_avatar_driver_gravatar_test extends \phpbb_database_test_case
 		global $phpbb_dispatcher;
 		$phpbb_dispatcher = $this->getMockBuilder(\phpbb\event\dispatcher::class)
 			->disableOriginalConstructor()
-			->setMethods(['trigger_event'])
+			->onlyMethods(['trigger_event'])
 			->getMock();
 		$phpbb_dispatcher->method('trigger_event')
 			->willReturnArgument(1);
@@ -162,7 +160,7 @@ class phpbb_avatar_driver_gravatar_test extends \phpbb_database_test_case
 
 		$request = $this->getMockBuilder(request::class)
 			->disableOriginalConstructor()
-			->setMethods(['get_super_global'])
+			->onlyMethods(['get_super_global'])
 			->getMock();
 		$request->method('get_super_global')
 			->willReturn([]);
@@ -196,7 +194,7 @@ class phpbb_avatar_driver_gravatar_test extends \phpbb_database_test_case
 			'avatar_width'			=> '70',
 			'avatar_height'			=> '60',
 		];
-		$this->assertEquals('<img src="//gravatar.com/avatar/e0ee9d02824d4320a999507150c5b8a371c635c41f645ba3a7205f36384dc199?s=70" width="70" height="60" alt="" />', $this->gravatar->get_custom_html($this->user, $row));
+		$this->assertEquals('<img class="gravatar" src="//gravatar.com/avatar/e0ee9d02824d4320a999507150c5b8a371c635c41f645ba3a7205f36384dc199?s=70" width="70" height="60" alt="" />', $this->gravatar->get_custom_html($this->user, $row));
 	}
 
 	public function test_get_data(): void