diff --git a/includes/Storage/PageUpdaterFactory.php b/includes/Storage/PageUpdaterFactory.php
index f043ef379fc..096a8f99801 100644
--- a/includes/Storage/PageUpdaterFactory.php
+++ b/includes/Storage/PageUpdaterFactory.php
@@ -64,74 +64,46 @@ class PageUpdaterFactory {
 		'UseRCPatrol',
 	];
 
-	/**
-	 * @var RevisionStore
-	 */
+	/** @var RevisionStore */
 	private $revisionStore;
 
-	/**
-	 * @var RevisionRenderer
-	 */
+	/** @var RevisionRenderer */
 	private $revisionRenderer;
 
-	/**
-	 * @var SlotRoleRegistry
-	 */
+	/** @var SlotRoleRegistry */
 	private $slotRoleRegistry;
 
-	/**
-	 * @var ParserCache
-	 */
+	/** @var ParserCache */
 	private $parserCache;
 
-	/**
-	 * @var JobQueueGroup
-	 */
+	/** @var JobQueueGroup */
 	private $jobQueueGroup;
 
-	/**
-	 * @var MessageCache
-	 */
+	/** @var MessageCache */
 	private $messageCache;
 
-	/**
-	 * @var Language
-	 */
+	/** @var Language */
 	private $contLang;
 
-	/**
-	 * @var ILBFactory
-	 */
+	/** @var ILBFactory */
 	private $loadbalancerFactory;
 
-	/**
-	 * @var IContentHandlerFactory
-	 */
+	/** @var IContentHandlerFactory */
 	private $contentHandlerFactory;
 
-	/**
-	 * @var HookContainer
-	 */
+	/** @var HookContainer */
 	private $hookContainer;
 
-	/**
-	 * @var EditResultCache
-	 */
+	/** @var EditResultCache */
 	private $editResultCache;
 
-	/**
-	 * @var UserNameUtils
-	 */
+	/** @var UserNameUtils */
 	private $userNameUtils;
 
-	/**
-	 * @var LoggerInterface
-	 */
+	/** @var LoggerInterface */
 	private $logger;
 
-	/**
-	 * @var ServiceOptions
-	 */
+	/** @var ServiceOptions */
 	private $options;
 
 	/** @var UserEditTracker */
diff --git a/includes/content/ContentHandlerFactory.php b/includes/content/ContentHandlerFactory.php
index b360900cbe1..126d16270af 100644
--- a/includes/content/ContentHandlerFactory.php
+++ b/includes/content/ContentHandlerFactory.php
@@ -41,7 +41,7 @@ use Wikimedia\ObjectFactory;
  * @ingroup Content
  * @since 1.35
  */
-class ContentHandlerFactory implements IContentHandlerFactory {
+final class ContentHandlerFactory implements IContentHandlerFactory {
 
 	/**
 	 * @var string[]|callable[]
diff --git a/tests/phpunit/unit/includes/Storage/PageUpdaterFactoryTest.php b/tests/phpunit/unit/includes/Storage/PageUpdaterFactoryTest.php
index a743676368d..40175e02232 100644
--- a/tests/phpunit/unit/includes/Storage/PageUpdaterFactoryTest.php
+++ b/tests/phpunit/unit/includes/Storage/PageUpdaterFactoryTest.php
@@ -1,36 +1,24 @@
 <?php
 
-namespace MediaWiki\Tests\Storage;
+namespace MediaWiki\Tests\Unit\Storage;
 
-use JobQueueGroup;
-use Language;
-use LoadBalancer;
 use MediaWiki\Config\ServiceOptions;
-use MediaWiki\Content\ContentHandlerFactory;
-use MediaWiki\HookContainer\HookContainer;
-use MediaWiki\Revision\RevisionRenderer;
-use MediaWiki\Revision\RevisionStore;
-use MediaWiki\Revision\SlotRoleRegistry;
 use MediaWiki\Storage\DerivedPageDataUpdater;
-use MediaWiki\Storage\EditResultCache;
 use MediaWiki\Storage\PageUpdater;
 use MediaWiki\Storage\PageUpdaterFactory;
-use MediaWiki\User\UserEditTracker;
-use MediaWiki\User\UserGroupManager;
+use MediaWiki\Tests\Unit\MockServiceDependenciesTrait;
 use MediaWiki\User\UserIdentityValue;
-use MediaWiki\User\UserNameUtils;
 use MediaWikiUnitTestCase;
-use MessageCache;
-use ParserCache;
-use Psr\Log\LoggerInterface;
 use Wikimedia\Rdbms\LBFactory;
+use Wikimedia\Rdbms\LoadBalancer;
 use WikiPage;
 
 /**
  * @covers MediaWiki\Storage\PageUpdaterFactory
- * @group Database
  */
 class PageUpdaterFactoryTest extends MediaWikiUnitTestCase {
+	use MockServiceDependenciesTrait;
+
 	private function getPageUpdaterFactory() {
 		$config = [
 			'ArticleCountMethod' => null,
@@ -46,27 +34,16 @@ class PageUpdaterFactoryTest extends MediaWikiUnitTestCase {
 		$lbFactory = $this->createNoOpMock( LBFactory::class, [ 'getMainLB' ] );
 		$lbFactory->method( 'getMainLB' )->willReturn( $lb );
 
-		return new PageUpdaterFactory(
-			$this->createNoOpMock( RevisionStore::class ),
-			$this->createNoOpMock( RevisionRenderer::class ),
-			$this->createNoOpMock( SlotRoleRegistry::class ),
-			$this->createNoOpMock( ParserCache::class ),
-			$this->createNoOpMock( JobQueueGroup::class ),
-			$this->createNoOpMock( MessageCache::class ),
-			$this->createNoOpMock( Language::class ),
-			$lbFactory,
-			$this->createNoOpMock( ContentHandlerFactory::class ),
-			$this->createNoOpMock( HookContainer::class ),
-			$this->createNoOpMock( EditResultCache::class ),
-			$this->createNoOpMock( UserNameUtils::class ),
-			$this->createNoOpMock( LoggerInterface::class ),
-			new ServiceOptions(
-				PageUpdaterFactory::CONSTRUCTOR_OPTIONS,
-				$config
-			),
-			$this->createNoOpMock( UserEditTracker::class ),
-			$this->createNoOpMock( UserGroupManager::class ),
-			[]
+		return $this->newServiceInstance(
+			PageUpdaterFactory::class,
+			[
+				'loadbalancerFactory' => $lbFactory,
+				'options' => new ServiceOptions(
+					PageUpdaterFactory::CONSTRUCTOR_OPTIONS,
+					$config
+				),
+				'softwareTags' => [],
+			]
 		);
 	}