diff --git a/apps/settings/tests/Controller/UsersControllerTest.php b/apps/settings/tests/Controller/UsersControllerTest.php
index b3e8937821..fd536a399e 100644
--- a/apps/settings/tests/Controller/UsersControllerTest.php
+++ b/apps/settings/tests/Controller/UsersControllerTest.php
@@ -180,6 +180,51 @@ class UsersControllerTest extends \Test\TestCase {
 		}
 	}
 
+	protected function getDefaultAccountManagerUserData() {
+		return [
+			IAccountManager::PROPERTY_DISPLAYNAME =>
+				[
+					'value' => 'Display name',
+					'scope' => IAccountManager::SCOPE_FEDERATED,
+					'verified' => IAccountManager::NOT_VERIFIED,
+				],
+			IAccountManager::PROPERTY_ADDRESS =>
+				[
+					'value' => '',
+					'scope' => IAccountManager::SCOPE_LOCAL,
+					'verified' => IAccountManager::NOT_VERIFIED,
+				],
+			IAccountManager::PROPERTY_WEBSITE =>
+				[
+					'value' => '',
+					'scope' => IAccountManager::SCOPE_LOCAL,
+					'verified' => IAccountManager::NOT_VERIFIED,
+				],
+			IAccountManager::PROPERTY_EMAIL =>
+				[
+					'value' => '',
+					'scope' => IAccountManager::SCOPE_FEDERATED,
+					'verified' => IAccountManager::NOT_VERIFIED,
+				],
+			IAccountManager::PROPERTY_AVATAR =>
+				[
+					'scope' => IAccountManager::SCOPE_FEDERATED
+				],
+			IAccountManager::PROPERTY_PHONE =>
+				[
+					'value' => '',
+					'scope' => IAccountManager::SCOPE_LOCAL,
+					'verified' => IAccountManager::NOT_VERIFIED,
+				],
+			IAccountManager::PROPERTY_TWITTER =>
+				[
+					'value' => '',
+					'scope' => IAccountManager::SCOPE_LOCAL,
+					'verified' => IAccountManager::NOT_VERIFIED,
+				],
+		];
+	}
+
 	/**
 	 * @dataProvider dataTestSetUserSettings
 	 *
@@ -205,48 +250,7 @@ class UsersControllerTest extends \Test\TestCase {
 			$this->accountManager->expects($this->once())
 				->method('getUser')
 				->with($user)
-				->willReturn([
-					IAccountManager::PROPERTY_DISPLAYNAME =>
-						[
-							'value' => 'Display name',
-							'scope' => IAccountManager::SCOPE_FEDERATED,
-							'verified' => IAccountManager::NOT_VERIFIED,
-						],
-					IAccountManager::PROPERTY_ADDRESS =>
-						[
-							'value' => '',
-							'scope' => IAccountManager::SCOPE_LOCAL,
-							'verified' => IAccountManager::NOT_VERIFIED,
-						],
-					IAccountManager::PROPERTY_WEBSITE =>
-						[
-							'value' => '',
-							'scope' => IAccountManager::SCOPE_LOCAL,
-							'verified' => IAccountManager::NOT_VERIFIED,
-						],
-					IAccountManager::PROPERTY_EMAIL =>
-						[
-							'value' => '',
-							'scope' => IAccountManager::SCOPE_FEDERATED,
-							'verified' => IAccountManager::NOT_VERIFIED,
-						],
-					IAccountManager::PROPERTY_AVATAR =>
-						[
-							'scope' => IAccountManager::SCOPE_FEDERATED
-						],
-					IAccountManager::PROPERTY_PHONE =>
-						[
-							'value' => '',
-							'scope' => IAccountManager::SCOPE_LOCAL,
-							'verified' => IAccountManager::NOT_VERIFIED,
-						],
-					IAccountManager::PROPERTY_TWITTER =>
-						[
-							'value' => '',
-							'scope' => IAccountManager::SCOPE_LOCAL,
-							'verified' => IAccountManager::NOT_VERIFIED,
-						],
-				]);
+				->willReturn($this->getDefaultAccountManagerUserData());
 
 			$controller->expects($this->once())
 				->method('saveUserSettings')