diff --git a/tests/parser/editTests.php b/tests/parser/editTests.php
index a9c721af5dc99..500161ab4a266 100644
--- a/tests/parser/editTests.php
+++ b/tests/parser/editTests.php
@@ -1,6 +1,7 @@
 <?php
 
 use MediaWiki\Settings\SettingsBuilder;
+use MediaWiki\Tests\AnsiTermColorer;
 
 require_once __DIR__ . '/../../maintenance/Maintenance.php';
 
diff --git a/tests/phpunit/LessFileCompilationTest.php b/tests/phpunit/LessFileCompilationTest.php
index 67fbf2c473b14..c5cc79ed37980 100644
--- a/tests/phpunit/LessFileCompilationTest.php
+++ b/tests/phpunit/LessFileCompilationTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use MediaWiki\ResourceLoader\Module;
+
 /**
  * Modelled on Sebastian Bergmann's PHPUnit_Extensions_PhptTestCase class.
  *
@@ -15,17 +17,16 @@ class LessFileCompilationTest extends ResourceLoaderTestCase {
 	protected $file;
 
 	/**
-	 * @var ResourceLoaderModule The ResourceLoader module that contains
-	 *   the file
+	 * @var Module The ResourceLoader module that contains the file
 	 */
 	protected $module;
 
 	/**
 	 * @param string $file
-	 * @param ResourceLoaderModule $module The ResourceLoader module that
+	 * @param Module $module The ResourceLoader module that
 	 *   contains the file
 	 */
-	public function __construct( $file, ResourceLoaderModule $module ) {
+	public function __construct( $file, Module $module ) {
 		parent::__construct( 'testLessFileCompilation' );
 
 		$this->file = $file;
diff --git a/tests/phpunit/includes/OutputPageTest.php b/tests/phpunit/includes/OutputPageTest.php
index 5fce9086e15ef..f522ef17155f9 100644
--- a/tests/phpunit/includes/OutputPageTest.php
+++ b/tests/phpunit/includes/OutputPageTest.php
@@ -7,6 +7,7 @@
 use MediaWiki\Page\PageStoreRecord;
 use MediaWiki\Permissions\Authority;
 use MediaWiki\ResourceLoader as RL;
+use MediaWiki\ResourceLoader\ResourceLoader;
 use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait;
 use PHPUnit\Framework\MockObject\MockObject;
 use Wikimedia\DependencyStore\KeyValueDependencyStore;
diff --git a/tests/phpunit/includes/ResourceLoader/StartUpModuleTest.php b/tests/phpunit/includes/ResourceLoader/StartUpModuleTest.php
index c3a5ff277d8af..9baad366de0b1 100644
--- a/tests/phpunit/includes/ResourceLoader/StartUpModuleTest.php
+++ b/tests/phpunit/includes/ResourceLoader/StartUpModuleTest.php
@@ -5,7 +5,6 @@
 use Exception;
 use MediaWiki\ResourceLoader\Module;
 use MediaWiki\ResourceLoader\StartUpModule;
-use ResourceLoaderStartUpModule;
 use ResourceLoaderTestCase;
 use ResourceLoaderTestModule;
 
@@ -766,7 +765,7 @@ public function testGetModuleRegistrationsProduction( array $case ) {
 		$context = $this->getResourceLoaderContext( [ 'debug' => 'false' ] );
 		$rl = $context->getResourceLoader();
 		$rl->register( $case['modules'] );
-		$module = new ResourceLoaderStartUpModule();
+		$module = new StartUpModule();
 		$module->setConfig( $rl->getConfig() );
 		$out = ltrim( $case['out'], "\n" );
 
@@ -809,7 +808,7 @@ public function testRegistrationsMinified( $modules ) {
 		] );
 		$rl = $context->getResourceLoader();
 		$rl->register( $modules );
-		$module = new ResourceLoaderStartUpModule();
+		$module = new StartUpModule();
 		$module->setConfig( $rl->getConfig() );
 		$out = 'mw.loader.addSource({"local":"/w/load.php"});' . "\n"
 		. 'mw.loader.register(['
@@ -835,7 +834,7 @@ public function testRegistrationsUnminified( $modules ) {
 		] );
 		$rl = $context->getResourceLoader();
 		$rl->register( $modules );
-		$module = new ResourceLoaderStartUpModule();
+		$module = new StartUpModule();
 		$module->setConfig( $rl->getConfig() );
 		$out =
 'mw.loader.addSource({
@@ -871,11 +870,11 @@ public function testRegistrationsUnminified( $modules ) {
 	public function testGetVersionHash_varyConfig() {
 		$context = $this->getResourceLoaderContext();
 
-		$module = new ResourceLoaderStartUpModule();
+		$module = new StartUpModule();
 		$module->setConfig( $context->getResourceLoader()->getConfig() );
 		$version1 = $module->getVersionHash( $context );
 
-		$module = new ResourceLoaderStartUpModule();
+		$module = new StartUpModule();
 		$module->setConfig( $context->getResourceLoader()->getConfig() );
 		$version2 = $module->getVersionHash( $context );
 
@@ -898,7 +897,7 @@ public function testGetVersionHash_varyModule() {
 			'test.a' => [ 'class' => ResourceLoaderTestModule::class ],
 			'test.b' => [ 'class' => ResourceLoaderTestModule::class ],
 		] );
-		$module = new ResourceLoaderStartUpModule();
+		$module = new StartUpModule();
 		$module->setConfig( $rl1->getConfig() );
 		$version1 = $module->getVersionHash( $context1 );
 
@@ -908,7 +907,7 @@ public function testGetVersionHash_varyModule() {
 			'test.b' => [ 'class' => ResourceLoaderTestModule::class ],
 			'test.c' => [ 'class' => ResourceLoaderTestModule::class ],
 		] );
-		$module = new ResourceLoaderStartUpModule();
+		$module = new StartUpModule();
 		$module->setConfig( $rl2->getConfig() );
 		$version2 = $module->getVersionHash( $context2 );
 
@@ -921,7 +920,7 @@ public function testGetVersionHash_varyModule() {
 				'script' => 'different',
 			],
 		] );
-		$module = new ResourceLoaderStartUpModule();
+		$module = new StartUpModule();
 		$module->setConfig( $rl3->getConfig() );
 		$version3 = $module->getVersionHash( $context3 );
 
@@ -951,7 +950,7 @@ public function testGetVersionHash_varyDeps() {
 				'dependencies' => [ 'x', 'y' ],
 			],
 		] );
-		$module = new ResourceLoaderStartUpModule();
+		$module = new StartUpModule();
 		$module->setConfig( $rl->getConfig() );
 		$version1 = $module->getVersionHash( $context );
 
@@ -963,7 +962,7 @@ public function testGetVersionHash_varyDeps() {
 				'dependencies' => [ 'x', 'z' ],
 			],
 		] );
-		$module = new ResourceLoaderStartUpModule();
+		$module = new StartUpModule();
 		$module->setConfig( $rl->getConfig() );
 		$version2 = $module->getVersionHash( $context );
 
diff --git a/tests/phpunit/includes/Revision/RenderedRevisionTest.php b/tests/phpunit/includes/Revision/RenderedRevisionTest.php
index a471b72af3502..b5d0370b650b8 100644
--- a/tests/phpunit/includes/Revision/RenderedRevisionTest.php
+++ b/tests/phpunit/includes/Revision/RenderedRevisionTest.php
@@ -6,6 +6,7 @@
 use InvalidArgumentException;
 use LogicException;
 use MediaWiki\Content\Renderer\ContentRenderer;
+use MediaWiki\Page\PageIdentity;
 use MediaWiki\Page\PageIdentityValue;
 use MediaWiki\Page\PageReference;
 use MediaWiki\Revision\MutableRevisionRecord;
diff --git a/tests/phpunit/includes/Storage/DerivedPageDataUpdaterTest.php b/tests/phpunit/includes/Storage/DerivedPageDataUpdaterTest.php
index 122885786ce2b..cf1ceaf7211f7 100644
--- a/tests/phpunit/includes/Storage/DerivedPageDataUpdaterTest.php
+++ b/tests/phpunit/includes/Storage/DerivedPageDataUpdaterTest.php
@@ -19,6 +19,7 @@
 use MediaWiki\Storage\EditResultCache;
 use MediaWiki\Storage\RevisionSlotsUpdate;
 use MediaWikiIntegrationTestCase;
+use Message;
 use MockTitleTrait;
 use MWCallableUpdate;
 use MWTimestamp;
diff --git a/tests/phpunit/includes/auth/AuthManagerTest.php b/tests/phpunit/includes/auth/AuthManagerTest.php
index 11681ce00c70c..8b46e667dfee6 100644
--- a/tests/phpunit/includes/auth/AuthManagerTest.php
+++ b/tests/phpunit/includes/auth/AuthManagerTest.php
@@ -3,6 +3,7 @@
 namespace MediaWiki\Auth;
 
 use Config;
+use Language;
 use MediaWiki\Auth\Hook\AuthManagerLoginAuthenticateAuditHook;
 use MediaWiki\Auth\Hook\LocalUserCreatedHook;
 use MediaWiki\Auth\Hook\SecuritySensitiveOperationStatusHook;
@@ -11,6 +12,7 @@
 use MediaWiki\Block\DatabaseBlock;
 use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\HookContainer\StaticHookRegistry;
+use MediaWiki\Languages\LanguageConverterFactory;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Session\SessionInfo;
 use MediaWiki\Session\SessionProvider;
@@ -32,6 +34,7 @@
 use StatusValue;
 use WebRequest;
 use Wikimedia\ObjectFactory\ObjectFactory;
+use Wikimedia\Rdbms\ILoadBalancer;
 use Wikimedia\ScopedCallback;
 use Wikimedia\TestingAccessWrapper;
 
diff --git a/tests/phpunit/includes/auth/UserDataAuthenticationRequestTest.php b/tests/phpunit/includes/auth/UserDataAuthenticationRequestTest.php
index f98fbe5de5cbb..dd464857630d2 100644
--- a/tests/phpunit/includes/auth/UserDataAuthenticationRequestTest.php
+++ b/tests/phpunit/includes/auth/UserDataAuthenticationRequestTest.php
@@ -21,7 +21,7 @@ protected function setUp(): void {
 	 * @dataProvider providePopulateUser
 	 * @param string $email Email to set
 	 * @param string $realname Realname to set
-	 * @param StatusValue $expect Expected return
+	 * @param \StatusValue $expect Expected return
 	 */
 	public function testPopulateUser( $email, $realname, $expect ) {
 		$user = new \User();
diff --git a/tests/phpunit/includes/specials/ContribsPagerTest.php b/tests/phpunit/includes/specials/ContribsPagerTest.php
index 7ca3f14c555dc..c554a08753194 100644
--- a/tests/phpunit/includes/specials/ContribsPagerTest.php
+++ b/tests/phpunit/includes/specials/ContribsPagerTest.php
@@ -1,8 +1,14 @@
 <?php
 
+use MediaWiki\Cache\LinkBatchFactory;
+use MediaWiki\CommentFormatter\CommentFormatter;
+use MediaWiki\HookContainer\HookContainer;
+use MediaWiki\Linker\LinkRenderer;
+use MediaWiki\Revision\RevisionStore;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\User\UserIdentityValue;
 use Wikimedia\Rdbms\FakeResultWrapper;
+use Wikimedia\Rdbms\ILoadBalancer;
 use Wikimedia\TestingAccessWrapper;
 
 /**
diff --git a/tests/phpunit/includes/specials/DeletedContribsPagerTest.php b/tests/phpunit/includes/specials/DeletedContribsPagerTest.php
index ef956daf35e1c..531c3d1c7214e 100644
--- a/tests/phpunit/includes/specials/DeletedContribsPagerTest.php
+++ b/tests/phpunit/includes/specials/DeletedContribsPagerTest.php
@@ -1,5 +1,10 @@
 <?php
 
+use MediaWiki\HookContainer\HookContainer;
+use MediaWiki\Linker\LinkRenderer;
+use MediaWiki\Revision\RevisionStore;
+use Wikimedia\Rdbms\ILoadBalancer;
+
 /**
  * @group Database
  */
diff --git a/tests/phpunit/includes/title/NamespaceInfoTest.php b/tests/phpunit/includes/title/NamespaceInfoTest.php
index 637f243dcf7ef..af6b9a0d59b0a 100644
--- a/tests/phpunit/includes/title/NamespaceInfoTest.php
+++ b/tests/phpunit/includes/title/NamespaceInfoTest.php
@@ -8,6 +8,7 @@
 use MediaWiki\Config\ServiceOptions;
 use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\Linker\LinkTarget;
+use Wikimedia\ScopedCallback;
 
 class NamespaceInfoTest extends MediaWikiIntegrationTestCase {
 	use TestAllServiceOptionsUsed;
diff --git a/tests/phpunit/includes/watcheditem/WatchedItemStoreUnitTest.php b/tests/phpunit/includes/watcheditem/WatchedItemStoreUnitTest.php
index a508233fa989c..77b8d83af4558 100644
--- a/tests/phpunit/includes/watcheditem/WatchedItemStoreUnitTest.php
+++ b/tests/phpunit/includes/watcheditem/WatchedItemStoreUnitTest.php
@@ -5,6 +5,7 @@
 use MediaWiki\Linker\LinksMigration;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\Logger\LoggerFactory;
+use MediaWiki\Page\PageIdentity;
 use MediaWiki\Page\PageIdentityValue;
 use MediaWiki\Revision\RevisionLookup;
 use MediaWiki\Revision\RevisionRecord;
diff --git a/tests/phpunit/integration/includes/Permissions/RestrictionStoreTest.php b/tests/phpunit/integration/includes/Permissions/RestrictionStoreTest.php
index 4327ee07a20ff..f4d475401a25b 100644
--- a/tests/phpunit/integration/includes/Permissions/RestrictionStoreTest.php
+++ b/tests/phpunit/integration/includes/Permissions/RestrictionStoreTest.php
@@ -2,13 +2,20 @@
 
 namespace MediaWiki\Tests\Integration\Permissions;
 
+use CommentStore;
 use IDBAccessObject;
+use LinkCache;
 use MediaWiki\Cache\CacheKeyHelper;
 use MediaWiki\Config\ServiceOptions;
+use MediaWiki\HookContainer\HookContainer;
+use MediaWiki\Linker\LinksMigration;
 use MediaWiki\Page\PageIdentityValue;
+use MediaWiki\Page\PageStore;
 use MediaWiki\Permissions\RestrictionStore;
 use MediaWikiIntegrationTestCase;
 use Title;
+use WANObjectCache;
+use Wikimedia\Rdbms\ILoadBalancer;
 use Wikimedia\TestingAccessWrapper;
 
 /**
@@ -31,7 +38,7 @@ class RestrictionStoreTest extends MediaWikiIntegrationTestCase {
 	/** @var LinkCache */
 	private $linkCache;
 
-	/** @var \MediaWiki\Linker\LinksMigration */
+	/** @var LinksMigration */
 	private $linksMigration;
 
 	/** @var HookContainer */
diff --git a/tests/phpunit/maintenance/fetchTextTest.php b/tests/phpunit/maintenance/fetchTextTest.php
index f1dd40319bc38..392d7561b91cb 100644
--- a/tests/phpunit/maintenance/fetchTextTest.php
+++ b/tests/phpunit/maintenance/fetchTextTest.php
@@ -3,6 +3,7 @@
 namespace MediaWiki\Tests\Maintenance;
 
 use ContentHandler;
+use Exception;
 use FetchText;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWikiIntegrationTestCase;
diff --git a/tests/phpunit/unit/includes/auth/AuthenticationResponseTest.php b/tests/phpunit/unit/includes/auth/AuthenticationResponseTest.php
index 346b3bae553b0..0f4d80571a64f 100644
--- a/tests/phpunit/unit/includes/auth/AuthenticationResponseTest.php
+++ b/tests/phpunit/unit/includes/auth/AuthenticationResponseTest.php
@@ -11,7 +11,7 @@ class AuthenticationResponseTest extends \MediaWikiUnitTestCase {
 	 * @dataProvider provideConstructors
 	 * @param string $constructor
 	 * @param array $args
-	 * @param array|Exception $expect
+	 * @param array|\Exception $expect
 	 */
 	public function testConstructors( $constructor, $args, $expect ) {
 		if ( is_array( $expect ) ) {
diff --git a/tests/phpunit/unit/includes/libs/StringUtilsTest.php b/tests/phpunit/unit/includes/libs/StringUtilsTest.php
index 93b4c8f2940d3..4a6e1833e753a 100644
--- a/tests/phpunit/unit/includes/libs/StringUtilsTest.php
+++ b/tests/phpunit/unit/includes/libs/StringUtilsTest.php
@@ -127,7 +127,7 @@ public static function provideStringsForIsUtf8Check() {
 	}
 
 	/**
-	 * @param strin $input
+	 * @param string $input
 	 * @param bool $expected
 	 * @dataProvider provideRegexps
 	 * @covers StringUtils::isValidPCRERegex