diff --git a/tests/phpunit/MediaWikiIntegrationTestCase.php b/tests/phpunit/MediaWikiIntegrationTestCase.php
index e4eb541029b..cfdacd2d416 100644
--- a/tests/phpunit/MediaWikiIntegrationTestCase.php
+++ b/tests/phpunit/MediaWikiIntegrationTestCase.php
@@ -4,6 +4,7 @@ use MediaWiki\Config\Config;
 use MediaWiki\Config\ConfigFactory;
 use MediaWiki\Config\HashConfig;
 use MediaWiki\Config\MultiConfig;
+use MediaWiki\Deferred\DeferredUpdates;
 use MediaWiki\HookContainer\FauxGlobalHookArray;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\Linker\LinkTarget;
diff --git a/tests/phpunit/includes/Request/ContentSecurityPolicyTest.php b/tests/phpunit/includes/Request/ContentSecurityPolicyTest.php
index f7e9c3c1dee..7f4ae83e56e 100644
--- a/tests/phpunit/includes/Request/ContentSecurityPolicyTest.php
+++ b/tests/phpunit/includes/Request/ContentSecurityPolicyTest.php
@@ -2,6 +2,7 @@
 
 use MediaWiki\MainConfigNames;
 use MediaWiki\Request\ContentSecurityPolicy;
+use MediaWiki\Request\FauxResponse;
 use Wikimedia\TestingAccessWrapper;
 
 class ContentSecurityPolicyTest extends MediaWikiIntegrationTestCase {
diff --git a/tests/phpunit/includes/Storage/DerivedPageDataUpdaterTest.php b/tests/phpunit/includes/Storage/DerivedPageDataUpdaterTest.php
index 97940ab3aac..aa6e65265aa 100644
--- a/tests/phpunit/includes/Storage/DerivedPageDataUpdaterTest.php
+++ b/tests/phpunit/includes/Storage/DerivedPageDataUpdaterTest.php
@@ -11,6 +11,7 @@ use MediaWiki\CommentStore\CommentStoreComment;
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\Deferred\DeferredUpdates;
 use MediaWiki\Deferred\LinksUpdate\LinksUpdate;
+use MediaWiki\Deferred\MWCallableUpdate;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Page\PageIdentity;
 use MediaWiki\Page\PageIdentityValue;
@@ -32,7 +33,6 @@ use MediaWiki\Utils\MWTimestamp;
 use MediaWikiIntegrationTestCase;
 use Message;
 use MockTitleTrait;
-use MWCallableUpdate;
 use ParserOptions;
 use PHPUnit\Framework\MockObject\MockObject;
 use TextContent;
diff --git a/tests/phpunit/includes/api/ApiCreateTempUserTraitTest.php b/tests/phpunit/includes/api/ApiCreateTempUserTraitTest.php
index 1a4d50753e8..68ebf905e78 100644
--- a/tests/phpunit/includes/api/ApiCreateTempUserTraitTest.php
+++ b/tests/phpunit/includes/api/ApiCreateTempUserTraitTest.php
@@ -2,6 +2,7 @@
 
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\Request\WebRequest;
+use MediaWiki\User\User;
 use Wikimedia\TestingAccessWrapper;
 
 /**
diff --git a/tests/phpunit/includes/api/ApiEditPageTest.php b/tests/phpunit/includes/api/ApiEditPageTest.php
index f54cf60dea4..52b2a330d74 100644
--- a/tests/phpunit/includes/api/ApiEditPageTest.php
+++ b/tests/phpunit/includes/api/ApiEditPageTest.php
@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\Block\DatabaseBlock;
+use MediaWiki\CommentStore\CommentStoreComment;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Status\Status;
diff --git a/tests/phpunit/includes/api/ApiUnblockTest.php b/tests/phpunit/includes/api/ApiUnblockTest.php
index 73d8c1dde74..f3730212337 100644
--- a/tests/phpunit/includes/api/ApiUnblockTest.php
+++ b/tests/phpunit/includes/api/ApiUnblockTest.php
@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\Block\DatabaseBlock;
+use MediaWiki\Title\Title;
 use MediaWiki\User\User;
 
 /**
diff --git a/tests/phpunit/includes/api/ApiUserrightsTest.php b/tests/phpunit/includes/api/ApiUserrightsTest.php
index f1e2574255b..23911f39100 100644
--- a/tests/phpunit/includes/api/ApiUserrightsTest.php
+++ b/tests/phpunit/includes/api/ApiUserrightsTest.php
@@ -3,6 +3,7 @@
 use MediaWiki\Block\DatabaseBlock;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MainConfigSchema;
+use MediaWiki\Title\Title;
 use MediaWiki\User\User;
 
 /**
diff --git a/tests/phpunit/includes/api/query/ApiQueryAllRevisionsTest.php b/tests/phpunit/includes/api/query/ApiQueryAllRevisionsTest.php
index cf532fe7eec..8959654c30a 100644
--- a/tests/phpunit/includes/api/query/ApiQueryAllRevisionsTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryAllRevisionsTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use MediaWiki\Title\Title;
+
 /**
  * @group API
  * @group Database
diff --git a/tests/phpunit/includes/api/query/ApiQueryBasicTest.php b/tests/phpunit/includes/api/query/ApiQueryBasicTest.php
index e6a80989171..cb712da188e 100644
--- a/tests/phpunit/includes/api/query/ApiQueryBasicTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryBasicTest.php
@@ -20,6 +20,8 @@
  * @file
  */
 
+use MediaWiki\Title\Title;
+
 /**
  * These tests validate basic functionality of the api query module
  *
diff --git a/tests/phpunit/includes/api/query/ApiQueryRevisionsTest.php b/tests/phpunit/includes/api/query/ApiQueryRevisionsTest.php
index 3f05adada9e..fc8655ac123 100644
--- a/tests/phpunit/includes/api/query/ApiQueryRevisionsTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryRevisionsTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\CommentStore\CommentStoreComment;
 use MediaWiki\Revision\SlotRecord;
 
 /**
diff --git a/tests/phpunit/includes/api/query/ApiQueryWatchlistIntegrationTest.php b/tests/phpunit/includes/api/query/ApiQueryWatchlistIntegrationTest.php
index adc283663fb..e393d800c80 100644
--- a/tests/phpunit/includes/api/query/ApiQueryWatchlistIntegrationTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryWatchlistIntegrationTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\CommentStore\CommentStoreComment;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\Permissions\Authority;
 use MediaWiki\Revision\SlotRecord;
diff --git a/tests/phpunit/includes/auth/TemporaryPasswordPrimaryAuthenticationProviderTest.php b/tests/phpunit/includes/auth/TemporaryPasswordPrimaryAuthenticationProviderTest.php
index c442efd0b49..0e84756148a 100644
--- a/tests/phpunit/includes/auth/TemporaryPasswordPrimaryAuthenticationProviderTest.php
+++ b/tests/phpunit/includes/auth/TemporaryPasswordPrimaryAuthenticationProviderTest.php
@@ -132,7 +132,7 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiInteg
 	}
 
 	public function testConfig() {
-		$config = new \HashConfig( [
+		$config = new HashConfig( [
 			MainConfigNames::EnableEmail => false,
 			MainConfigNames::NewPasswordExpiry => 100,
 			MainConfigNames::PasswordReminderResendTime => 101,
diff --git a/tests/phpunit/includes/content/WikitextContentHandlerIntegrationTest.php b/tests/phpunit/includes/content/WikitextContentHandlerIntegrationTest.php
index ec51a09498b..37cd552bfb0 100644
--- a/tests/phpunit/includes/content/WikitextContentHandlerIntegrationTest.php
+++ b/tests/phpunit/includes/content/WikitextContentHandlerIntegrationTest.php
@@ -5,6 +5,7 @@ use MediaWiki\Interwiki\ClassicInterwikiLookup;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleValue;
 
 /**
  * @group ContentHandler
diff --git a/tests/phpunit/includes/content/WikitextContentHandlerTest.php b/tests/phpunit/includes/content/WikitextContentHandlerTest.php
index aa2f2fcbfe4..a8518e7cd3d 100644
--- a/tests/phpunit/includes/content/WikitextContentHandlerTest.php
+++ b/tests/phpunit/includes/content/WikitextContentHandlerTest.php
@@ -4,6 +4,7 @@ use MediaWiki\MainConfigNames;
 use MediaWiki\Page\PageReferenceValue;
 use MediaWiki\Parser\ParserOutputFlags;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleFactory;
 use MediaWiki\User\UserIdentity;
 use Wikimedia\TestingAccessWrapper;
 
diff --git a/tests/phpunit/includes/deferred/DeferredUpdatesTest.php b/tests/phpunit/includes/deferred/DeferredUpdatesTest.php
index 450dfcf1d53..f354d1c57bb 100644
--- a/tests/phpunit/includes/deferred/DeferredUpdatesTest.php
+++ b/tests/phpunit/includes/deferred/DeferredUpdatesTest.php
@@ -2,6 +2,7 @@
 
 use MediaWiki\Deferred\DeferrableUpdate;
 use MediaWiki\Deferred\DeferredUpdates;
+use MediaWiki\Deferred\EnqueueableDataUpdate;
 use MediaWiki\Deferred\MergeableUpdate;
 use MediaWiki\Deferred\MWCallableUpdate;
 use MediaWiki\Deferred\TransactionRoundDefiningUpdate;
diff --git a/tests/phpunit/includes/diff/DifferenceEngineTest.php b/tests/phpunit/includes/diff/DifferenceEngineTest.php
index 70db7ec43e4..72b475971a8 100644
--- a/tests/phpunit/includes/diff/DifferenceEngineTest.php
+++ b/tests/phpunit/includes/diff/DifferenceEngineTest.php
@@ -4,6 +4,7 @@ use MediaWiki\Config\HashConfig;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Output\OutputPage;
 use MediaWiki\Permissions\SimpleAuthority;
+use MediaWiki\Request\FauxRequest;
 use MediaWiki\Revision\MutableRevisionRecord;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Revision\SlotRecord;
diff --git a/tests/phpunit/includes/exception/UserBlockedErrorTest.php b/tests/phpunit/includes/exception/UserBlockedErrorTest.php
index 6c5d8724cf4..d9177e93e89 100644
--- a/tests/phpunit/includes/exception/UserBlockedErrorTest.php
+++ b/tests/phpunit/includes/exception/UserBlockedErrorTest.php
@@ -2,6 +2,7 @@
 
 use MediaWiki\Block\AbstractBlock;
 use MediaWiki\Block\BlockErrorFormatter;
+use MediaWiki\Language\RawMessage;
 use MediaWiki\User\UserIdentity;
 
 /**
diff --git a/tests/phpunit/includes/import/ImportLinkCacheIntegrationTest.php b/tests/phpunit/includes/import/ImportLinkCacheIntegrationTest.php
index 047cbb4cc50..20881a74e36 100644
--- a/tests/phpunit/includes/import/ImportLinkCacheIntegrationTest.php
+++ b/tests/phpunit/includes/import/ImportLinkCacheIntegrationTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use MediaWiki\Title\Title;
+
 /**
  * Integration test that checks import success and
  * LinkCache integration.
diff --git a/tests/phpunit/includes/jobqueue/RefreshLinksPartitionTest.php b/tests/phpunit/includes/jobqueue/RefreshLinksPartitionTest.php
index 082a1b0bc47..c85ee7e2f72 100644
--- a/tests/phpunit/includes/jobqueue/RefreshLinksPartitionTest.php
+++ b/tests/phpunit/includes/jobqueue/RefreshLinksPartitionTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use MediaWiki\Title\Title;
+
 /**
  * @group JobQueue
  * @group medium
diff --git a/tests/phpunit/includes/jobqueue/jobs/RefreshLinksJobTest.php b/tests/phpunit/includes/jobqueue/jobs/RefreshLinksJobTest.php
index fdb893a1db1..02d85bbeee4 100644
--- a/tests/phpunit/includes/jobqueue/jobs/RefreshLinksJobTest.php
+++ b/tests/phpunit/includes/jobqueue/jobs/RefreshLinksJobTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\CommentStore\CommentStoreComment;
 use MediaWiki\Page\PageAssertionException;
 use MediaWiki\Title\Title;
 
diff --git a/tests/phpunit/includes/language/MessageCacheTest.php b/tests/phpunit/includes/language/MessageCacheTest.php
index 43683205a33..f177f8fd161 100644
--- a/tests/phpunit/includes/language/MessageCacheTest.php
+++ b/tests/phpunit/includes/language/MessageCacheTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\CommentStore\CommentStoreComment;
 use MediaWiki\Deferred\DeferredUpdates;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Revision\RevisionRecord;
diff --git a/tests/phpunit/includes/linkeddata/PageDataRequestHandlerTest.php b/tests/phpunit/includes/linkeddata/PageDataRequestHandlerTest.php
index 8da59ef7c99..3eebf4a46cb 100644
--- a/tests/phpunit/includes/linkeddata/PageDataRequestHandlerTest.php
+++ b/tests/phpunit/includes/linkeddata/PageDataRequestHandlerTest.php
@@ -5,6 +5,7 @@ use MediaWiki\Output\OutputPage;
 use MediaWiki\Request\FauxRequest;
 use MediaWiki\Request\FauxResponse;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleFactory;
 
 /**
  * @covers PageDataRequestHandler
diff --git a/tests/phpunit/includes/linker/LinkerTest.php b/tests/phpunit/includes/linker/LinkerTest.php
index 8d76ba2e11c..21b0561ed29 100644
--- a/tests/phpunit/includes/linker/LinkerTest.php
+++ b/tests/phpunit/includes/linker/LinkerTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\CommentStore\CommentStoreComment;
 use MediaWiki\Config\SiteConfiguration;
 use MediaWiki\Linker\Linker;
 use MediaWiki\MainConfigNames;
diff --git a/tests/phpunit/includes/logging/ProtectLogFormatterTest.php b/tests/phpunit/includes/logging/ProtectLogFormatterTest.php
index bf4f7b413d1..e43abe10069 100644
--- a/tests/phpunit/includes/logging/ProtectLogFormatterTest.php
+++ b/tests/phpunit/includes/logging/ProtectLogFormatterTest.php
@@ -1,6 +1,8 @@
 <?php
 
 use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait;
+use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleFactory;
 use MediaWiki\User\UserIdentityValue;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\LBFactory;
diff --git a/tests/phpunit/includes/media/FakeDimensionFile.php b/tests/phpunit/includes/media/FakeDimensionFile.php
index 5e3a3cba3cf..08c85cef799 100644
--- a/tests/phpunit/includes/media/FakeDimensionFile.php
+++ b/tests/phpunit/includes/media/FakeDimensionFile.php
@@ -1,5 +1,7 @@
 <?php
 
+use MediaWiki\Title\Title;
+
 class FakeDimensionFile extends File {
 	public $mustRender = false;
 	public $mime;
diff --git a/tests/phpunit/includes/page/ArticleViewTest.php b/tests/phpunit/includes/page/ArticleViewTest.php
index 759eafe2f23..e428c243c2a 100644
--- a/tests/phpunit/includes/page/ArticleViewTest.php
+++ b/tests/phpunit/includes/page/ArticleViewTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\CommentStore\CommentStoreComment;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Output\OutputPage;
 use MediaWiki\Request\FauxRequest;
diff --git a/tests/phpunit/includes/page/PageArchiveTest.php b/tests/phpunit/includes/page/PageArchiveTest.php
index 9c36dec2f94..f38c38cb02f 100644
--- a/tests/phpunit/includes/page/PageArchiveTest.php
+++ b/tests/phpunit/includes/page/PageArchiveTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\CommentStore\CommentStoreComment;
 use MediaWiki\Revision\MutableRevisionRecord;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Revision\SlotRecord;
diff --git a/tests/phpunit/includes/page/UndeletePageTest.php b/tests/phpunit/includes/page/UndeletePageTest.php
index d3b59095d04..6ea8ad87997 100644
--- a/tests/phpunit/includes/page/UndeletePageTest.php
+++ b/tests/phpunit/includes/page/UndeletePageTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\CommentStore\CommentStoreComment;
 use MediaWiki\Page\UndeletePage;
 use MediaWiki\Revision\SlotRecord;
 use MediaWiki\Title\Title;
diff --git a/tests/phpunit/includes/page/WikiPageDbTest.php b/tests/phpunit/includes/page/WikiPageDbTest.php
index 74e8a8cdf3e..591d0a3fff9 100644
--- a/tests/phpunit/includes/page/WikiPageDbTest.php
+++ b/tests/phpunit/includes/page/WikiPageDbTest.php
@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\Category\Category;
+use MediaWiki\CommentStore\CommentStoreComment;
 use MediaWiki\Content\Renderer\ContentRenderer;
 use MediaWiki\Deferred\SiteStatsUpdate;
 use MediaWiki\Edit\PreparedEdit;
diff --git a/tests/phpunit/includes/poolcounter/PoolWorkArticleViewTest.php b/tests/phpunit/includes/poolcounter/PoolWorkArticleViewTest.php
index adc84ced223..10fae607a5a 100644
--- a/tests/phpunit/includes/poolcounter/PoolWorkArticleViewTest.php
+++ b/tests/phpunit/includes/poolcounter/PoolWorkArticleViewTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\CommentStore\CommentStoreComment;
 use MediaWiki\Logger\Spi as LoggerSpi;
 use MediaWiki\Revision\MutableRevisionRecord;
 use MediaWiki\Revision\RevisionRecord;
diff --git a/tests/phpunit/includes/specialpage/FormSpecialPageTestCase.php b/tests/phpunit/includes/specialpage/FormSpecialPageTestCase.php
index 939f6ae26cf..76ebb09602f 100644
--- a/tests/phpunit/includes/specialpage/FormSpecialPageTestCase.php
+++ b/tests/phpunit/includes/specialpage/FormSpecialPageTestCase.php
@@ -6,6 +6,7 @@ use MediaWiki\DAO\WikiAwareEntity;
 use MediaWiki\SpecialPage\FormSpecialPage;
 use MediaWiki\User\User;
 use MediaWiki\Utils\MWTimestamp;
+use Wikimedia\Rdbms\ReadOnlyMode;
 
 /**
  * Factory for handling the special page list and generating SpecialPage objects.
diff --git a/tests/phpunit/includes/specialpage/SpecialPageTestHelper.php b/tests/phpunit/includes/specialpage/SpecialPageTestHelper.php
index 37e29dcbc56..fc68382d2c7 100644
--- a/tests/phpunit/includes/specialpage/SpecialPageTestHelper.php
+++ b/tests/phpunit/includes/specialpage/SpecialPageTestHelper.php
@@ -1,4 +1,7 @@
 <?php
+
+use MediaWiki\Specials\SpecialAllPages;
+
 /**
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/tests/phpunit/includes/specials/ContribsPagerTest.php b/tests/phpunit/includes/specials/ContribsPagerTest.php
index 9ee5fcb7eea..48acb1b2dff 100644
--- a/tests/phpunit/includes/specials/ContribsPagerTest.php
+++ b/tests/phpunit/includes/specials/ContribsPagerTest.php
@@ -7,6 +7,7 @@ use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Pager\ContribsPager;
+use MediaWiki\Pager\IndexPager;
 use MediaWiki\Revision\RevisionStore;
 use MediaWiki\Title\NamespaceInfo;
 use MediaWiki\Title\Title;
diff --git a/tests/phpunit/includes/specials/Contribute/ContributeFactoryTest.php b/tests/phpunit/includes/specials/Contribute/ContributeFactoryTest.php
index b1285045822..f5719ece20d 100644
--- a/tests/phpunit/includes/specials/Contribute/ContributeFactoryTest.php
+++ b/tests/phpunit/includes/specials/Contribute/ContributeFactoryTest.php
@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\HookContainer\HookRunner;
+use MediaWiki\SpecialPage\SpecialPage;
 use MediaWiki\Specials\Contribute\Card\ContributeCard;
 use MediaWiki\Specials\Contribute\Card\ContributeCardActionLink;
 use MediaWiki\Specials\Contribute\ContributeFactory;
diff --git a/tests/phpunit/includes/specials/SpecialBookSourcesTest.php b/tests/phpunit/includes/specials/SpecialBookSourcesTest.php
index 87f2a98d960..f9cfae00f7f 100644
--- a/tests/phpunit/includes/specials/SpecialBookSourcesTest.php
+++ b/tests/phpunit/includes/specials/SpecialBookSourcesTest.php
@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\Specials\SpecialBookSources;
+use MediaWiki\Title\TitleFactory;
 
 class SpecialBookSourcesTest extends SpecialPageTestBase {
 	public static function provideISBNs() {
diff --git a/tests/phpunit/includes/specials/SpecialRenameUserTest.php b/tests/phpunit/includes/specials/SpecialRenameUserTest.php
index ae6afb3b754..e5cfc39ffc7 100644
--- a/tests/phpunit/includes/specials/SpecialRenameUserTest.php
+++ b/tests/phpunit/includes/specials/SpecialRenameUserTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\Request\FauxRequest;
 use MediaWiki\Specials\SpecialRenameUser;
 
 /**
diff --git a/tests/phpunit/includes/specials/SpecialUserLogoutTest.php b/tests/phpunit/includes/specials/SpecialUserLogoutTest.php
index 8801bc6ada1..ad85f570bde 100644
--- a/tests/phpunit/includes/specials/SpecialUserLogoutTest.php
+++ b/tests/phpunit/includes/specials/SpecialUserLogoutTest.php
@@ -2,6 +2,7 @@
 
 use MediaWiki\Request\FauxRequest;
 use MediaWiki\SpecialPage\SpecialPage;
+use MediaWiki\Specials\SpecialUserLogout;
 
 /**
  * @covers \MediaWiki\Specials\SpecialUserLogout
diff --git a/tests/phpunit/includes/specials/SpecialUserRightsTest.php b/tests/phpunit/includes/specials/SpecialUserRightsTest.php
index a95aa69d5b4..01ba1dfb365 100644
--- a/tests/phpunit/includes/specials/SpecialUserRightsTest.php
+++ b/tests/phpunit/includes/specials/SpecialUserRightsTest.php
@@ -3,6 +3,7 @@
 use MediaWiki\MainConfigNames;
 use MediaWiki\Request\FauxRequest;
 use MediaWiki\Specials\SpecialUserRights;
+use MediaWiki\WikiMap\WikiMap;
 
 /**
  * @group Database
diff --git a/tests/phpunit/includes/specials/pagers/BlockListPagerTest.php b/tests/phpunit/includes/specials/pagers/BlockListPagerTest.php
index 17c52f963ab..a4f8520aa13 100644
--- a/tests/phpunit/includes/specials/pagers/BlockListPagerTest.php
+++ b/tests/phpunit/includes/specials/pagers/BlockListPagerTest.php
@@ -9,9 +9,11 @@ use MediaWiki\Block\Restriction\NamespaceRestriction;
 use MediaWiki\Block\Restriction\PageRestriction;
 use MediaWiki\Cache\LinkBatchFactory;
 use MediaWiki\CommentFormatter\RowCommentFormatter;
+use MediaWiki\CommentStore\CommentStore;
 use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Pager\BlockListPager;
+use MediaWiki\Request\FauxRequest;
 use MediaWiki\SpecialPage\SpecialPageFactory;
 use MediaWiki\Utils\MWTimestamp;
 use Wikimedia\Rdbms\FakeResultWrapper;
diff --git a/tests/phpunit/includes/user/PasswordResetTest.php b/tests/phpunit/includes/user/PasswordResetTest.php
index e81c59f40a0..e4b92f109b6 100644
--- a/tests/phpunit/includes/user/PasswordResetTest.php
+++ b/tests/phpunit/includes/user/PasswordResetTest.php
@@ -11,6 +11,7 @@ use MediaWiki\Status\Status;
 use MediaWiki\Tests\Unit\DummyServicesTrait;
 use MediaWiki\User\Options\StaticUserOptionsLookup;
 use MediaWiki\User\Options\UserOptionsLookup;
+use MediaWiki\User\PasswordReset;
 use MediaWiki\User\User;
 use MediaWiki\User\UserFactory;
 use MediaWiki\User\UserNameUtils;
diff --git a/tests/phpunit/includes/user/UserEditTrackerTest.php b/tests/phpunit/includes/user/UserEditTrackerTest.php
index cc25c2a37ba..c0c22c6d87d 100644
--- a/tests/phpunit/includes/user/UserEditTrackerTest.php
+++ b/tests/phpunit/includes/user/UserEditTrackerTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\CommentStore\CommentStoreComment;
 use MediaWiki\Deferred\DeferredUpdates;
 use MediaWiki\Deferred\UserEditCountUpdate;
 use MediaWiki\Revision\MutableRevisionRecord;
diff --git a/tests/phpunit/integration/includes/Rest/Handler/Helper/PageRedirectHelperTest.php b/tests/phpunit/integration/includes/Rest/Handler/Helper/PageRedirectHelperTest.php
index 71d60e58a21..9d3d5b67e97 100644
--- a/tests/phpunit/integration/includes/Rest/Handler/Helper/PageRedirectHelperTest.php
+++ b/tests/phpunit/integration/includes/Rest/Handler/Helper/PageRedirectHelperTest.php
@@ -10,8 +10,8 @@ use MediaWiki\Rest\Handler\Helper\PageRedirectHelper;
 use MediaWiki\Rest\RequestData;
 use MediaWiki\Rest\ResponseFactory;
 use MediaWiki\Tests\Rest\Handler\PageHandlerTestTrait;
+use MediaWiki\Title\Title;
 use MediaWikiIntegrationTestCase;
-use Title;
 
 /**
  * @covers \MediaWiki\Rest\Handler\Helper\PageRedirectHelper
diff --git a/tests/phpunit/integration/includes/Rest/Handler/ParsoidOutputAccessTest.php b/tests/phpunit/integration/includes/Rest/Handler/ParsoidOutputAccessTest.php
index 26e223aa397..0d33b5f764a 100644
--- a/tests/phpunit/integration/includes/Rest/Handler/ParsoidOutputAccessTest.php
+++ b/tests/phpunit/integration/includes/Rest/Handler/ParsoidOutputAccessTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\CommentStore\CommentStoreComment;
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\Page\ParserOutputAccess;
 use MediaWiki\Parser\ParserOutputFlags;
@@ -13,6 +14,7 @@ use MediaWiki\Revision\RevisionAccessException;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Revision\SlotRecord;
 use MediaWiki\Status\Status;
+use MediaWiki\Title\Title;
 use PHPUnit\Framework\MockObject\MockObject;
 use Wikimedia\Parsoid\Config\PageConfig;
 use Wikimedia\Parsoid\Core\ContentMetadataCollector;
diff --git a/tests/phpunit/integration/includes/htmlform/HTMLTitleTextFieldTest.php b/tests/phpunit/integration/includes/htmlform/HTMLTitleTextFieldTest.php
index c053ec658e9..f82ec558dc2 100644
--- a/tests/phpunit/integration/includes/htmlform/HTMLTitleTextFieldTest.php
+++ b/tests/phpunit/integration/includes/htmlform/HTMLTitleTextFieldTest.php
@@ -2,6 +2,7 @@
 
 use MediaWiki\Interwiki\InterwikiLookupAdapter;
 use MediaWiki\Title\Title;
+use MediaWiki\Title\TitleFactory;
 
 /**
  * @covers HTMLTitleTextFieldTest
diff --git a/tests/phpunit/integration/includes/specials/SpecialRandomPageTest.php b/tests/phpunit/integration/includes/specials/SpecialRandomPageTest.php
index 93efaea2e22..13d715ec97f 100644
--- a/tests/phpunit/integration/includes/specials/SpecialRandomPageTest.php
+++ b/tests/phpunit/integration/includes/specials/SpecialRandomPageTest.php
@@ -7,7 +7,7 @@ use MediaWiki\Specials\SpecialRandomPage;
  */
 class SpecialRandomPageTest extends MediaWikiIntegrationTestCase {
 
-	/** @var RandomPage */
+	/** @var SpecialRandomPage */
 	private $page;
 
 	public function setUp(): void {
diff --git a/tests/phpunit/integration/includes/user/UserFactoryTest.php b/tests/phpunit/integration/includes/user/UserFactoryTest.php
index 0e3f04e2b91..53291a95cf0 100644
--- a/tests/phpunit/integration/includes/user/UserFactoryTest.php
+++ b/tests/phpunit/integration/includes/user/UserFactoryTest.php
@@ -2,6 +2,7 @@
 
 use MediaWiki\MainConfigNames;
 use MediaWiki\Permissions\UltimateAuthority;
+use MediaWiki\User\User;
 use MediaWiki\User\UserFactory;
 use MediaWiki\User\UserIdentityValue;
 use Wikimedia\IPUtils;
diff --git a/tests/phpunit/maintenance/CategoriesRdfTest.php b/tests/phpunit/maintenance/CategoriesRdfTest.php
index 0f48439d013..cbfcf513b54 100644
--- a/tests/phpunit/maintenance/CategoriesRdfTest.php
+++ b/tests/phpunit/maintenance/CategoriesRdfTest.php
@@ -3,9 +3,9 @@
 namespace MediaWiki\Tests\Maintenance;
 
 use DumpCategoriesAsRdf;
-use IMaintainableDatabase;
 use MediaWiki\MainConfigNames;
 use MediaWikiLangTestCase;
+use Wikimedia\Rdbms\IMaintainableDatabase;
 
 /**
  * @covers CategoriesRdf
diff --git a/tests/phpunit/mocks/search/MockCompletionSearchEngine.php b/tests/phpunit/mocks/search/MockCompletionSearchEngine.php
index 13d16df7373..ec4016d3d6a 100644
--- a/tests/phpunit/mocks/search/MockCompletionSearchEngine.php
+++ b/tests/phpunit/mocks/search/MockCompletionSearchEngine.php
@@ -1,5 +1,7 @@
 <?php
 
+use MediaWiki\Title\Title;
+
 /**
  * SearchEngine implementation for returning mocked completion search results.
  */
diff --git a/tests/phpunit/structure/DumpableObjectsTest.php b/tests/phpunit/structure/DumpableObjectsTest.php
index a88dc7f3162..2bc01fd8028 100644
--- a/tests/phpunit/structure/DumpableObjectsTest.php
+++ b/tests/phpunit/structure/DumpableObjectsTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\Title\Title;
 use MediaWiki\User\User;
 
 /**
diff --git a/tests/phpunit/unit/includes/actions/ActionFactoryTest.php b/tests/phpunit/unit/includes/actions/ActionFactoryTest.php
index 5130953037c..8422a8ac035 100644
--- a/tests/phpunit/unit/includes/actions/ActionFactoryTest.php
+++ b/tests/phpunit/unit/includes/actions/ActionFactoryTest.php
@@ -3,6 +3,7 @@
 use MediaWiki\Actions\ActionFactory;
 use MediaWiki\Request\FauxRequest;
 use MediaWiki\Tests\Unit\DummyServicesTrait;
+use MediaWiki\Title\Title;
 use PHPUnit\Framework\MockObject\MockObject;
 use Psr\Log\LogLevel;
 use Psr\Log\NullLogger;
diff --git a/tests/phpunit/unit/includes/api/ApiWatchlistTraitTest.php b/tests/phpunit/unit/includes/api/ApiWatchlistTraitTest.php
index 0d77c23360b..fd7821d3253 100644
--- a/tests/phpunit/unit/includes/api/ApiWatchlistTraitTest.php
+++ b/tests/phpunit/unit/includes/api/ApiWatchlistTraitTest.php
@@ -2,6 +2,7 @@
 
 use MediaWiki\Title\Title;
 use MediaWiki\User\Options\UserOptionsLookup;
+use MediaWiki\User\User;
 use MediaWiki\Watchlist\WatchlistManager;
 use Wikimedia\TestingAccessWrapper;
 
diff --git a/tests/phpunit/unit/includes/block/BlockCacheTest.php b/tests/phpunit/unit/includes/block/BlockCacheTest.php
index df43ccd9732..7ba552396e4 100644
--- a/tests/phpunit/unit/includes/block/BlockCacheTest.php
+++ b/tests/phpunit/unit/includes/block/BlockCacheTest.php
@@ -3,6 +3,7 @@
 use MediaWiki\Block\BlockCache;
 use MediaWiki\Block\BlockCacheKey;
 use MediaWiki\Block\SystemBlock;
+use MediaWiki\Request\FauxRequest;
 use MediaWiki\User\UserIdentityValue;
 
 /**
diff --git a/tests/phpunit/unit/includes/config/HashConfigTest.php b/tests/phpunit/unit/includes/config/HashConfigTest.php
index dc763789ac1..9ff04bf4619 100644
--- a/tests/phpunit/unit/includes/config/HashConfigTest.php
+++ b/tests/phpunit/unit/includes/config/HashConfigTest.php
@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\Config\ConfigException;
+use MediaWiki\Config\HashConfig;
 
 /**
  * @covers \MediaWiki\Config\HashConfig
diff --git a/tests/phpunit/unit/includes/editpage/Constraint/EditRightConstraintTest.php b/tests/phpunit/unit/includes/editpage/Constraint/EditRightConstraintTest.php
index 482d3629144..c32704739dd 100644
--- a/tests/phpunit/unit/includes/editpage/Constraint/EditRightConstraintTest.php
+++ b/tests/phpunit/unit/includes/editpage/Constraint/EditRightConstraintTest.php
@@ -22,6 +22,8 @@ use MediaWiki\EditPage\Constraint\EditRightConstraint;
 use MediaWiki\EditPage\Constraint\IEditConstraint;
 use MediaWiki\Permissions\PermissionManager;
 use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait;
+use MediaWiki\Title\Title;
+use MediaWiki\User\User;
 
 /**
  * Tests the EditRightConstraint
diff --git a/tests/phpunit/unit/includes/parser/MagicWordArrayTest.php b/tests/phpunit/unit/includes/parser/MagicWordArrayTest.php
index 6c5dc49c6a1..a1f79675f3a 100644
--- a/tests/phpunit/unit/includes/parser/MagicWordArrayTest.php
+++ b/tests/phpunit/unit/includes/parser/MagicWordArrayTest.php
@@ -1,5 +1,8 @@
 <?php
 
+use MediaWiki\Parser\MagicWord;
+use MediaWiki\Parser\MagicWordArray;
+use MediaWiki\Parser\MagicWordFactory;
 use Wikimedia\TestingAccessWrapper;
 
 /**
diff --git a/tests/phpunit/unit/includes/user/UserArrayFromResultTest.php b/tests/phpunit/unit/includes/user/UserArrayFromResultTest.php
index eb541a4b079..99ce8069112 100644
--- a/tests/phpunit/unit/includes/user/UserArrayFromResultTest.php
+++ b/tests/phpunit/unit/includes/user/UserArrayFromResultTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\User\User;
 use MediaWiki\User\UserArrayFromResult;
 
 /**
diff --git a/tests/phpunit/unit/includes/watcheditem/WatchedItemQueryServiceUnitTest.php b/tests/phpunit/unit/includes/watcheditem/WatchedItemQueryServiceUnitTest.php
index e797c52a201..0b16cc1a4da 100644
--- a/tests/phpunit/unit/includes/watcheditem/WatchedItemQueryServiceUnitTest.php
+++ b/tests/phpunit/unit/includes/watcheditem/WatchedItemQueryServiceUnitTest.php
@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\CommentStore\CommentStore;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Title\TitleValue;
 use MediaWiki\User\Options\UserOptionsLookup;
diff --git a/tests/phpunit/unit/includes/watchlist/WatchlistManagerUnitTest.php b/tests/phpunit/unit/includes/watchlist/WatchlistManagerUnitTest.php
index 3463926a9e6..df48c2417ec 100644
--- a/tests/phpunit/unit/includes/watchlist/WatchlistManagerUnitTest.php
+++ b/tests/phpunit/unit/includes/watchlist/WatchlistManagerUnitTest.php
@@ -11,6 +11,7 @@ use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait;
 use MediaWiki\Title\Title;
 use MediaWiki\Title\TitleValue;
 use MediaWiki\User\TalkPageNotificationManager;
+use MediaWiki\User\User;
 use MediaWiki\User\UserFactory;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\User\UserIdentityValue;