diff --git a/includes/HookContainer/DeprecatedHooks.php b/includes/HookContainer/DeprecatedHooks.php
index f1e986b0d49..3dc36ff1c74 100644
--- a/includes/HookContainer/DeprecatedHooks.php
+++ b/includes/HookContainer/DeprecatedHooks.php
@@ -55,7 +55,7 @@ class DeprecatedHooks {
 		'UserLoadFromDatabase' => [ 'deprecatedVersion' => '1.37' ],
 		'UserLoadOptions' => [ 'deprecatedVersion' => '1.37', 'silent' => true ],
 		'UserResetAllOptions' => [ 'deprecatedVersion' => '1.37' ],
-		'UserSaveOptions' => [ 'deprecatedVersion' => '1.37', 'silent' => true ],
+		'UserSaveOptions' => [ 'deprecatedVersion' => '1.37' ],
 		'UserSetCookies' => [ 'deprecatedVersion' => '1.27' ],
 		'WikiPageDeletionUpdates' => [ 'deprecatedVersion' => '1.32', 'silent' => true ],
 	];
diff --git a/tests/phpunit/includes/user/UserOptionsManagerTest.php b/tests/phpunit/includes/user/UserOptionsManagerTest.php
index e39f74b7bc6..3d7075281ce 100644
--- a/tests/phpunit/includes/user/UserOptionsManagerTest.php
+++ b/tests/phpunit/includes/user/UserOptionsManagerTest.php
@@ -149,6 +149,7 @@ class UserOptionsManagerTest extends UserOptionsLookupTest {
 	 * @covers MediaWiki\User\UserOptionsManager::saveOptions
 	 */
 	public function testUserSaveOptionsHookAbort() {
+		$this->filterDeprecated( '/UserSaveOptions/' );
 		$user = $this->getTestUser()->getUser();
 		$this->setTemporaryHook(
 			'UserSaveOptions',
@@ -183,6 +184,7 @@ class UserOptionsManagerTest extends UserOptionsLookupTest {
 	 * @covers MediaWiki\User\UserOptionsManager::saveOptions
 	 */
 	public function testUserSaveOptionsHookModify() {
+		$this->filterDeprecated( '/UserSaveOptions/' );
 		$user = $this->getTestUser()->getUser();
 		$this->setTemporaryHook(
 			'UserSaveOptions',
@@ -233,6 +235,7 @@ class UserOptionsManagerTest extends UserOptionsLookupTest {
 	 * @covers MediaWiki\User\UserOptionsManager::saveOptions
 	 */
 	public function testUserSaveOptionsHookOriginal() {
+		$this->filterDeprecated( '/UserSaveOptions/' );
 		$user = $this->getTestUser()->getUser();
 		$manager = $this->getManager();
 		$originalLanguage = $manager->getOption( $user, 'language' );
@@ -284,6 +287,7 @@ class UserOptionsManagerTest extends UserOptionsLookupTest {
 	 * @covers \MediaWiki\User\UserOptionsManager::loadUserOptions
 	 */
 	public function testLoadOptionsHookReflectsInOriginalOptions() {
+		$this->filterDeprecated( '/UserSaveOptions/' );
 		$user = $this->getTestUser()->getUser();
 		$manager = $this->getManager();
 		$this->setTemporaryHook(