diff --git a/tests/Core/Controller/AvatarControllerTest.php b/tests/Core/Controller/AvatarControllerTest.php
index 5c0814dbf860e..256f566579520 100644
--- a/tests/Core/Controller/AvatarControllerTest.php
+++ b/tests/Core/Controller/AvatarControllerTest.php
@@ -38,6 +38,7 @@ function is_uploaded_file($filename) {
 use OCP\Files\IRootFolder;
 use OCP\Files\NotFoundException;
 use OCP\Files\NotPermittedException;
+use OCP\Files\SimpleFS\ISimpleFile;
 use OCP\IAvatar;
 use OCP\IAvatarManager;
 use OCP\ICache;
@@ -59,7 +60,7 @@ class AvatarControllerTest extends \Test\TestCase {
 	private $avatarMock;
 	/** @var IUser|\PHPUnit\Framework\MockObject\MockObject */
 	private $userMock;
-	/** @var File|\PHPUnit\Framework\MockObject\MockObject */
+	/** @var ISimpleFile|\PHPUnit\Framework\MockObject\MockObject */
 	private $avatarFile;
 
 	/** @var IAvatarManager|\PHPUnit\Framework\MockObject\MockObject */
@@ -115,7 +116,7 @@ protected function setUp(): void {
 		$this->userManager->method('get')
 			->willReturnMap([['userId', $this->userMock]]);
 
-		$this->avatarFile = $this->getMockBuilder('OCP\Files\File')->getMock();
+		$this->avatarFile = $this->getMockBuilder(ISimpleFile::class)->getMock();
 		$this->avatarFile->method('getContent')->willReturn('image data');
 		$this->avatarFile->method('getMimeType')->willReturn('image type');
 		$this->avatarFile->method('getEtag')->willReturn('my etag');
diff --git a/tests/Core/Controller/LoginControllerTest.php b/tests/Core/Controller/LoginControllerTest.php
index 551e8917482f6..cee3da6599449 100644
--- a/tests/Core/Controller/LoginControllerTest.php
+++ b/tests/Core/Controller/LoginControllerTest.php
@@ -228,7 +228,7 @@ public function testShowLoginFormForLoggedInUsers() {
 			->willReturn('/default/foo');
 
 		$expectedResponse = new RedirectResponse('/default/foo');
-		$this->assertEquals($expectedResponse, $this->loginController->showLoginForm('', '', ''));
+		$this->assertEquals($expectedResponse, $this->loginController->showLoginForm('', ''));
 	}
 
 	public function testShowLoginFormWithErrorsInSession() {
@@ -279,10 +279,11 @@ public function testShowLoginFormWithErrorsInSession() {
 			'login',
 			[
 				'alt_login' => [],
+				'pageTitle' => 'Login'
 			],
 			'guest'
 		);
-		$this->assertEquals($expectedResponse, $this->loginController->showLoginForm('', '', ''));
+		$this->assertEquals($expectedResponse, $this->loginController->showLoginForm('', ''));
 	}
 
 	public function testShowLoginFormForFlowAuth() {
@@ -303,16 +304,17 @@ public function testShowLoginFormForFlowAuth() {
 			'login',
 			[
 				'alt_login' => [],
+				'pageTitle' => 'Login'
 			],
 			'guest'
 		);
-		$this->assertEquals($expectedResponse, $this->loginController->showLoginForm('', 'login/flow', ''));
+		$this->assertEquals($expectedResponse, $this->loginController->showLoginForm('', 'login/flow'));
 	}
 
 	/**
 	 * @return array
 	 */
-	public function passwordResetDataProvider() {
+	public function passwordResetDataProvider(): array {
 		return [
 			[
 				true,
@@ -371,10 +373,11 @@ public function testShowLoginFormWithPasswordResetOption($canChangePassword,
 			'login',
 			[
 				'alt_login' => [],
+				'pageTitle' => 'Login'
 			],
 			'guest'
 		);
-		$this->assertEquals($expectedResponse, $this->loginController->showLoginForm('LdapUser', '', ''));
+		$this->assertEquals($expectedResponse, $this->loginController->showLoginForm('LdapUser', ''));
 	}
 
 	public function testShowLoginFormForUserNamed0() {
@@ -425,10 +428,11 @@ public function testShowLoginFormForUserNamed0() {
 			'login',
 			[
 				'alt_login' => [],
+				'pageTitle' => 'Login'
 			],
 			'guest'
 		);
-		$this->assertEquals($expectedResponse, $this->loginController->showLoginForm('0', '', ''));
+		$this->assertEquals($expectedResponse, $this->loginController->showLoginForm('0', ''));
 	}
 
 	public function testLoginWithInvalidCredentials() {