tests: Namespace api tests

Bug: T357823
Change-Id: I0d7cc2c9b166d5e5b913c1305f7cee017fe377af

84 files changed, 460 insertions, 34 deletions

diff --git a/tests/common/TestsAutoLoader.php b/tests/common/TestsAutoLoader.php
index 97b763f37521..587fb90ef198 100644
--- a/tests/common/TestsAutoLoader.php
+++ b/tests/common/TestsAutoLoader.php
@@ -87,15 +87,20 @@ $wgAutoloadClasses += [
 	'TestLogger' => "$testDir/phpunit/mocks/TestLogger.php",
 
 	# tests/phpunit/includes/api
-	'ApiFormatTestBase' => "$testDir/phpunit/includes/api/format/ApiFormatTestBase.php",
 	'ApiQueryTestBase' => "$testDir/phpunit/includes/api/query/ApiQueryTestBase.php",
-	'ApiQueryContinueTestBase' => "$testDir/phpunit/includes/api/query/ApiQueryContinueTestBase.php",
 	'ApiTestCase' => "$testDir/phpunit/includes/api/ApiTestCase.php",
 	'ApiTestContext' => "$testDir/phpunit/includes/api/ApiTestContext.php",
 	'ApiUploadTestCase' => "$testDir/phpunit/includes/api/ApiUploadTestCase.php",
-	'MockApi' => "$testDir/phpunit/includes/api/MockApi.php",
-	'MockApiQueryBase' => "$testDir/phpunit/includes/api/MockApiQueryBase.php",
 	'RandomImageGenerator' => "$testDir/phpunit/includes/api/RandomImageGenerator.php",
+	'MediaWiki\\Tests\\Api\\Format\\ApiFormatTestBase' => "$testDir/phpunit/includes/api/format/ApiFormatTestBase.php",
+	'MediaWiki\\Tests\\Api\\Query\\ApiQueryTestBase' => "$testDir/phpunit/includes/api/query/ApiQueryTestBase.php",
+	'MediaWiki\\Tests\\Api\\Query\\ApiQueryContinueTestBase' => "$testDir/phpunit/includes/api/query/ApiQueryContinueTestBase.php",
+	'MediaWiki\\Tests\\Api\\ApiTestCase' => "$testDir/phpunit/includes/api/ApiTestCase.php",
+	'MediaWiki\\Tests\\Api\\ApiTestContext' => "$testDir/phpunit/includes/api/ApiTestContext.php",
+	'MediaWiki\\Tests\\Api\\ApiUploadTestCase' => "$testDir/phpunit/includes/api/ApiUploadTestCase.php",
+	'MediaWiki\\Tests\\Api\\MockApi' => "$testDir/phpunit/includes/api/MockApi.php",
+	'MediaWiki\\Tests\\Api\\MockApiQueryBase' => "$testDir/phpunit/includes/api/MockApiQueryBase.php",
+	'MediaWiki\\Tests\\Api\\RandomImageGenerator' => "$testDir/phpunit/includes/api/RandomImageGenerator.php",
 
 	# tests/phpunit/includes/auth
 	'MediaWiki\\Auth\\AuthenticationRequestTestCase' =>
diff --git a/tests/phpunit/includes/api/ApiAcquireTempUserNameTest.php b/tests/phpunit/includes/api/ApiAcquireTempUserNameTest.php
index 72d29653fd5a..17a1c105c35c 100644
--- a/tests/phpunit/includes/api/ApiAcquireTempUserNameTest.php
+++ b/tests/phpunit/includes/api/ApiAcquireTempUserNameTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace MediaWiki\Tests\Api;
+
 use MediaWiki\MainConfigNames;
 use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait;
 use MediaWiki\User\TempUser\TempUserCreator;
diff --git a/tests/phpunit/includes/api/ApiBaseTest.php b/tests/phpunit/includes/api/ApiBaseTest.php
index a1e1f5b6da16..4d52d4439431 100644
--- a/tests/phpunit/includes/api/ApiBaseTest.php
+++ b/tests/phpunit/includes/api/ApiBaseTest.php
@@ -1,20 +1,34 @@
 <?php
 
+namespace MediaWiki\Tests\Api;
+
+use ApiBase;
+use ApiBlockInfoTrait;
+use ApiMain;
+use ApiMessage;
+use ApiUsageException;
+use DomainException;
+use Exception;
 use MediaWiki\Api\Validator\SubmoduleDef;
 use MediaWiki\Block\DatabaseBlock;
 use MediaWiki\Context\DerivativeContext;
 use MediaWiki\Context\RequestContext;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Message\Message;
 use MediaWiki\ParamValidator\TypeDef\NamespaceDef;
 use MediaWiki\Permissions\PermissionStatus;
 use MediaWiki\Request\FauxRequest;
 use MediaWiki\Status\Status;
 use MediaWiki\Title\Title;
+use MessageSpecifier;
+use MWException;
+use StatusValue;
 use Wikimedia\ParamValidator\ParamValidator;
 use Wikimedia\ParamValidator\TypeDef\EnumDef;
 use Wikimedia\ParamValidator\TypeDef\IntegerDef;
 use Wikimedia\ParamValidator\TypeDef\StringDef;
 use Wikimedia\TestingAccessWrapper;
+use WikiPage;
 
 /**
  * @group API
diff --git a/tests/phpunit/includes/api/ApiBlockInfoTraitTest.php b/tests/phpunit/includes/api/ApiBlockInfoTraitTest.php
index 51485e15e190..cfc11505731d 100644
--- a/tests/phpunit/includes/api/ApiBlockInfoTraitTest.php
+++ b/tests/phpunit/includes/api/ApiBlockInfoTraitTest.php
@@ -1,9 +1,13 @@
 <?php
 
+namespace MediaWiki\Tests\Api;
+
+use ApiBlockInfoTrait;
 use MediaWiki\Block\CompositeBlock;
 use MediaWiki\Block\DatabaseBlock;
 use MediaWiki\Block\SystemBlock;
 use MediaWiki\Tests\Unit\DummyServicesTrait;
+use MediaWikiIntegrationTestCase;
 use Wikimedia\TestingAccessWrapper;
 
 /**
diff --git a/tests/phpunit/includes/api/ApiBlockTest.php b/tests/phpunit/includes/api/ApiBlockTest.php
index 73aa11b57b46..8099e4ce8cea 100644
--- a/tests/phpunit/includes/api/ApiBlockTest.php
+++ b/tests/phpunit/includes/api/ApiBlockTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace MediaWiki\Tests\Api;
+
 use MediaWiki\Block\DatabaseBlock;
 use MediaWiki\Block\Restriction\ActionRestriction;
 use MediaWiki\Block\Restriction\NamespaceRestriction;
diff --git a/tests/phpunit/includes/api/ApiCSPReportTest.php b/tests/phpunit/includes/api/ApiCSPReportTest.php
index 5dc4bbbe7f4c..7f8357d82c9b 100644
--- a/tests/phpunit/includes/api/ApiCSPReportTest.php
+++ b/tests/phpunit/includes/api/ApiCSPReportTest.php
@@ -1,7 +1,13 @@
 <?php
 
+namespace MediaWiki\Tests\Api;
+
+use ApiCSPReport;
+use ApiResult;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Request\FauxRequest;
+use MediaWikiIntegrationTestCase;
+use Psr\Log\AbstractLogger;
 
 /**
  * @group API
@@ -77,7 +83,7 @@ class ApiCSPReportTest extends MediaWikiIntegrationTestCase {
 
 	private function doExecute( array $params, array $cspReport ) {
 		$log = [];
-		$logger = $this->createMock( Psr\Log\AbstractLogger::class );
+		$logger = $this->createMock( AbstractLogger::class );
 		$logger->method( 'warning' )->willReturnCallback(
 			static function ( $msg, $ctx ) use ( &$log ) {
 				unset( $ctx['csp-report'] );
diff --git a/tests/phpunit/includes/api/ApiChangeContentModelTest.php b/tests/phpunit/includes/api/ApiChangeContentModelTest.php
index 0b7702dbd079..59aaedb40f2b 100644
--- a/tests/phpunit/includes/api/ApiChangeContentModelTest.php
+++ b/tests/phpunit/includes/api/ApiChangeContentModelTest.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace MediaWiki\Tests\Api;
+
+use ApiUsageException;
+use IDBAccessObject;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Status\Status;
 use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait;
diff --git a/tests/phpunit/includes/api/ApiCheckTokenTest.php b/tests/phpunit/includes/api/ApiCheckTokenTest.php
index da90f56df5c5..2301524a962e 100644
--- a/tests/phpunit/includes/api/ApiCheckTokenTest.php
+++ b/tests/phpunit/includes/api/ApiCheckTokenTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace MediaWiki\Tests\Api;
+
 use MediaWiki\Session\Token;
 
 /**
diff --git a/tests/phpunit/includes/api/ApiClearHasMsgTest.php b/tests/phpunit/includes/api/ApiClearHasMsgTest.php
index fb2a2d371da4..d207948d99a4 100644
--- a/tests/phpunit/includes/api/ApiClearHasMsgTest.php
+++ b/tests/phpunit/includes/api/ApiClearHasMsgTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace MediaWiki\Tests\Api;
+
 use MediaWiki\Permissions\UltimateAuthority;
 use MediaWiki\User\UserIdentityValue;
 
diff --git a/tests/phpunit/includes/api/ApiComparePagesTest.php b/tests/phpunit/includes/api/ApiComparePagesTest.php
index c645642d23e1..5fa9adfcc9e1 100644
--- a/tests/phpunit/includes/api/ApiComparePagesTest.php
+++ b/tests/phpunit/includes/api/ApiComparePagesTest.php
@@ -1,10 +1,14 @@
 <?php
 
+namespace MediaWiki\Tests\Api;
+
+use ApiUsageException;
 use MediaWiki\Context\RequestContext;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Title\Title;
 use MediaWiki\Title\TitleValue;
+use RevisionDeleter;
 
 /**
  * @group API
diff --git a/tests/phpunit/includes/api/ApiContinuationManagerTest.php b/tests/phpunit/includes/api/ApiContinuationManagerTest.php
index 3f6e882170c8..61e8519eb88e 100644
--- a/tests/phpunit/includes/api/ApiContinuationManagerTest.php
+++ b/tests/phpunit/includes/api/ApiContinuationManagerTest.php
@@ -1,8 +1,15 @@
 <?php
 
+namespace MediaWiki\Tests\Api;
+
+use ApiContinuationManager;
+use ApiMain;
+use ApiResult;
+use ApiUsageException;
 use MediaWiki\Context\DerivativeContext;
 use MediaWiki\Context\RequestContext;
 use MediaWiki\Request\FauxRequest;
+use UnexpectedValueException;
 
 /**
  * @covers \ApiContinuationManager
diff --git a/tests/phpunit/includes/api/ApiCreateTempUserTraitTest.php b/tests/phpunit/includes/api/ApiCreateTempUserTraitTest.php
index ed955786a81f..fbbefec09508 100644
--- a/tests/phpunit/includes/api/ApiCreateTempUserTraitTest.php
+++ b/tests/phpunit/includes/api/ApiCreateTempUserTraitTest.php
@@ -1,8 +1,12 @@
 <?php
 
+namespace MediaWiki\Tests\Api;
+
+use ApiCreateTempUserTrait;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\Request\WebRequest;
 use MediaWiki\User\User;
+use MediaWikiIntegrationTestCase;
 use Wikimedia\TestingAccessWrapper;
 
 /**
diff --git a/tests/phpunit/includes/api/ApiDeleteTest.php b/tests/phpunit/includes/api/ApiDeleteTest.php
index 3c943cdbdebc..13c87ee0af8e 100644
--- a/tests/phpunit/includes/api/ApiDeleteTest.php
+++ b/tests/phpunit/includes/api/ApiDeleteTest.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace MediaWiki\Tests\Api;
+
+use IDBAccessObject;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Title\Title;
 use MediaWiki\User\User;
diff --git a/tests/phpunit/includes/api/ApiDisabledTest.php b/tests/phpunit/includes/api/ApiDisabledTest.php
index 99e83f594975..06a3f179a4af 100644
--- a/tests/phpunit/includes/api/ApiDisabledTest.php
+++ b/tests/phpunit/includes/api/ApiDisabledTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace MediaWiki\Tests\Api;
+
 /**
  * @group API
  * @group medium
diff --git a/tests/phpunit/includes/api/ApiEditPageTest.php b/tests/phpunit/includes/api/ApiEditPageTest.php
index ebce8f2f196f..9490c45a1dc6 100644
--- a/tests/phpunit/includes/api/ApiEditPageTest.php
+++ b/tests/phpunit/includes/api/ApiEditPageTest.php
@@ -1,5 +1,10 @@
 <?php
 
+namespace MediaWiki\Tests\Api;
+
+use ApiUsageException;
+use IDBAccessObject;
+use JavaScriptContent;
 use MediaWiki\Block\DatabaseBlock;
 use MediaWiki\CommentStore\CommentStoreComment;
 use MediaWiki\Context\RequestContext;
@@ -10,6 +15,9 @@ use MediaWiki\Title\Title;
 use MediaWiki\Title\TitleValue;
 use MediaWiki\User\User;
 use MediaWiki\Utils\MWTimestamp;
+use RevisionDeleter;
+use WikiPage;
+use WikitextContent;
 
 /**
  * Tests for MediaWiki api.php?action=edit.
diff --git a/tests/phpunit/includes/api/ApiEntryPointTest.php b/tests/phpunit/includes/api/ApiEntryPointTest.php
index 847ec33b923f..3bb29b8a9184 100644
--- a/tests/phpunit/includes/api/ApiEntryPointTest.php
+++ b/tests/phpunit/includes/api/ApiEntryPointTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace MediaWiki\Tests\Api;
+
 use MediaWiki\Api\ApiEntryPoint;
 use MediaWiki\Request\FauxRequest;
 use MediaWiki\Tests\MockEnvironment;
diff --git a/tests/phpunit/includes/api/ApiErrorFormatterTest.php b/tests/phpunit/includes/api/ApiErrorFormatterTest.php
index 75abd600f344..cc43e4ab7dfa 100644
--- a/tests/phpunit/includes/api/ApiErrorFormatterTest.php
+++ b/tests/phpunit/includes/api/ApiErrorFormatterTest.php
@@ -1,7 +1,19 @@
 <?php
 
+namespace MediaWiki\Tests\Api;
+
+use ApiErrorFormatter;
+use ApiErrorFormatter_BackCompat;
+use ApiMessage;
+use ApiResult;
+use Exception;
+use IApiMessage;
+use LocalizedException;
 use MediaWiki\Language\RawMessage;
+use MediaWiki\Message\Message;
 use MediaWiki\Status\Status;
+use MediaWikiLangTestCase;
+use RuntimeException;
 use Wikimedia\TestingAccessWrapper;
 
 /**
diff --git a/tests/phpunit/includes/api/ApiLoginTest.php b/tests/phpunit/includes/api/ApiLoginTest.php
index 3211ab8a2665..f77984be1a59 100644
--- a/tests/phpunit/includes/api/ApiLoginTest.php
+++ b/tests/phpunit/includes/api/ApiLoginTest.php
@@ -1,10 +1,18 @@
 <?php
 
+namespace MediaWiki\Tests\Api;
+
+use ApiErrorFormatter;
+use MediaWiki\Auth\AbstractSecondaryAuthenticationProvider;
+use MediaWiki\Auth\AuthenticationResponse;
+use MediaWiki\Auth\UsernameAuthenticationRequest;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Session\BotPasswordSessionProvider;
 use MediaWiki\Session\SessionManager;
+use MediaWiki\Session\Token;
 use MediaWiki\User\BotPassword;
 use MediaWiki\User\User;
+use MWRestrictions;
 use Wikimedia\TestingAccessWrapper;
 
 /**
@@ -53,7 +61,7 @@ class ApiLoginTest extends ApiTestCase {
 			'action' => 'login',
 			'lgname' => '',
 			'lgpassword' => $this->getTestSysop()->getPassword(),
-			'lgtoken' => (string)( new MediaWiki\Session\Token( 'foobar', '' ) ),
+			'lgtoken' => (string)( new Token( 'foobar', '' ) ),
 		], $session );
 		$this->assertSame( 'Failed', $ret[0]['login']['result'] );
 	}
@@ -158,7 +166,7 @@ class ApiLoginTest extends ApiTestCase {
 		$this->assertArrayNotHasKey( 'warnings', $ret );
 
 		// Lose the session
-		MediaWiki\Session\SessionManager::getGlobalSession()->clear();
+		SessionManager::getGlobalSession()->clear();
 		$ret[2] = [];
 
 		$ret = $this->doApiRequest( [
@@ -231,10 +239,10 @@ class ApiLoginTest extends ApiTestCase {
 		);
 
 		$mockProvider = $this->createMock(
-			MediaWiki\Auth\AbstractSecondaryAuthenticationProvider::class );
+			AbstractSecondaryAuthenticationProvider::class );
 		$mockProvider->method( 'beginSecondaryAuthentication' )->willReturn(
-			MediaWiki\Auth\AuthenticationResponse::newUI(
-				[ new MediaWiki\Auth\UsernameAuthenticationRequest ],
+			AuthenticationResponse::newUI(
+				[ new UsernameAuthenticationRequest ],
 				// Slightly silly message here
 				wfMessage( 'mainpage' )
 			)
diff --git a/tests/phpunit/includes/api/ApiLogoutTest.php b/tests/phpunit/includes/api/ApiLogoutTest.php
index 5523e9afa4d7..0fc3338456c6 100644
--- a/tests/phpunit/includes/api/ApiLogoutTest.php
+++ b/tests/phpunit/includes/api/ApiLogoutTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace MediaWiki\Tests\Api;
+
 use MediaWiki\User\User;
 
 /**
diff --git a/tests/phpunit/includes/api/ApiMainTest.php b/tests/phpunit/includes/api/ApiMainTest.php
index 67d646db3ce8..4721682af680 100644
--- a/tests/phpunit/includes/api/ApiMainTest.php
+++ b/tests/phpunit/includes/api/ApiMainTest.php
@@ -1,5 +1,18 @@
 <?php
 
+namespace MediaWiki\Tests\Api;
+
+use ApiBase;
+use ApiContinuationManager;
+use ApiErrorFormatter;
+use ApiErrorFormatter_BackCompat;
+use ApiMain;
+use ApiRawMessage;
+use ApiUsageException;
+use FormatJson;
+use Generator;
+use InvalidArgumentException;
+use LogicException;
 use MediaWiki\Config\Config;
 use MediaWiki\Config\HashConfig;
 use MediaWiki\Config\MultiConfig;
@@ -10,9 +23,13 @@ use MediaWiki\Permissions\Authority;
 use MediaWiki\Request\FauxRequest;
 use MediaWiki\Request\FauxResponse;
 use MediaWiki\Request\WebRequest;
+use MediaWiki\ShellDisabledError;
 use MediaWiki\StubObject\StubGlobalUser;
 use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait;
 use MediaWiki\User\User;
+use MWExceptionHandler;
+use StatusValue;
+use UnexpectedValueException;
 use Wikimedia\Rdbms\DBConnRef;
 use Wikimedia\Rdbms\DBQueryError;
 use Wikimedia\Rdbms\IDatabase;
@@ -1019,7 +1036,7 @@ class ApiMainTest extends ApiTestCase {
 		)->inLanguage( 'en' )->useDatabase( false )->text();
 
 		// The specific exception doesn't matter, as long as it's namespaced.
-		$nsex = new MediaWiki\ShellDisabledError();
+		$nsex = new ShellDisabledError();
 		$nstrace = wfMessage( 'api-exception-trace',
 			get_class( $nsex ),
 			$nsex->getFile(),
@@ -1098,7 +1115,7 @@ class ApiMainTest extends ApiTestCase {
 							'code' => 'internal_api_error_MediaWiki\ShellDisabledError',
 							'text' => "[$reqId] Exception caught: " . $nsex->getMessage(),
 							'data' => [
-								'errorclass' => MediaWiki\ShellDisabledError::class,
+								'errorclass' => ShellDisabledError::class,
 							],
 						]
 					],
@@ -1164,7 +1181,7 @@ class ApiMainTest extends ApiTestCase {
 	}
 
 	public function testMatchRequestedHeaders() {
-		$api = Wikimedia\TestingAccessWrapper::newFromClass( ApiMain::class );
+		$api = TestingAccessWrapper::newFromClass( ApiMain::class );
 		$allowedHeaders = [ 'Accept', 'Origin', 'User-Agent' ];
 
 		$this->assertTrue( $api->matchRequestedHeaders( 'Accept', $allowedHeaders ) );
diff --git a/tests/phpunit/includes/api/ApiMessageTest.php b/tests/phpunit/includes/api/ApiMessageTest.php
index 83355dd8825b..c63f903e3738 100644
--- a/tests/phpunit/includes/api/ApiMessageTest.php
+++ b/tests/phpunit/includes/api/ApiMessageTest.php
@@ -1,7 +1,14 @@
 <?php
 
+namespace MediaWiki\Tests\Api;
+
+use ApiMessage;
+use ApiRawMessage;
+use InvalidArgumentException;
 use MediaWiki\Language\RawMessage;
+use MediaWiki\Message\Message;
 use MediaWiki\Page\PageReferenceValue;
+use MediaWikiIntegrationTestCase;
 use Wikimedia\TestingAccessWrapper;
 
 /**
diff --git a/tests/phpunit/includes/api/ApiMoveTest.php b/tests/phpunit/includes/api/ApiMoveTest.php
index 494c5ded7fcf..6d1e88cfb397 100644
--- a/tests/phpunit/includes/api/ApiMoveTest.php
+++ b/tests/phpunit/includes/api/ApiMoveTest.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace MediaWiki\Tests\Api;
+
+use ApiUsageException;
+use IDBAccessObject;
 use MediaWiki\Block\DatabaseBlock;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Revision\SlotRecord;
diff --git a/tests/phpunit/includes/api/ApiOpenSearchTest.php b/tests/phpunit/includes/api/ApiOpenSearchTest.php
index 67de632b1d2e..c5d35f9f0af7 100644
--- a/tests/phpunit/includes/api/ApiOpenSearchTest.php
+++ b/tests/phpunit/includes/api/ApiOpenSearchTest.php
@@ -1,6 +1,14 @@
 <?php
 
+namespace MediaWiki\Tests\Api;
+
+use ApiMain;
+use ApiOpenSearch;
 use MediaWiki\Context\RequestContext;
+use MediaWikiIntegrationTestCase;
+use SearchEngine;
+use SearchEngineConfig;
+use SearchEngineFactory;
 use Wikimedia\ParamValidator\ParamValidator;
 
 /**
diff --git a/tests/phpunit/includes/api/ApiOptionsTest.php b/tests/phpunit/includes/api/ApiOptionsTest.php
index eed6e6f8ed23..ffad9236e7be 100644
--- a/tests/phpunit/includes/api/ApiOptionsTest.php
+++ b/tests/phpunit/includes/api/ApiOptionsTest.php
@@ -1,5 +1,12 @@
 <?php
 
+namespace MediaWiki\Tests\Api;
+
+namespace MediaWiki\Tests\Api;
+
+use ApiMain;
+use ApiOptions;
+use ApiUsageException;
 use MediaWiki\Context\DerivativeContext;
 use MediaWiki\Context\IContextSource;
 use MediaWiki\Context\RequestContext;
diff --git a/tests/phpunit/includes/api/ApiPageSetTest.php b/tests/phpunit/includes/api/ApiPageSetTest.php
index 2df9355c11d9..1bff8da23aaf 100644
--- a/tests/phpunit/includes/api/ApiPageSetTest.php
+++ b/tests/phpunit/includes/api/ApiPageSetTest.php
@@ -1,5 +1,10 @@
 <?php
 
+namespace MediaWiki\Tests\Api;
+
+use ApiMain;
+use ApiPageSet;
+use ApiResult;
 use MediaWiki\Context\RequestContext;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\MainConfigNames;
@@ -9,6 +14,7 @@ use MediaWiki\Request\FauxRequest;
 use MediaWiki\Tests\Unit\DummyServicesTrait;
 use MediaWiki\Title\Title;
 use MediaWiki\Title\TitleValue;
+use RuntimeException;
 use Wikimedia\TestingAccessWrapper;
 
 /**
@@ -106,7 +112,7 @@ class ApiPageSetTest extends ApiTestCase {
 			"#REDIRECT [[$redirectOneTitle]]"
 		);
 		$pageSet->setRedirectMergePolicy( static function ( $cur, $new ) {
-			throw new \RuntimeException( 'unreachable, no merge when target is redirect loop' );
+			throw new RuntimeException( 'unreachable, no merge when target is redirect loop' );
 		} );
 		// This could infinite loop in a bugged impl, but php doesn't offer
 		// a great way to time constrain this.
diff --git a/tests/phpunit/includes/api/ApiParseTest.php b/tests/phpunit/includes/api/ApiParseTest.php
index 9c900f7b494a..85de5220dd6e 100644
--- a/tests/phpunit/includes/api/ApiParseTest.php
+++ b/tests/phpunit/includes/api/ApiParseTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * ApiParse check functions
  *
@@ -20,10 +21,16 @@
  * @file
  */
 
+namespace MediaWiki\Tests\Api;
+
+use ApiUsageException;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Tests\Unit\DummyServicesTrait;
 use MediaWiki\Title\TitleValue;
+use MockPoolCounterFailing;
+use SkinFactory;
+use SkinFallback;
 
 /**
  * @group API
diff --git a/tests/phpunit/includes/api/ApiProtectTest.php b/tests/phpunit/includes/api/ApiProtectTest.php
index 55fc76c813df..19129db247ff 100644
--- a/tests/phpunit/includes/api/ApiProtectTest.php
+++ b/tests/phpunit/includes/api/ApiProtectTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace MediaWiki\Tests\Api;
+
 use MediaWiki\MainConfigNames;
 use MediaWiki\Title\Title;
 
diff --git a/tests/phpunit/includes/api/ApiPurgeTest.php b/tests/phpunit/includes/api/ApiPurgeTest.php
index e65e8f0a31c6..4df068caf56d 100644
--- a/tests/phpunit/includes/api/ApiPurgeTest.php
+++ b/tests/phpunit/includes/api/ApiPurgeTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace MediaWiki\Tests\Api;
+
 use MediaWiki\Context\RequestContext;
 use MediaWiki\Permissions\Authority;
 use MediaWiki\Permissions\PermissionStatus;
diff --git a/tests/phpunit/includes/api/ApiResultTest.php b/tests/phpunit/includes/api/ApiResultTest.php
index cf55a75f2b2c..5909ea7cfd74 100644
--- a/tests/phpunit/includes/api/ApiResultTest.php
+++ b/tests/phpunit/includes/api/ApiResultTest.php
@@ -1,6 +1,16 @@
 <?php
 
+namespace MediaWiki\Tests\Api;
+
+use AllowDynamicProperties;
+use ApiErrorFormatter;
+use ApiResult;
+use Exception;
+use InvalidArgumentException;
 use MediaWiki\Title\Title;
+use MediaWikiIntegrationTestCase;
+use RuntimeException;
+use UnexpectedValueException;
 
 /**
  * @covers \ApiResult
@@ -1351,8 +1361,8 @@ class ApiResultTest extends MediaWikiIntegrationTestCase {
 			$this->fail( 'Expected exception not thrown' );
 		} catch ( UnexpectedValueException $ex ) {
 			$this->assertSame(
-				'ApiResultTestSerializableObject::serializeForApiResult() ' .
-					'returned an object of class ApiResultTestStringifiableObject',
+				'MediaWiki\Tests\Api\ApiResultTestSerializableObject::serializeForApiResult() ' .
+					'returned an object of class MediaWiki\Tests\Api\ApiResultTestStringifiableObject',
 				$ex->getMessage(),
 				'Expected exception'
 			);
@@ -1364,7 +1374,7 @@ class ApiResultTest extends MediaWikiIntegrationTestCase {
 			$this->fail( 'Expected exception not thrown' );
 		} catch ( UnexpectedValueException $ex ) {
 			$this->assertSame(
-				'ApiResultTestSerializableObject::serializeForApiResult() ' .
+				'MediaWiki\Tests\Api\ApiResultTestSerializableObject::serializeForApiResult() ' .
 					'returned an invalid value: Cannot add non-finite floats to ApiResult',
 				$ex->getMessage(),
 				'Expected exception'
@@ -1397,7 +1407,7 @@ class ApiResultTestStringifiableObject {
 	}
 }
 
-#[\AllowDynamicProperties]
+#[AllowDynamicProperties]
 class ApiResultTestSerializableObject {
 	private $ret;
 
diff --git a/tests/phpunit/includes/api/ApiRevisionDeleteTest.php b/tests/phpunit/includes/api/ApiRevisionDeleteTest.php
index b126f376b291..4ffc29d969c7 100644
--- a/tests/phpunit/includes/api/ApiRevisionDeleteTest.php
+++ b/tests/phpunit/includes/api/ApiRevisionDeleteTest.php
@@ -1,11 +1,14 @@
 <?php
 
+namespace MediaWiki\Tests\Api;
+
 use MediaWiki\Block\DatabaseBlock;
 use MediaWiki\Block\Restriction\PageRestriction;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Revision\SlotRecord;
 use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait;
 use MediaWiki\Title\Title;
+use MWCryptRand;
 
 /**
  * Tests for action=revisiondelete
diff --git a/tests/phpunit/includes/api/ApiRollbackTest.php b/tests/phpunit/includes/api/ApiRollbackTest.php
index f28eacb962cb..2368fce4221e 100644
--- a/tests/phpunit/includes/api/ApiRollbackTest.php
+++ b/tests/phpunit/includes/api/ApiRollbackTest.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace MediaWiki\Tests\Api;
+
+use ApiUsageException;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Title\Title;
 
diff --git a/tests/phpunit/includes/api/ApiSetNotificationTimestampIntegrationTest.php b/tests/phpunit/includes/api/ApiSetNotificationTimestampIntegrationTest.php
index d1b8fadd3d18..25bf2c36e88b 100644
--- a/tests/phpunit/includes/api/ApiSetNotificationTimestampIntegrationTest.php
+++ b/tests/phpunit/includes/api/ApiSetNotificationTimestampIntegrationTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace MediaWiki\Tests\Api;
+
 /**
  * @author Addshore
  * @covers \ApiSetNotificationTimestamp
diff --git a/tests/phpunit/includes/api/ApiStashEditTest.php b/tests/phpunit/includes/api/ApiStashEditTest.php
index 0cf282faa274..b244b4ea607d 100644
--- a/tests/phpunit/includes/api/ApiStashEditTest.php
+++ b/tests/phpunit/includes/api/ApiStashEditTest.php
@@ -1,14 +1,21 @@
 <?php
 
+namespace MediaWiki\Tests\Api;
+
+use CssContent;
+use HashBagOStuff;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Storage\PageEditStash;
 use MediaWiki\Title\Title;
 use MediaWiki\User\User;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\User\UserRigorOptions;
+use NullStatsdDataFactory;
 use Psr\Log\NullLogger;
+use stdClass;
 use Wikimedia\TestingAccessWrapper;
 use Wikimedia\Timestamp\ConvertibleTimestamp;
+use WikitextContent;
 
 /**
  * @covers \ApiStashEdit
@@ -19,6 +26,9 @@ use Wikimedia\Timestamp\ConvertibleTimestamp;
  * @todo Expand tests for temporary users
  */
 class ApiStashEditTest extends ApiTestCase {
+
+	private const CLASS_NAME = 'ApiStashEditTest';
+
 	protected function setUp(): void {
 		parent::setUp();
 		// Hack to make user edit tracker survive service reset.
@@ -54,7 +64,7 @@ class ApiStashEditTest extends ApiTestCase {
 	) {
 		$params = array_merge( [
 			'action' => 'stashedit',
-			'title' => __CLASS__,
+			'title' => self::CLASS_NAME,
 			'contentmodel' => 'wikitext',
 			'contentformat' => 'text/x-wiki',
 			'baserevid' => 0,
@@ -123,7 +133,7 @@ class ApiStashEditTest extends ApiTestCase {
 	 * @param User|null $user User who made edit
 	 * @return string
 	 */
-	protected function getStashKey( $title = __CLASS__, $text = 'Content', User $user = null ) {
+	protected function getStashKey( $title = self::CLASS_NAME, $text = 'Content', User $user = null ) {
 		$titleObj = Title::newFromText( $title );
 		$content = new WikitextContent( $text );
 		if ( !$user ) {
@@ -418,7 +428,7 @@ class ApiStashEditTest extends ApiTestCase {
 		$editStash = TestingAccessWrapper::newFromObject(
 			$this->getServiceContainer()->getPageEditStash() );
 		$cache = $editStash->cache;
-		$key = $this->getStashKey( __CLASS__, $text );
+		$key = $this->getStashKey( self::CLASS_NAME, $text );
 
 		$wrapper = TestingAccessWrapper::newFromObject( $cache );
 
diff --git a/tests/phpunit/includes/api/ApiTestCase.php b/tests/phpunit/includes/api/ApiTestCase.php
index 5687d27b5f0b..b3eeb67d5340 100644
--- a/tests/phpunit/includes/api/ApiTestCase.php
+++ b/tests/phpunit/includes/api/ApiTestCase.php
@@ -1,13 +1,28 @@
 <?php
 
+namespace MediaWiki\Tests\Api;
+
+use ApiBase;
+use ApiErrorFormatter;
+use ApiMain;
+use ApiMessage;
+use ApiQueryTokens;
+use ApiResult;
+use ApiUsageException;
+use ArrayAccess;
+use LogicException;
 use MediaWiki\Context\RequestContext;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Message\Message;
 use MediaWiki\Permissions\Authority;
 use MediaWiki\Request\FauxRequest;
+use MediaWiki\Session\Session;
 use MediaWiki\Session\SessionManager;
 use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait;
+use MediaWikiLangTestCase;
 use PHPUnit\Framework\AssertionFailedError;
 use PHPUnit\Framework\Constraint\Constraint;
+use ReturnTypeWillChange;
 
 abstract class ApiTestCase extends MediaWikiLangTestCase {
 	use MockAuthorityTrait;
@@ -44,7 +59,7 @@ abstract class ApiTestCase extends MediaWikiLangTestCase {
 				return isset( $this->getters[$offset] ) || isset( $this->extraUsers[$offset] );
 			}
 
-			#[\ReturnTypeWillChange]
+			#[ReturnTypeWillChange]
 			public function offsetGet( $offset ) {
 				if ( isset( $this->getters[$offset] ) ) {
 					return ( $this->getters[$offset] )();
@@ -74,7 +89,7 @@ abstract class ApiTestCase extends MediaWikiLangTestCase {
 
 	protected function tearDown(): void {
 		// Avoid leaking session over tests
-		MediaWiki\Session\SessionManager::getGlobalSession()->clear();
+		SessionManager::getGlobalSession()->clear();
 
 		ApiBase::clearCacheForTest();
 
@@ -184,7 +199,7 @@ abstract class ApiTestCase extends MediaWikiLangTestCase {
 	/**
 	 * @since 1.37
 	 * @param array $params
-	 * @param MediaWiki\Session\Session|array|null $session
+	 * @param Session|array|null $session
 	 * @return FauxRequest
 	 */
 	protected function buildFauxRequest( $params, $session ) {
@@ -340,3 +355,5 @@ abstract class ApiTestCase extends MediaWikiLangTestCase {
 		);
 	}
 }
+
+class_alias( ApiTestCase::class, 'ApiTestCase' );
diff --git a/tests/phpunit/includes/api/ApiTestContext.php b/tests/phpunit/includes/api/ApiTestContext.php
index 43980d763694..29527099cc9e 100644
--- a/tests/phpunit/includes/api/ApiTestContext.php
+++ b/tests/phpunit/includes/api/ApiTestContext.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace MediaWiki\Tests\Api;
+
 use MediaWiki\Context\DerivativeContext;
 use MediaWiki\Context\RequestContext;
 use MediaWiki\Permissions\Authority;
@@ -24,3 +26,5 @@ class ApiTestContext extends RequestContext {
 		return $context;
 	}
 }
+
+class_alias( ApiTestContext::class, 'ApiTestContext' );
diff --git a/tests/phpunit/includes/api/ApiUnblockTest.php b/tests/phpunit/includes/api/ApiUnblockTest.php
index 182324f87cd4..6f883f6a4a57 100644
--- a/tests/phpunit/includes/api/ApiUnblockTest.php
+++ b/tests/phpunit/includes/api/ApiUnblockTest.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace MediaWiki\Tests\Api;
+
+use ApiUsageException;
 use MediaWiki\Block\DatabaseBlock;
 use MediaWiki\Title\Title;
 use MediaWiki\User\User;
diff --git a/tests/phpunit/includes/api/ApiUndeleteTest.php b/tests/phpunit/includes/api/ApiUndeleteTest.php
index a3dbc5968782..277c2e9f7034 100644
--- a/tests/phpunit/includes/api/ApiUndeleteTest.php
+++ b/tests/phpunit/includes/api/ApiUndeleteTest.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace MediaWiki\Tests\Api;
+
+use IDBAccessObject;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Title\Title;
 
diff --git a/tests/phpunit/includes/api/ApiUploadTest.php b/tests/phpunit/includes/api/ApiUploadTest.php
index 8333f3acb17f..9222f5e6ab5b 100644
--- a/tests/phpunit/includes/api/ApiUploadTest.php
+++ b/tests/phpunit/includes/api/ApiUploadTest.php
@@ -1,9 +1,15 @@
 <?php
 
+namespace MediaWiki\Tests\Api;
+
+use FSFileBackend;
+use LocalRepo;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Permissions\Authority;
 use MediaWiki\Title\Title;
 use MediaWiki\WikiMap\WikiMap;
+use MimeAnalyzer;
+use RepoGroup;
 
 /**
  * @group API
diff --git a/tests/phpunit/includes/api/ApiUploadTestCase.php b/tests/phpunit/includes/api/ApiUploadTestCase.php
index 9134b336c3fc..3ffe8533d099 100644
--- a/tests/phpunit/includes/api/ApiUploadTestCase.php
+++ b/tests/phpunit/includes/api/ApiUploadTestCase.php
@@ -1,5 +1,10 @@
 <?php
 
+namespace MediaWiki\Tests\Api;
+
+use Exception;
+use FSFile;
+use IDBAccessObject;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Page\File\FileDeleteForm;
 use MediaWiki\Title\Title;
@@ -165,3 +170,5 @@ abstract class ApiUploadTestCase extends ApiTestCase {
 		$this->requestDataFiles = [];
 	}
 }
+
+class_alias( ApiUploadTestCase::class, 'ApiUploadTestCase' );
diff --git a/tests/phpunit/includes/api/ApiUsageExceptionTest.php b/tests/phpunit/includes/api/ApiUsageExceptionTest.php
index fad33b8fa52a..341bb6b68b74 100644
--- a/tests/phpunit/includes/api/ApiUsageExceptionTest.php
+++ b/tests/phpunit/includes/api/ApiUsageExceptionTest.php
@@ -1,5 +1,13 @@
 <?php
 
+namespace MediaWiki\Tests\Api;
+
+use ApiMessage;
+use ApiUsageException;
+use MediaWiki\Message\Message;
+use MediaWikiIntegrationTestCase;
+use StatusValue;
+
 /**
  * @covers \ApiUsageException
  */
diff --git a/tests/phpunit/includes/api/ApiUserrightsTest.php b/tests/phpunit/includes/api/ApiUserrightsTest.php
index fbc8dcf2232f..80e223f73d85 100644
--- a/tests/phpunit/includes/api/ApiUserrightsTest.php
+++ b/tests/phpunit/includes/api/ApiUserrightsTest.php
@@ -1,10 +1,13 @@
 <?php
 
+namespace MediaWiki\Tests\Api;
+
 use MediaWiki\Block\DatabaseBlock;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MainConfigSchema;
 use MediaWiki\Title\Title;
 use MediaWiki\User\User;
+use TestUserRegistry;
 
 /**
  * @group API
diff --git a/tests/phpunit/includes/api/ApiWatchTest.php b/tests/phpunit/includes/api/ApiWatchTest.php
index 1ae817ab4093..8034029603ba 100644
--- a/tests/phpunit/includes/api/ApiWatchTest.php
+++ b/tests/phpunit/includes/api/ApiWatchTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace MediaWiki\Tests\Api;
+
 use MediaWiki\MainConfigNames;
 use MediaWiki\Title\Title;
 use Wikimedia\Timestamp\ConvertibleTimestamp;
diff --git a/tests/phpunit/includes/api/MockApi.php b/tests/phpunit/includes/api/MockApi.php
index 1407c10d9314..7b28785ec52e 100644
--- a/tests/phpunit/includes/api/MockApi.php
+++ b/tests/phpunit/includes/api/MockApi.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace MediaWiki\Tests\Api;
+
+use ApiBase;
+
 class MockApi extends ApiBase {
 	public $warnings = [];
 
diff --git a/tests/phpunit/includes/api/MockApiQueryBase.php b/tests/phpunit/includes/api/MockApiQueryBase.php
index 5e89b9455778..e62316db1488 100644
--- a/tests/phpunit/includes/api/MockApiQueryBase.php
+++ b/tests/phpunit/includes/api/MockApiQueryBase.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace MediaWiki\Tests\Api;
+
+use ApiQueryBase;
+
 class MockApiQueryBase extends ApiQueryBase {
 	private $name;
 
diff --git a/tests/phpunit/includes/api/RandomImageGenerator.php b/tests/phpunit/includes/api/RandomImageGenerator.php
index 07aefea854f4..032dc582279d 100644
--- a/tests/phpunit/includes/api/RandomImageGenerator.php
+++ b/tests/phpunit/includes/api/RandomImageGenerator.php
@@ -1,4 +1,7 @@
 <?php
+
+namespace MediaWiki\Tests\Api;
+
 /**
  * RandomImageGenerator -- does what it says on the tin.
  * Requires Imagick, the ImageMagick library for PHP, or the command line
@@ -23,7 +26,13 @@
  * @author Neil Kandalgaonkar <neilk@wikimedia.org>
  */
 
+use Exception;
+use Imagick;
+use ImagickDraw;
+use ImagickPixel;
 use MediaWiki\Shell\Shell;
+use SimpleXMLElement;
+use UnexpectedValueException;
 
 /**
  * RandomImageGenerator: does what it says on the tin.
@@ -411,3 +420,5 @@ class RandomImageGenerator {
 		return 'rgb(' . implode( ', ', $components ) . ')';
 	}
 }
+
+class_alias( RandomImageGenerator::class, 'RandomImageGenerator' );
diff --git a/tests/phpunit/includes/api/Validator/ApiParamValidatorCallbacksTest.php b/tests/phpunit/includes/api/Validator/ApiParamValidatorCallbacksTest.php
index e962287a7f73..f8b479eed85c 100644
--- a/tests/phpunit/includes/api/Validator/ApiParamValidatorCallbacksTest.php
+++ b/tests/phpunit/includes/api/Validator/ApiParamValidatorCallbacksTest.php
@@ -6,10 +6,12 @@ use ApiBase;
 use ApiMain;
 use ApiMessage;
 use ApiQueryBase;
-use ApiUploadTestCase;
+use Generator;
 use MediaWiki\Api\Validator\ApiParamValidatorCallbacks;
 use MediaWiki\Request\FauxRequest;
+use MediaWiki\Tests\Api\ApiUploadTestCase;
 use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait;
+use Psr\Http\Message\UploadedFileInterface;
 use Wikimedia\Message\DataMessageValue;
 use Wikimedia\TestingAccessWrapper;
 
@@ -150,16 +152,16 @@ class ApiParamValidatorCallbacksTest extends ApiUploadTestCase {
 		$this->assertNull( $callbacks->getUploadedFile( 'baz', [] ) );
 
 		$file = $callbacks->getUploadedFile( 'file', [] );
-		$this->assertInstanceOf( \Psr\Http\Message\UploadedFileInterface::class, $file );
+		$this->assertInstanceOf( UploadedFileInterface::class, $file );
 		$this->assertSame( UPLOAD_ERR_OK, $file->getError() );
 		$this->assertSame( 'TestUploadStash.jpg', $file->getClientFilename() );
 
 		$file = $callbacks->getUploadedFile( 'file2', [] );
-		$this->assertInstanceOf( \Psr\Http\Message\UploadedFileInterface::class, $file );
+		$this->assertInstanceOf( UploadedFileInterface::class, $file );
 		$this->assertSame( UPLOAD_ERR_NO_FILE, $file->getError() );
 
 		$file = $callbacks->getUploadedFile( 'file3', [] );
-		$this->assertInstanceOf( \Psr\Http\Message\UploadedFileInterface::class, $file );
+		$this->assertInstanceOf( UploadedFileInterface::class, $file );
 		$this->assertSame( UPLOAD_ERR_INI_SIZE, $file->getError() );
 	}
 
@@ -212,7 +214,7 @@ class ApiParamValidatorCallbacksTest extends ApiUploadTestCase {
 		);
 	}
 
-	public static function provideRecordCondition(): \Generator {
+	public static function provideRecordCondition(): Generator {
 		yield 'Deprecated param' => [
 			DataMessageValue::new(
 				'paramvalidator-param-deprecated', [],
diff --git a/tests/phpunit/includes/api/Validator/ApiParamValidatorTest.php b/tests/phpunit/includes/api/Validator/ApiParamValidatorTest.php
index 3c84dc9b44c2..1052f9846b77 100644
--- a/tests/phpunit/includes/api/Validator/ApiParamValidatorTest.php
+++ b/tests/phpunit/includes/api/Validator/ApiParamValidatorTest.php
@@ -5,11 +5,11 @@ namespace MediaWiki\Tests\Api\Validator;
 use ApiBase;
 use ApiMain;
 use ApiMessage;
-use ApiTestCase;
 use ApiUsageException;
 use MediaWiki\Api\Validator\ApiParamValidator;
 use MediaWiki\Message\Message;
 use MediaWiki\Request\FauxRequest;
+use MediaWiki\Tests\Api\ApiTestCase;
 use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait;
 use Wikimedia\Message\DataMessageValue;
 use Wikimedia\Message\MessageValue;
diff --git a/tests/phpunit/includes/api/Validator/SubmoduleDefTest.php b/tests/phpunit/includes/api/Validator/SubmoduleDefTest.php
index 3a3f284d5062..e007c698f482 100644
--- a/tests/phpunit/includes/api/Validator/SubmoduleDefTest.php
+++ b/tests/phpunit/includes/api/Validator/SubmoduleDefTest.php
@@ -5,7 +5,7 @@ namespace MediaWiki\Tests\Api\Validator;
 use ApiMain;
 use ApiModuleManager;
 use MediaWiki\Api\Validator\SubmoduleDef;
-use MockApi;
+use MediaWiki\Tests\Api\MockApi;
 use Wikimedia\Message\DataMessageValue;
 use Wikimedia\ParamValidator\ParamValidator;
 use Wikimedia\ParamValidator\SimpleCallbacks;
diff --git a/tests/phpunit/includes/api/format/ApiFormatBaseTest.php b/tests/phpunit/includes/api/format/ApiFormatBaseTest.php
index 9d1a3528d05c..0aa73ad82d07 100644
--- a/tests/phpunit/includes/api/format/ApiFormatBaseTest.php
+++ b/tests/phpunit/includes/api/format/ApiFormatBaseTest.php
@@ -1,8 +1,14 @@
 <?php
 
+namespace MediaWiki\Tests\Api\Format;
+
+use ApiBase;
+use ApiFormatBase;
+use ApiMain;
 use MediaWiki\Context\RequestContext;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Request\FauxRequest;
+use PHPUnit\Framework\MockObject\MockObject;
 use Wikimedia\ParamValidator\ParamValidator;
 use Wikimedia\TestingAccessWrapper;
 
@@ -24,7 +30,7 @@ class ApiFormatBaseTest extends ApiFormatTestBase {
 	 * @param ApiMain|null $main
 	 * @param string $format
 	 * @param array $methods
-	 * @return ApiFormatBase|\PHPUnit\Framework\MockObject\MockObject
+	 * @return ApiFormatBase|MockObject
 	 */
 	public function getMockFormatter( ?ApiMain $main, $format, $methods = [] ) {
 		if ( $main === null ) {
diff --git a/tests/phpunit/includes/api/format/ApiFormatJsonTest.php b/tests/phpunit/includes/api/format/ApiFormatJsonTest.php
index 5ad6475539b6..1b8d25880ba3 100644
--- a/tests/phpunit/includes/api/format/ApiFormatJsonTest.php
+++ b/tests/phpunit/includes/api/format/ApiFormatJsonTest.php
@@ -1,5 +1,11 @@
 <?php
 
+namespace MediaWiki\Tests\Api\Format;
+
+use ApiResult;
+use InvalidArgumentException;
+use MWException;
+
 /**
  * @group API
  * @covers \ApiFormatJson
diff --git a/tests/phpunit/includes/api/format/ApiFormatNoneTest.php b/tests/phpunit/includes/api/format/ApiFormatNoneTest.php
index fc9d889dc29f..f7d3098f37d0 100644
--- a/tests/phpunit/includes/api/format/ApiFormatNoneTest.php
+++ b/tests/phpunit/includes/api/format/ApiFormatNoneTest.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace MediaWiki\Tests\Api\Format;
+
+use ApiResult;
+
 /**
  * @group API
  * @covers \ApiFormatNone
diff --git a/tests/phpunit/includes/api/format/ApiFormatPhpTest.php b/tests/phpunit/includes/api/format/ApiFormatPhpTest.php
index c3d41a105929..f6b903ae6e6d 100644
--- a/tests/phpunit/includes/api/format/ApiFormatPhpTest.php
+++ b/tests/phpunit/includes/api/format/ApiFormatPhpTest.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace MediaWiki\Tests\Api\Format;
+
+use ApiResult;
+
 /**
  * @group API
  * @covers \ApiFormatPhp
diff --git a/tests/phpunit/includes/api/format/ApiFormatRawTest.php b/tests/phpunit/includes/api/format/ApiFormatRawTest.php
index a8d17caabbf0..6691626fbe2e 100644
--- a/tests/phpunit/includes/api/format/ApiFormatRawTest.php
+++ b/tests/phpunit/includes/api/format/ApiFormatRawTest.php
@@ -1,5 +1,12 @@
 <?php
 
+namespace MediaWiki\Tests\Api\Format;
+
+use ApiFormatJson;
+use ApiFormatRaw;
+use ApiMain;
+use MWException;
+
 /**
  * @group API
  * @covers \ApiFormatRaw
diff --git a/tests/phpunit/includes/api/format/ApiFormatTestBase.php b/tests/phpunit/includes/api/format/ApiFormatTestBase.php
index 1d21ee7d9b15..c8072543afc9 100644
--- a/tests/phpunit/includes/api/format/ApiFormatTestBase.php
+++ b/tests/phpunit/includes/api/format/ApiFormatTestBase.php
@@ -1,7 +1,13 @@
 <?php
 
+namespace MediaWiki\Tests\Api\Format;
+
+use ApiMain;
+use BadMethodCallException;
+use Exception;
 use MediaWiki\Context\RequestContext;
 use MediaWiki\Request\FauxRequest;
+use MediaWikiIntegrationTestCase;
 
 abstract class ApiFormatTestBase extends MediaWikiIntegrationTestCase {
 
diff --git a/tests/phpunit/includes/api/format/ApiFormatXmlTest.php b/tests/phpunit/includes/api/format/ApiFormatXmlTest.php
index 2e3e16ae5f1c..ed5da26c832e 100644
--- a/tests/phpunit/includes/api/format/ApiFormatXmlTest.php
+++ b/tests/phpunit/includes/api/format/ApiFormatXmlTest.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace MediaWiki\Tests\Api\Format;
+
+use ApiResult;
 use MediaWiki\Title\Title;
 
 /**
diff --git a/tests/phpunit/includes/api/generateRandomImages.php b/tests/phpunit/includes/api/generateRandomImages.php
index 4eb38b3256d3..4d85862b3548 100644
--- a/tests/phpunit/includes/api/generateRandomImages.php
+++ b/tests/phpunit/includes/api/generateRandomImages.php
@@ -1,4 +1,9 @@
 <?php
+
+namespace MediaWiki\Tests\Api;
+
+use Maintenance;
+
 /**
  * Bootstrapping for test image file generation
  *
diff --git a/tests/phpunit/includes/api/query/ApiQueryAllPagesTest.php b/tests/phpunit/includes/api/query/ApiQueryAllPagesTest.php
index 2d474f2b2b8a..a342f95ba6ec 100644
--- a/tests/phpunit/includes/api/query/ApiQueryAllPagesTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryAllPagesTest.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace MediaWiki\Tests\Api\Query;
+
+use MediaWiki\Tests\Api\ApiTestCase;
 use MediaWiki\Title\Title;
 
 /**
diff --git a/tests/phpunit/includes/api/query/ApiQueryAllRevisionsTest.php b/tests/phpunit/includes/api/query/ApiQueryAllRevisionsTest.php
index 9948498274e3..753037bacf7d 100644
--- a/tests/phpunit/includes/api/query/ApiQueryAllRevisionsTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryAllRevisionsTest.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace MediaWiki\Tests\Api\Query;
+
+use MediaWiki\Tests\Api\ApiTestCase;
 use MediaWiki\Title\Title;
 
 /**
diff --git a/tests/phpunit/includes/api/query/ApiQueryAllUsersTest.php b/tests/phpunit/includes/api/query/ApiQueryAllUsersTest.php
index f4008d3b97c9..b9c47f5affa5 100644
--- a/tests/phpunit/includes/api/query/ApiQueryAllUsersTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryAllUsersTest.php
@@ -1,6 +1,9 @@
 <?php
 
+namespace MediaWiki\Tests\Api\Query;
+
 use MediaWiki\Permissions\UltimateAuthority;
+use MediaWiki\Tests\Api\ApiTestCase;
 use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait;
 
 /**
diff --git a/tests/phpunit/includes/api/query/ApiQueryBasicTest.php b/tests/phpunit/includes/api/query/ApiQueryBasicTest.php
index 01b1ccc0def1..c68b75df70d6 100644
--- a/tests/phpunit/includes/api/query/ApiQueryBasicTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryBasicTest.php
@@ -20,6 +20,9 @@
  * @file
  */
 
+namespace MediaWiki\Tests\Api\Query;
+
+use Exception;
 use MediaWiki\Title\Title;
 
 /**
diff --git a/tests/phpunit/includes/api/query/ApiQueryBlockInfoTraitTest.php b/tests/phpunit/includes/api/query/ApiQueryBlockInfoTraitTest.php
index 4a681f8a4963..a982be30f00f 100644
--- a/tests/phpunit/includes/api/query/ApiQueryBlockInfoTraitTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryBlockInfoTraitTest.php
@@ -1,8 +1,13 @@
 <?php
 
+namespace MediaWiki\Tests\Api\Query;
+
+use ApiQueryBase;
+use ApiQueryBlockInfoTrait;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Tests\MockDatabase;
 use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait;
+use MediaWikiIntegrationTestCase;
 use Wikimedia\TestingAccessWrapper;
 use Wikimedia\Timestamp\ConvertibleTimestamp;
 
diff --git a/tests/phpunit/includes/api/query/ApiQueryBlocksTest.php b/tests/phpunit/includes/api/query/ApiQueryBlocksTest.php
index 517a02a2d906..cd7dab40da00 100644
--- a/tests/phpunit/includes/api/query/ApiQueryBlocksTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryBlocksTest.php
@@ -1,11 +1,14 @@
 <?php
 
+namespace MediaWiki\Tests\Api\Query;
+
 use MediaWiki\Block\BlockActionInfo;
 use MediaWiki\Block\DatabaseBlock;
 use MediaWiki\Block\Restriction\ActionRestriction;
 use MediaWiki\Block\Restriction\NamespaceRestriction;
 use MediaWiki\Block\Restriction\PageRestriction;
 use MediaWiki\MainConfigNames;
+use MediaWiki\Tests\Api\ApiTestCase;
 
 /**
  * @group API
diff --git a/tests/phpunit/includes/api/query/ApiQueryContinue2Test.php b/tests/phpunit/includes/api/query/ApiQueryContinue2Test.php
index e2bf0f56ee70..22eb80bfae6f 100644
--- a/tests/phpunit/includes/api/query/ApiQueryContinue2Test.php
+++ b/tests/phpunit/includes/api/query/ApiQueryContinue2Test.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright © 2013 Yuri Astrakhan "<Firstname><Lastname>@gmail.com"
  *
@@ -18,6 +19,10 @@
  * http://www.gnu.org/copyleft/gpl.html
  */
 
+namespace MediaWiki\Tests\Api\Query;
+
+use Exception;
+
 /**
  * @group API
  * @group Database
diff --git a/tests/phpunit/includes/api/query/ApiQueryContinueTest.php b/tests/phpunit/includes/api/query/ApiQueryContinueTest.php
index 75703743dfaf..d6c707e917f3 100644
--- a/tests/phpunit/includes/api/query/ApiQueryContinueTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryContinueTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright © 2013 Yuri Astrakhan "<Firstname><Lastname>@gmail.com"
  *
@@ -18,6 +19,10 @@
  * http://www.gnu.org/copyleft/gpl.html
  */
 
+namespace MediaWiki\Tests\Api\Query;
+
+use Exception;
+
 /**
  * These tests validate the new continue functionality of the api query module by
  * doing multiple requests with varying parameters, merging the results, and checking
diff --git a/tests/phpunit/includes/api/query/ApiQueryContinueTestBase.php b/tests/phpunit/includes/api/query/ApiQueryContinueTestBase.php
index a038fe25e536..1ba514473d1f 100644
--- a/tests/phpunit/includes/api/query/ApiQueryContinueTestBase.php
+++ b/tests/phpunit/includes/api/query/ApiQueryContinueTestBase.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright © 2013 Yuri Astrakhan "<Firstname><Lastname>@gmail.com"
  *
@@ -19,6 +20,11 @@
  *
  * @file
  */
+
+namespace MediaWiki\Tests\Api\Query;
+
+use Exception;
+
 abstract class ApiQueryContinueTestBase extends ApiQueryTestBase {
 
 	/**
diff --git a/tests/phpunit/includes/api/query/ApiQueryDisabledTest.php b/tests/phpunit/includes/api/query/ApiQueryDisabledTest.php
index dc8cb0a78420..4a48bcbc6ccf 100644
--- a/tests/phpunit/includes/api/query/ApiQueryDisabledTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryDisabledTest.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace MediaWiki\Tests\Api\Query;
+
+use MediaWiki\Tests\Api\ApiTestCase;
+
 /**
  * @group API
  * @group medium
diff --git a/tests/phpunit/includes/api/query/ApiQueryImageInfoTest.php b/tests/phpunit/includes/api/query/ApiQueryImageInfoTest.php
index 57c13482be0b..5ce33a3567dd 100644
--- a/tests/phpunit/includes/api/query/ApiQueryImageInfoTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryImageInfoTest.php
@@ -1,6 +1,11 @@
 <?php
 
+namespace MediaWiki\Tests\Api\Query;
+
+use ApiQueryImageInfo;
+use File;
 use MediaWiki\MainConfigNames;
+use MediaWiki\Tests\Api\ApiTestCase;
 use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait;
 use MediaWiki\User\UserIdentityValue;
 use MediaWiki\Utils\MWTimestamp;
diff --git a/tests/phpunit/includes/api/query/ApiQueryInfoTest.php b/tests/phpunit/includes/api/query/ApiQueryInfoTest.php
index 55253ec54e78..3b5442afa4f2 100644
--- a/tests/phpunit/includes/api/query/ApiQueryInfoTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryInfoTest.php
@@ -1,8 +1,11 @@
 <?php
 
+namespace MediaWiki\Tests\Api\Query;
+
 use MediaWiki\Block\DatabaseBlock;
 use MediaWiki\Context\RequestContext;
 use MediaWiki\MainConfigNames;
+use MediaWiki\Tests\Api\ApiTestCase;
 use MediaWiki\Title\Title;
 use MediaWiki\User\User;
 use Wikimedia\Timestamp\ConvertibleTimestamp;
diff --git a/tests/phpunit/includes/api/query/ApiQueryLanguageinfoTest.php b/tests/phpunit/includes/api/query/ApiQueryLanguageinfoTest.php
index 294ecdde0bc2..d14a52b5068a 100644
--- a/tests/phpunit/includes/api/query/ApiQueryLanguageinfoTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryLanguageinfoTest.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace MediaWiki\Tests\Api\Query;
+
+use MediaWiki\Tests\Api\ApiTestCase;
 use Wikimedia\Timestamp\ConvertibleTimestamp;
 
 /**
diff --git a/tests/phpunit/includes/api/query/ApiQueryLogEventsTest.php b/tests/phpunit/includes/api/query/ApiQueryLogEventsTest.php
index f83815cab2e9..f9635bb860df 100644
--- a/tests/phpunit/includes/api/query/ApiQueryLogEventsTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryLogEventsTest.php
@@ -1,6 +1,9 @@
 <?php
 
+namespace MediaWiki\Tests\Api\Query;
+
 use MediaWiki\Permissions\UltimateAuthority;
+use MediaWiki\Tests\Api\ApiTestCase;
 use MediaWiki\Tests\User\TempUser\TempUserTestTrait;
 use MediaWiki\User\UserIdentityValue;
 
diff --git a/tests/phpunit/includes/api/query/ApiQueryPrefixSearchTest.php b/tests/phpunit/includes/api/query/ApiQueryPrefixSearchTest.php
index 77c133e061e6..39cf8d7199f5 100644
--- a/tests/phpunit/includes/api/query/ApiQueryPrefixSearchTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryPrefixSearchTest.php
@@ -1,6 +1,10 @@
 <?php
 
+namespace MediaWiki\Tests\Api\Query;
+
 use MediaWiki\MainConfigNames;
+use MediaWiki\Tests\Api\ApiTestCase;
+use MockCompletionSearchEngine;
 
 /**
  * @group API
diff --git a/tests/phpunit/includes/api/query/ApiQueryRecentChangesIntegrationTest.php b/tests/phpunit/includes/api/query/ApiQueryRecentChangesIntegrationTest.php
index 39084956f295..4269b55930bf 100644
--- a/tests/phpunit/includes/api/query/ApiQueryRecentChangesIntegrationTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryRecentChangesIntegrationTest.php
@@ -1,11 +1,16 @@
 <?php
 
+namespace MediaWiki\Tests\Api\Query;
+
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Permissions\Authority;
+use MediaWiki\Tests\Api\ApiTestCase;
 use MediaWiki\Title\TitleValue;
 use MediaWiki\User\User;
 use MediaWiki\User\UserIdentityValue;
+use RecentChange;
+use WatchedItemQueryService;
 
 /**
  * @group API
@@ -412,7 +417,8 @@ class ApiQueryRecentChangesIntegrationTest extends ApiTestCase {
 				[
 					'type' => 'new',
 					'oldlen' => 0,
-					'newlen' => 38,
+					// strlen( __CLASS__ ) - 2 = 64
+					'newlen' => 64,
 				],
 			],
 			$this->getItemsFromRecentChangesResult( $result )
diff --git a/tests/phpunit/includes/api/query/ApiQueryRevisionsTest.php b/tests/phpunit/includes/api/query/ApiQueryRevisionsTest.php
index 4b6e8d025ddb..0d03be7b123a 100644
--- a/tests/phpunit/includes/api/query/ApiQueryRevisionsTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryRevisionsTest.php
@@ -1,10 +1,14 @@
 <?php
 
+namespace MediaWiki\Tests\Api\Query;
+
 use MediaWiki\CommentStore\CommentStoreComment;
 use MediaWiki\Permissions\UltimateAuthority;
 use MediaWiki\Revision\SlotRecord;
+use MediaWiki\Tests\Api\ApiTestCase;
 use MediaWiki\Tests\User\TempUser\TempUserTestTrait;
 use MediaWiki\User\UserIdentityValue;
+use WikitextContent;
 
 /**
  * @group API
diff --git a/tests/phpunit/includes/api/query/ApiQuerySearchTest.php b/tests/phpunit/includes/api/query/ApiQuerySearchTest.php
index e41c0e381c50..fbc9406add01 100644
--- a/tests/phpunit/includes/api/query/ApiQuerySearchTest.php
+++ b/tests/phpunit/includes/api/query/ApiQuerySearchTest.php
@@ -1,8 +1,15 @@
 <?php
 
+namespace MediaWiki\Tests\Api\Query;
+
+use ISearchResultSet;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Revision\RevisionLookup;
+use MediaWiki\Tests\Api\ApiTestCase;
 use MediaWiki\Title\Title;
+use MockSearchEngine;
+use MockSearchResult;
+use MockSearchResultSet;
 
 /**
  * @group medium
diff --git a/tests/phpunit/includes/api/query/ApiQuerySiteinfoTest.php b/tests/phpunit/includes/api/query/ApiQuerySiteinfoTest.php
index d1c84f5739b6..5e2ce9a4638a 100644
--- a/tests/phpunit/includes/api/query/ApiQuerySiteinfoTest.php
+++ b/tests/phpunit/includes/api/query/ApiQuerySiteinfoTest.php
@@ -1,9 +1,17 @@
 <?php
 
+namespace MediaWiki\Tests\Api\Query;
+
+use ExtensionRegistry;
+use LanguageCode;
+use LanguageConverter;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MainConfigSchema;
+use MediaWiki\Message\Message;
 use MediaWiki\SiteStats\SiteStats;
+use MediaWiki\Tests\Api\ApiTestCase;
 use MediaWiki\Title\Title;
+use Skin;
 use Wikimedia\Composer\ComposerInstalled;
 use Wikimedia\Rdbms\LoadBalancer;
 use Wikimedia\TestingAccessWrapper;
diff --git a/tests/phpunit/includes/api/query/ApiQueryTest.php b/tests/phpunit/includes/api/query/ApiQueryTest.php
index 429ae7f3d66b..93ea6dc1fa1e 100644
--- a/tests/phpunit/includes/api/query/ApiQueryTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryTest.php
@@ -1,7 +1,13 @@
 <?php
 
+namespace MediaWiki\Tests\Api\Query;
+
+use ApiMain;
+use ApiUsageException;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Request\FauxRequest;
+use MediaWiki\Tests\Api\ApiTestCase;
+use MediaWiki\Tests\Api\MockApiQueryBase;
 use MediaWiki\Tests\Unit\DummyServicesTrait;
 use MediaWiki\Title\Title;
 
diff --git a/tests/phpunit/includes/api/query/ApiQueryTestBase.php b/tests/phpunit/includes/api/query/ApiQueryTestBase.php
index 555c51fa416e..53189fb93e0f 100644
--- a/tests/phpunit/includes/api/query/ApiQueryTestBase.php
+++ b/tests/phpunit/includes/api/query/ApiQueryTestBase.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright © 2013 Yuri Astrakhan "<Firstname><Lastname>@gmail.com"
  *
@@ -20,11 +21,15 @@
  * @file
  */
 
+namespace MediaWiki\Tests\Api\Query;
+
+use MediaWiki\Tests\Api\ApiTestCase;
 use MediaWiki\User\User;
 use PHPUnit\Framework\ExpectationFailedException;
 use SebastianBergmann\Comparator\ComparisonFailure;
 
-/** This class has some common functionality for testing query module
+/**
+ * This class has some common functionality for testing query module
  */
 abstract class ApiQueryTestBase extends ApiTestCase {
 
@@ -152,3 +157,5 @@ STR;
 		return array_merge( $result );
 	}
 }
+
+class_alias( ApiQueryTestBase::class, 'ApiQueryTestBase' );
diff --git a/tests/phpunit/includes/api/query/ApiQueryTokensTest.php b/tests/phpunit/includes/api/query/ApiQueryTokensTest.php
index feb6f3032800..9a21ee31736a 100644
--- a/tests/phpunit/includes/api/query/ApiQueryTokensTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryTokensTest.php
@@ -1,6 +1,10 @@
 <?php
 
+namespace MediaWiki\Tests\Api\Query;
+
 use MediaWiki\MainConfigNames;
+use MediaWiki\Message\Message;
+use MediaWiki\Tests\Api\ApiTestCase;
 
 /**
  * @group API
diff --git a/tests/phpunit/includes/api/query/ApiQueryUserContribsTest.php b/tests/phpunit/includes/api/query/ApiQueryUserContribsTest.php
index 0a5ac6788f11..834065c011e5 100644
--- a/tests/phpunit/includes/api/query/ApiQueryUserContribsTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryUserContribsTest.php
@@ -1,8 +1,12 @@
 <?php
 
+namespace MediaWiki\Tests\Api\Query;
+
+use MediaWiki\Tests\Api\ApiTestCase;
 use MediaWiki\Title\TitleValue;
 use MediaWiki\User\User;
 use MediaWiki\User\UserRigorOptions;
+use WikitextContent;
 
 /**
  * @group API
diff --git a/tests/phpunit/includes/api/query/ApiQueryUserInfoTest.php b/tests/phpunit/includes/api/query/ApiQueryUserInfoTest.php
index 31fc0d21b587..701e39f275a2 100644
--- a/tests/phpunit/includes/api/query/ApiQueryUserInfoTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryUserInfoTest.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace MediaWiki\Tests\Api\Query;
+
+use MediaWiki\Tests\Api\ApiTestCase;
 use MediaWiki\Utils\MWTimestamp;
 
 /**
diff --git a/tests/phpunit/includes/api/query/ApiQueryWatchlistIntegrationTest.php b/tests/phpunit/includes/api/query/ApiQueryWatchlistIntegrationTest.php
index 801a414a6c04..b4324ded09aa 100644
--- a/tests/phpunit/includes/api/query/ApiQueryWatchlistIntegrationTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryWatchlistIntegrationTest.php
@@ -1,11 +1,16 @@
 <?php
 
+namespace MediaWiki\Tests\Api\Query;
+
 use MediaWiki\CommentStore\CommentStoreComment;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\Permissions\Authority;
 use MediaWiki\Revision\SlotRecord;
+use MediaWiki\Tests\Api\ApiTestCase;
 use MediaWiki\Title\TitleValue;
 use MediaWiki\User\User;
+use RecentChange;
+use WatchedItemQueryService;
 
 /**
  * @group medium
diff --git a/tests/phpunit/includes/api/query/ApiQueryWatchlistRawIntegrationTest.php b/tests/phpunit/includes/api/query/ApiQueryWatchlistRawIntegrationTest.php
index b5248de8c18a..7e28ce422526 100644
--- a/tests/phpunit/includes/api/query/ApiQueryWatchlistRawIntegrationTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryWatchlistRawIntegrationTest.php
@@ -1,7 +1,11 @@
 <?php
 
+namespace MediaWiki\Tests\Api\Query;
+
+use MediaWiki\Tests\Api\ApiTestCase;
 use MediaWiki\Title\TitleValue;
 use MediaWiki\User\User;
+use WatchedItemQueryService;
 
 /**
  * @group API
diff --git a/tests/phpunit/unit/includes/api/ApiModuleManagerTest.php b/tests/phpunit/unit/includes/api/ApiModuleManagerTest.php
index 060e1bf5ca55..55b02aecf792 100644
--- a/tests/phpunit/unit/includes/api/ApiModuleManagerTest.php
+++ b/tests/phpunit/unit/includes/api/ApiModuleManagerTest.php
@@ -1,8 +1,18 @@
 <?php
 
+namespace MediaWiki\Tests\Api;
+
+use ApiDisabled;
+use ApiFeedContributions;
+use ApiFeedRecentChanges;
+use ApiLogout;
+use ApiMain;
+use ApiModuleManager;
+use ApiRsd;
 use MediaWiki\Context\RequestContext;
 use MediaWiki\Tests\Unit\DummyServicesTrait;
 use MediaWiki\User\UserFactory;
+use MediaWikiUnitTestCase;
 
 /**
  * @covers \ApiModuleManager
diff --git a/tests/phpunit/unit/includes/api/ApiWatchlistTraitTest.php b/tests/phpunit/unit/includes/api/ApiWatchlistTraitTest.php
index 297e03eab74b..861ca845310e 100644
--- a/tests/phpunit/unit/includes/api/ApiWatchlistTraitTest.php
+++ b/tests/phpunit/unit/includes/api/ApiWatchlistTraitTest.php
@@ -1,9 +1,13 @@
 <?php
 
+namespace MediaWiki\Tests\Api;
+
+use ApiWatchlistTrait;
 use MediaWiki\Title\Title;
 use MediaWiki\User\Options\UserOptionsLookup;
 use MediaWiki\User\User;
 use MediaWiki\Watchlist\WatchlistManager;
+use MediaWikiUnitTestCase;
 use Wikimedia\TestingAccessWrapper;
 
 /**