Add namespace to includes/api classes

Bug: T353458
Change-Id: I3ea6b08c5018ba03ba45c5766e1f46e12f6b8597

76 files changed, 198 insertions, 197 deletions

diff --git a/tests/phpunit/includes/api/ApiAcquireTempUserNameTest.php b/tests/phpunit/includes/api/ApiAcquireTempUserNameTest.php
index 70e663d9a160..925c822f4613 100644
--- a/tests/phpunit/includes/api/ApiAcquireTempUserNameTest.php
+++ b/tests/phpunit/includes/api/ApiAcquireTempUserNameTest.php
@@ -12,7 +12,7 @@ use Wikimedia\Timestamp\ConvertibleTimestamp;
  * @group Database
  * @group medium
  *
- * @covers \ApiAcquireTempUserName
+ * @covers \MediaWiki\Api\ApiAcquireTempUserName
  */
 class ApiAcquireTempUserNameTest extends ApiTestCase {
 	use MockAuthorityTrait;
diff --git a/tests/phpunit/includes/api/ApiBaseTest.php b/tests/phpunit/includes/api/ApiBaseTest.php
index 9fbf806e2742..bfc310a1a73c 100644
--- a/tests/phpunit/includes/api/ApiBaseTest.php
+++ b/tests/phpunit/includes/api/ApiBaseTest.php
@@ -2,13 +2,13 @@
 
 namespace MediaWiki\Tests\Api;
 
-use ApiBase;
-use ApiBlockInfoTrait;
-use ApiMain;
-use ApiMessage;
-use ApiUsageException;
 use DomainException;
 use Exception;
+use MediaWiki\Api\ApiBase;
+use MediaWiki\Api\ApiBlockInfoTrait;
+use MediaWiki\Api\ApiMain;
+use MediaWiki\Api\ApiMessage;
+use MediaWiki\Api\ApiUsageException;
 use MediaWiki\Api\Validator\SubmoduleDef;
 use MediaWiki\Block\DatabaseBlock;
 use MediaWiki\Context\DerivativeContext;
@@ -35,7 +35,7 @@ use WikiPage;
  * @group Database
  * @group medium
  *
- * @covers \ApiBase
+ * @covers \MediaWiki\Api\ApiBase
  */
 class ApiBaseTest extends ApiTestCase {
 
@@ -1396,7 +1396,7 @@ class ApiBaseTest extends ApiTestCase {
 					ApiBase::PARAM_HELP_MSG_PER_VALUE => [],
 				],
 				'messages' => new MWException(
-					'Internal error in ApiBase::getFinalParamDescription: '
+					'Internal error in ' . ApiBase::class . '::getFinalParamDescription: '
 					. 'ApiBase::PARAM_HELP_MSG_PER_VALUE may only be used when '
 					. "ParamValidator::PARAM_TYPE is an array or it is 'string' "
 					. 'and ParamValidator::PARAM_ISMULTI is true'
@@ -1579,7 +1579,7 @@ class ApiBaseTest extends ApiTestCase {
 	}
 
 	/**
-	 * @covers \ApiBase::extractRequestParams
+	 * @covers \MediaWiki\Api\ApiBase::extractRequestParams
 	 */
 	public function testExtractRequestParams() {
 		$request = new FauxRequest( [
diff --git a/tests/phpunit/includes/api/ApiBlockInfoTraitTest.php b/tests/phpunit/includes/api/ApiBlockInfoTraitTest.php
index cfc11505731d..2b4dd8b5630c 100644
--- a/tests/phpunit/includes/api/ApiBlockInfoTraitTest.php
+++ b/tests/phpunit/includes/api/ApiBlockInfoTraitTest.php
@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Tests\Api;
 
-use ApiBlockInfoTrait;
+use MediaWiki\Api\ApiBlockInfoTrait;
 use MediaWiki\Block\CompositeBlock;
 use MediaWiki\Block\DatabaseBlock;
 use MediaWiki\Block\SystemBlock;
@@ -11,7 +11,7 @@ use MediaWikiIntegrationTestCase;
 use Wikimedia\TestingAccessWrapper;
 
 /**
- * @covers \ApiBlockInfoTrait
+ * @covers \MediaWiki\Api\ApiBlockInfoTrait
  */
 class ApiBlockInfoTraitTest extends MediaWikiIntegrationTestCase {
 	use DummyServicesTrait;
diff --git a/tests/phpunit/includes/api/ApiBlockTest.php b/tests/phpunit/includes/api/ApiBlockTest.php
index fcd7dd2b4846..b6e2a5cc5f47 100644
--- a/tests/phpunit/includes/api/ApiBlockTest.php
+++ b/tests/phpunit/includes/api/ApiBlockTest.php
@@ -19,7 +19,7 @@ use MediaWiki\Utils\MWTimestamp;
  * @group Database
  * @group medium
  *
- * @covers \ApiBlock
+ * @covers \MediaWiki\Api\ApiBlock
  */
 class ApiBlockTest extends ApiTestCase {
 	use MockAuthorityTrait;
diff --git a/tests/phpunit/includes/api/ApiCSPReportTest.php b/tests/phpunit/includes/api/ApiCSPReportTest.php
index f6c9f540f59d..86ad0612e1cc 100644
--- a/tests/phpunit/includes/api/ApiCSPReportTest.php
+++ b/tests/phpunit/includes/api/ApiCSPReportTest.php
@@ -2,9 +2,9 @@
 
 namespace MediaWiki\Tests\Api;
 
-use ApiCSPReport;
-use ApiMain;
-use ApiResult;
+use MediaWiki\Api\ApiCSPReport;
+use MediaWiki\Api\ApiMain;
+use MediaWiki\Api\ApiResult;
 use MediaWiki\Context\DerivativeContext;
 use MediaWiki\Context\RequestContext;
 use MediaWiki\MainConfigNames;
@@ -15,7 +15,7 @@ use Psr\Log\AbstractLogger;
 /**
  * @group API
  * @group medium
- * @covers \ApiCSPReport
+ * @covers \MediaWiki\Api\ApiCSPReport
  */
 class ApiCSPReportTest extends MediaWikiIntegrationTestCase {
 
@@ -43,7 +43,7 @@ class ApiCSPReportTest extends MediaWikiIntegrationTestCase {
 					'[report-only] Received CSP report: ' .
 						'<https://blocked.test> blocked from being loaded on <https://doc.test/path>:4',
 					[
-						'method' => 'ApiCSPReport::execute',
+						'method' => ApiCSPReport::class . '::execute',
 						'user_id' => 'logged-out',
 						'user-agent' => 'Test/0.0',
 						'source' => 'internal'
diff --git a/tests/phpunit/includes/api/ApiChangeContentModelTest.php b/tests/phpunit/includes/api/ApiChangeContentModelTest.php
index b86ef2821590..0d031019876a 100644
--- a/tests/phpunit/includes/api/ApiChangeContentModelTest.php
+++ b/tests/phpunit/includes/api/ApiChangeContentModelTest.php
@@ -2,8 +2,8 @@
 
 namespace MediaWiki\Tests\Api;
 
-use ApiUsageException;
 use IDBAccessObject;
+use MediaWiki\Api\ApiUsageException;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Permissions\RateLimiter;
 use MediaWiki\Status\Status;
@@ -18,7 +18,7 @@ use MediaWiki\Title\Title;
  * @group Database
  * @group medium
  *
- * @covers \ApiChangeContentModel
+ * @covers \MediaWiki\Api\ApiChangeContentModel
  * @author DannyS712
  */
 class ApiChangeContentModelTest extends ApiTestCase {
diff --git a/tests/phpunit/includes/api/ApiCheckTokenTest.php b/tests/phpunit/includes/api/ApiCheckTokenTest.php
index 2301524a962e..04fc8a9d87cd 100644
--- a/tests/phpunit/includes/api/ApiCheckTokenTest.php
+++ b/tests/phpunit/includes/api/ApiCheckTokenTest.php
@@ -7,7 +7,7 @@ use MediaWiki\Session\Token;
 /**
  * @group API
  * @group medium
- * @covers \ApiCheckToken
+ * @covers \MediaWiki\Api\ApiCheckToken
  */
 class ApiCheckTokenTest extends ApiTestCase {
 
diff --git a/tests/phpunit/includes/api/ApiClearHasMsgTest.php b/tests/phpunit/includes/api/ApiClearHasMsgTest.php
index d207948d99a4..ec3aff970d72 100644
--- a/tests/phpunit/includes/api/ApiClearHasMsgTest.php
+++ b/tests/phpunit/includes/api/ApiClearHasMsgTest.php
@@ -9,7 +9,7 @@ use MediaWiki\User\UserIdentityValue;
  * @group API
  * @group medium
  * @group Database
- * @covers \ApiClearHasMsg
+ * @covers \MediaWiki\Api\ApiClearHasMsg
  */
 class ApiClearHasMsgTest extends ApiTestCase {
 
diff --git a/tests/phpunit/includes/api/ApiComparePagesTest.php b/tests/phpunit/includes/api/ApiComparePagesTest.php
index 2594303cb122..b86c753f5e61 100644
--- a/tests/phpunit/includes/api/ApiComparePagesTest.php
+++ b/tests/phpunit/includes/api/ApiComparePagesTest.php
@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Tests\Api;
 
-use ApiUsageException;
+use MediaWiki\Api\ApiUsageException;
 use MediaWiki\Context\RequestContext;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Revision\RevisionRecord;
@@ -15,7 +15,7 @@ use RevisionDeleter;
  * @group API
  * @group Database
  * @group medium
- * @covers \ApiComparePages
+ * @covers \MediaWiki\Api\ApiComparePages
  */
 class ApiComparePagesTest extends ApiTestCase {
 
diff --git a/tests/phpunit/includes/api/ApiContinuationManagerTest.php b/tests/phpunit/includes/api/ApiContinuationManagerTest.php
index 61e8519eb88e..9c0d886cbae1 100644
--- a/tests/phpunit/includes/api/ApiContinuationManagerTest.php
+++ b/tests/phpunit/includes/api/ApiContinuationManagerTest.php
@@ -2,17 +2,17 @@
 
 namespace MediaWiki\Tests\Api;
 
-use ApiContinuationManager;
-use ApiMain;
-use ApiResult;
-use ApiUsageException;
+use MediaWiki\Api\ApiContinuationManager;
+use MediaWiki\Api\ApiMain;
+use MediaWiki\Api\ApiResult;
+use MediaWiki\Api\ApiUsageException;
 use MediaWiki\Context\DerivativeContext;
 use MediaWiki\Context\RequestContext;
 use MediaWiki\Request\FauxRequest;
 use UnexpectedValueException;
 
 /**
- * @covers \ApiContinuationManager
+ * @covers \MediaWiki\Api\ApiContinuationManager
  * @group API
  */
 class ApiContinuationManagerTest extends ApiTestCase {
@@ -198,8 +198,8 @@ class ApiContinuationManagerTest extends ApiTestCase {
 			$this->fail( 'Expected exception not thrown' );
 		} catch ( UnexpectedValueException $ex ) {
 			$this->assertSame(
-				'Module \'mocklist\' called ApiContinuationManager::addContinueParam ' .
-					'but was not passed to ApiContinuationManager::__construct',
+				'Module \'mocklist\' called ' . ApiContinuationManager::class . '::addContinueParam ' .
+					'but was not passed to ' . ApiContinuationManager::class . '::__construct',
 				$ex->getMessage(),
 				'Expected exception'
 			);
diff --git a/tests/phpunit/includes/api/ApiCreateTempUserTraitTest.php b/tests/phpunit/includes/api/ApiCreateTempUserTraitTest.php
index fbbefec09508..eb6fab576f74 100644
--- a/tests/phpunit/includes/api/ApiCreateTempUserTraitTest.php
+++ b/tests/phpunit/includes/api/ApiCreateTempUserTraitTest.php
@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Tests\Api;
 
-use ApiCreateTempUserTrait;
+use MediaWiki\Api\ApiCreateTempUserTrait;
 use MediaWiki\HookContainer\HookRunner;
 use MediaWiki\Request\WebRequest;
 use MediaWiki\User\User;
@@ -10,7 +10,7 @@ use MediaWikiIntegrationTestCase;
 use Wikimedia\TestingAccessWrapper;
 
 /**
- * @covers \ApiCreateTempUserTrait
+ * @covers \MediaWiki\Api\ApiCreateTempUserTrait
  */
 class ApiCreateTempUserTraitTest extends MediaWikiIntegrationTestCase {
 
diff --git a/tests/phpunit/includes/api/ApiDeleteTest.php b/tests/phpunit/includes/api/ApiDeleteTest.php
index 13c87ee0af8e..3663e32ec945 100644
--- a/tests/phpunit/includes/api/ApiDeleteTest.php
+++ b/tests/phpunit/includes/api/ApiDeleteTest.php
@@ -16,7 +16,7 @@ use MediaWiki\User\User;
  * @group Database
  * @group medium
  *
- * @covers \ApiDelete
+ * @covers \MediaWiki\Api\ApiDelete
  */
 class ApiDeleteTest extends ApiTestCase {
 
diff --git a/tests/phpunit/includes/api/ApiDisabledTest.php b/tests/phpunit/includes/api/ApiDisabledTest.php
index 06a3f179a4af..1460fc8aa208 100644
--- a/tests/phpunit/includes/api/ApiDisabledTest.php
+++ b/tests/phpunit/includes/api/ApiDisabledTest.php
@@ -6,7 +6,7 @@ namespace MediaWiki\Tests\Api;
  * @group API
  * @group medium
  *
- * @covers \ApiDisabled
+ * @covers MediaWiki\Api\ApiDisabled
  */
 class ApiDisabledTest extends ApiTestCase {
 	public function testDisabled() {
diff --git a/tests/phpunit/includes/api/ApiEditPageTest.php b/tests/phpunit/includes/api/ApiEditPageTest.php
index 60d5ed2a91de..c2589b95400e 100644
--- a/tests/phpunit/includes/api/ApiEditPageTest.php
+++ b/tests/phpunit/includes/api/ApiEditPageTest.php
@@ -2,8 +2,8 @@
 
 namespace MediaWiki\Tests\Api;
 
-use ApiUsageException;
 use IDBAccessObject;
+use MediaWiki\Api\ApiUsageException;
 use MediaWiki\Block\DatabaseBlock;
 use MediaWiki\CommentStore\CommentStoreComment;
 use MediaWiki\Content\JavaScriptContent;
@@ -29,7 +29,7 @@ use WikiPage;
  * @group Database
  * @group medium
  *
- * @covers \ApiEditPage
+ * @covers \MediaWiki\Api\ApiEditPage
  */
 class ApiEditPageTest extends ApiTestCase {
 
diff --git a/tests/phpunit/includes/api/ApiErrorFormatterTest.php b/tests/phpunit/includes/api/ApiErrorFormatterTest.php
index cc43e4ab7dfa..170f0e5fd845 100644
--- a/tests/phpunit/includes/api/ApiErrorFormatterTest.php
+++ b/tests/phpunit/includes/api/ApiErrorFormatterTest.php
@@ -2,13 +2,13 @@
 
 namespace MediaWiki\Tests\Api;
 
-use ApiErrorFormatter;
-use ApiErrorFormatter_BackCompat;
-use ApiMessage;
-use ApiResult;
 use Exception;
-use IApiMessage;
 use LocalizedException;
+use MediaWiki\Api\ApiErrorFormatter;
+use MediaWiki\Api\ApiErrorFormatter_BackCompat;
+use MediaWiki\Api\ApiMessage;
+use MediaWiki\Api\ApiResult;
+use MediaWiki\Api\IApiMessage;
 use MediaWiki\Language\RawMessage;
 use MediaWiki\Message\Message;
 use MediaWiki\Status\Status;
@@ -22,7 +22,7 @@ use Wikimedia\TestingAccessWrapper;
 class ApiErrorFormatterTest extends MediaWikiLangTestCase {
 
 	/**
-	 * @covers \ApiErrorFormatter
+	 * @covers \MediaWiki\Api\ApiErrorFormatter
 	 */
 	public function testErrorFormatterBasics() {
 		$result = new ApiResult( 8_388_608 );
@@ -49,8 +49,8 @@ class ApiErrorFormatterTest extends MediaWikiLangTestCase {
 	}
 
 	/**
-	 * @covers \ApiErrorFormatter
-	 * @covers \ApiErrorFormatter_BackCompat
+	 * @covers \MediaWiki\Api\ApiErrorFormatter
+	 * @covers \MediaWiki\Api\ApiErrorFormatter_BackCompat
 	 */
 	public function testNewWithFormat() {
 		$result = new ApiResult( 8_388_608 );
@@ -70,7 +70,7 @@ class ApiErrorFormatterTest extends MediaWikiLangTestCase {
 	}
 
 	/**
-	 * @covers \ApiErrorFormatter
+	 * @covers \MediaWiki\Api\ApiErrorFormatter
 	 * @dataProvider provideErrorFormatter
 	 */
 	public function testErrorFormatter( $format, $lang, $useDB,
@@ -410,7 +410,7 @@ class ApiErrorFormatterTest extends MediaWikiLangTestCase {
 	}
 
 	/**
-	 * @covers \ApiErrorFormatter_BackCompat
+	 * @covers \MediaWiki\Api\ApiErrorFormatter_BackCompat
 	 */
 	public function testErrorFormatterBC() {
 		$aboutpage = wfMessage( 'aboutpage' );
@@ -606,8 +606,8 @@ class ApiErrorFormatterTest extends MediaWikiLangTestCase {
 
 	/**
 	 * @dataProvider provideGetMessageFromException
-	 * @covers \ApiErrorFormatter::getMessageFromException
-	 * @covers \ApiErrorFormatter::formatException
+	 * @covers \MediaWiki\Api\ApiErrorFormatter::getMessageFromException
+	 * @covers \MediaWiki\Api\ApiErrorFormatter::formatException
 	 * @param Exception $exception
 	 * @param array $options
 	 * @param array $expect
@@ -634,7 +634,7 @@ class ApiErrorFormatterTest extends MediaWikiLangTestCase {
 
 	/**
 	 * @dataProvider provideGetMessageFromException
-	 * @covers \ApiErrorFormatter_BackCompat::formatException
+	 * @covers \MediaWiki\Api\ApiErrorFormatter_BackCompat::formatException
 	 * @param Exception $exception
 	 * @param array $options
 	 * @param array $expect
@@ -703,9 +703,9 @@ class ApiErrorFormatterTest extends MediaWikiLangTestCase {
 	}
 
 	/**
-	 * @covers \ApiErrorFormatter::addMessagesFromStatus
-	 * @covers \ApiErrorFormatter::addWarningOrError
-	 * @covers \ApiErrorFormatter::formatMessageInternal
+	 * @covers \MediaWiki\Api\ApiErrorFormatter::addMessagesFromStatus
+	 * @covers \MediaWiki\Api\ApiErrorFormatter::addWarningOrError
+	 * @covers \MediaWiki\Api\ApiErrorFormatter::formatMessageInternal
 	 */
 	public function testAddMessagesFromStatus_filter() {
 		$result = new ApiResult( 8_388_608 );
@@ -745,7 +745,7 @@ class ApiErrorFormatterTest extends MediaWikiLangTestCase {
 
 	/**
 	 * @dataProvider provideIsValidApiCode
-	 * @covers \ApiErrorFormatter::isValidApiCode
+	 * @covers \MediaWiki\Api\ApiErrorFormatter::isValidApiCode
 	 * @param string $code
 	 * @param bool $expect
 	 */
diff --git a/tests/phpunit/includes/api/ApiFeedRecentChangesTest.php b/tests/phpunit/includes/api/ApiFeedRecentChangesTest.php
index 34199e892b38..686beb186159 100644
--- a/tests/phpunit/includes/api/ApiFeedRecentChangesTest.php
+++ b/tests/phpunit/includes/api/ApiFeedRecentChangesTest.php
@@ -2,16 +2,16 @@
 
 namespace MediaWiki\Tests\Api;
 
-use ApiBase;
-use ApiFeedRecentChanges;
-use ApiMain;
+use MediaWiki\Api\ApiBase;
+use MediaWiki\Api\ApiFeedRecentChanges;
+use MediaWiki\Api\ApiMain;
 use MediaWiki\Context\RequestContext;
 use MediaWiki\Tests\User\TempUser\TempUserTestTrait;
 use MediaWikiIntegrationTestCase;
 
 /**
  * @group API
- * @covers \ApiFeedRecentChanges
+ * @covers \MediaWiki\Api\ApiFeedRecentChanges
  */
 class ApiFeedRecentChangesTest extends MediaWikiIntegrationTestCase {
 
diff --git a/tests/phpunit/includes/api/ApiLoginTest.php b/tests/phpunit/includes/api/ApiLoginTest.php
index 4e5ad799e4d1..d1ac44d30ed6 100644
--- a/tests/phpunit/includes/api/ApiLoginTest.php
+++ b/tests/phpunit/includes/api/ApiLoginTest.php
@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Tests\Api;
 
-use ApiErrorFormatter;
+use MediaWiki\Api\ApiErrorFormatter;
 use MediaWiki\Auth\AbstractSecondaryAuthenticationProvider;
 use MediaWiki\Auth\AuthenticationResponse;
 use MediaWiki\Auth\UsernameAuthenticationRequest;
@@ -20,7 +20,7 @@ use Wikimedia\TestingAccessWrapper;
  * @group Database
  * @group medium
  *
- * @covers \ApiLogin
+ * @covers \MediaWiki\Api\ApiLogin
  */
 class ApiLoginTest extends ApiTestCase {
 
diff --git a/tests/phpunit/includes/api/ApiLogoutTest.php b/tests/phpunit/includes/api/ApiLogoutTest.php
index c56d9abda1eb..4098cf91c478 100644
--- a/tests/phpunit/includes/api/ApiLogoutTest.php
+++ b/tests/phpunit/includes/api/ApiLogoutTest.php
@@ -9,7 +9,7 @@ use MediaWiki\User\User;
  * @group Database
  * @group medium
  *
- * @covers \ApiLogout
+ * @covers \MediaWiki\Api\ApiLogout
  */
 class ApiLogoutTest extends ApiTestCase {
 
diff --git a/tests/phpunit/includes/api/ApiMainTest.php b/tests/phpunit/includes/api/ApiMainTest.php
index 0cf135f2bc4d..54ecfba9875a 100644
--- a/tests/phpunit/includes/api/ApiMainTest.php
+++ b/tests/phpunit/includes/api/ApiMainTest.php
@@ -2,16 +2,16 @@
 
 namespace MediaWiki\Tests\Api;
 
-use ApiBase;
-use ApiContinuationManager;
-use ApiErrorFormatter;
-use ApiErrorFormatter_BackCompat;
-use ApiMain;
-use ApiRawMessage;
-use ApiUsageException;
 use Generator;
 use InvalidArgumentException;
 use LogicException;
+use MediaWiki\Api\ApiBase;
+use MediaWiki\Api\ApiContinuationManager;
+use MediaWiki\Api\ApiErrorFormatter;
+use MediaWiki\Api\ApiErrorFormatter_BackCompat;
+use MediaWiki\Api\ApiMain;
+use MediaWiki\Api\ApiRawMessage;
+use MediaWiki\Api\ApiUsageException;
 use MediaWiki\Config\Config;
 use MediaWiki\Config\HashConfig;
 use MediaWiki\Config\MultiConfig;
@@ -41,7 +41,7 @@ use Wikimedia\Timestamp\ConvertibleTimestamp;
  * @group Database
  * @group medium
  *
- * @covers \ApiMain
+ * @covers \MediaWiki\Api\ApiMain
  */
 class ApiMainTest extends ApiTestCase {
 	use MockAuthorityTrait;
diff --git a/tests/phpunit/includes/api/ApiMessageTest.php b/tests/phpunit/includes/api/ApiMessageTest.php
index 4cff58b2295f..8a7a1a72d8b7 100644
--- a/tests/phpunit/includes/api/ApiMessageTest.php
+++ b/tests/phpunit/includes/api/ApiMessageTest.php
@@ -2,9 +2,9 @@
 
 namespace MediaWiki\Tests\Api;
 
-use ApiMessage;
-use ApiRawMessage;
 use InvalidArgumentException;
+use MediaWiki\Api\ApiMessage;
+use MediaWiki\Api\ApiRawMessage;
 use MediaWiki\Language\RawMessage;
 use MediaWiki\Message\Message;
 use MediaWiki\Page\PageReferenceValue;
@@ -34,7 +34,7 @@ class ApiMessageTest extends MediaWikiIntegrationTestCase {
 	}
 
 	/**
-	 * @covers \ApiMessageTrait
+	 * @covers MediaWiki\Api\ApiMessageTrait
 	 * @dataProvider provideCodeDefaults
 	 */
 	public function testCodeDefaults( $msg, $expectedCode ) {
@@ -53,7 +53,7 @@ class ApiMessageTest extends MediaWikiIntegrationTestCase {
 	}
 
 	/**
-	 * @covers \ApiMessageTrait
+	 * @covers MediaWiki\Api\ApiMessageTrait
 	 * @dataProvider provideInvalidCode
 	 */
 	public function testInvalidCode( $code ) {
@@ -84,8 +84,8 @@ class ApiMessageTest extends MediaWikiIntegrationTestCase {
 	}
 
 	/**
-	 * @covers \ApiMessage
-	 * @covers \ApiMessageTrait
+	 * @covers \MediaWiki\Api\ApiMessage
+	 * @covers MediaWiki\Api\ApiMessageTrait
 	 */
 	public function testApiMessage() {
 		$msg = new Message( [ 'foo', 'bar' ], [ 'baz' ] );
@@ -126,8 +126,8 @@ class ApiMessageTest extends MediaWikiIntegrationTestCase {
 	}
 
 	/**
-	 * @covers \ApiRawMessage
-	 * @covers \ApiMessageTrait
+	 * @covers \MediaWiki\Api\ApiRawMessage
+	 * @covers MediaWiki\Api\ApiMessageTrait
 	 */
 	public function testApiRawMessage() {
 		$msg = new RawMessage( 'foo', [ 'baz' ] );
@@ -167,7 +167,7 @@ class ApiMessageTest extends MediaWikiIntegrationTestCase {
 	}
 
 	/**
-	 * @covers \ApiMessage::create
+	 * @covers \MediaWiki\Api\ApiMessage::create
 	 */
 	public function testApiMessageCreate() {
 		$this->assertInstanceOf( ApiMessage::class, ApiMessage::create( new Message( 'mainpage' ) ) );
diff --git a/tests/phpunit/includes/api/ApiMoveTest.php b/tests/phpunit/includes/api/ApiMoveTest.php
index 6f4e341caafb..8458533529e0 100644
--- a/tests/phpunit/includes/api/ApiMoveTest.php
+++ b/tests/phpunit/includes/api/ApiMoveTest.php
@@ -2,8 +2,8 @@
 
 namespace MediaWiki\Tests\Api;
 
-use ApiUsageException;
 use IDBAccessObject;
+use MediaWiki\Api\ApiUsageException;
 use MediaWiki\Block\DatabaseBlock;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Revision\SlotRecord;
@@ -15,7 +15,7 @@ use MediaWiki\User\User;
  * @group Database
  * @group medium
  *
- * @covers \ApiMove
+ * @covers MediaWiki\Api\ApiMove
  */
 class ApiMoveTest extends ApiTestCase {
 
diff --git a/tests/phpunit/includes/api/ApiOpenSearchTest.php b/tests/phpunit/includes/api/ApiOpenSearchTest.php
index c5d35f9f0af7..aba7117b8e49 100644
--- a/tests/phpunit/includes/api/ApiOpenSearchTest.php
+++ b/tests/phpunit/includes/api/ApiOpenSearchTest.php
@@ -2,8 +2,8 @@
 
 namespace MediaWiki\Tests\Api;
 
-use ApiMain;
-use ApiOpenSearch;
+use MediaWiki\Api\ApiMain;
+use MediaWiki\Api\ApiOpenSearch;
 use MediaWiki\Context\RequestContext;
 use MediaWikiIntegrationTestCase;
 use SearchEngine;
@@ -14,7 +14,7 @@ use Wikimedia\ParamValidator\ParamValidator;
 /**
  * TODO convert to unit test, no integration is needed
  *
- * @covers \ApiOpenSearch
+ * @covers \MediaWiki\Api\ApiOpenSearch
  */
 class ApiOpenSearchTest extends MediaWikiIntegrationTestCase {
 	public function testGetAllowedParams() {
diff --git a/tests/phpunit/includes/api/ApiOptionsTest.php b/tests/phpunit/includes/api/ApiOptionsTest.php
index 3c3f4df84d63..d0714d39a490 100644
--- a/tests/phpunit/includes/api/ApiOptionsTest.php
+++ b/tests/phpunit/includes/api/ApiOptionsTest.php
@@ -4,9 +4,9 @@ namespace MediaWiki\Tests\Api;
 
 namespace MediaWiki\Tests\Api;
 
-use ApiMain;
-use ApiOptions;
-use ApiUsageException;
+use MediaWiki\Api\ApiMain;
+use MediaWiki\Api\ApiOptions;
+use MediaWiki\Api\ApiUsageException;
 use MediaWiki\Context\DerivativeContext;
 use MediaWiki\Context\IContextSource;
 use MediaWiki\Context\RequestContext;
@@ -23,7 +23,7 @@ use PHPUnit\Framework\MockObject\MockObject;
  * @group Database
  * @group medium
  *
- * @covers \ApiOptions
+ * @covers \MediaWiki\Api\ApiOptions
  */
 class ApiOptionsTest extends ApiTestCase {
 	use MockAuthorityTrait;
diff --git a/tests/phpunit/includes/api/ApiPageSetTest.php b/tests/phpunit/includes/api/ApiPageSetTest.php
index 237c997d1b46..2d4d15197a66 100644
--- a/tests/phpunit/includes/api/ApiPageSetTest.php
+++ b/tests/phpunit/includes/api/ApiPageSetTest.php
@@ -2,9 +2,9 @@
 
 namespace MediaWiki\Tests\Api;
 
-use ApiMain;
-use ApiPageSet;
-use ApiResult;
+use MediaWiki\Api\ApiMain;
+use MediaWiki\Api\ApiPageSet;
+use MediaWiki\Api\ApiResult;
 use MediaWiki\Context\RequestContext;
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\MainConfigNames;
@@ -21,7 +21,7 @@ use Wikimedia\TestingAccessWrapper;
  * @group API
  * @group medium
  * @group Database
- * @covers \ApiPageSet
+ * @covers \MediaWiki\Api\ApiPageSet
  */
 class ApiPageSetTest extends ApiTestCase {
 	use DummyServicesTrait;
@@ -104,7 +104,7 @@ class ApiPageSetTest extends ApiTestCase {
 	}
 
 	public function testRedirectMergePolicyRedirectLoop() {
-		$this->hideDeprecated( 'ApiPageSet::getTitles' );
+		$this->hideDeprecated( ApiPageSet::class . '::getTitles' );
 
 		$redirectOneTitle = 'ApiPageSetTestRedirectOne';
 		$redirectTwoTitle = 'ApiPageSetTestRedirectTwo';
@@ -334,12 +334,12 @@ class ApiPageSetTest extends ApiTestCase {
 	}
 
 	public function testPopulateFromTitles() {
-		$this->hideDeprecated( 'ApiPageSet::getTitles' );
-		$this->hideDeprecated( 'ApiPageSet::getGoodTitles' );
-		$this->hideDeprecated( 'ApiPageSet::getMissingTitles' );
-		$this->hideDeprecated( 'ApiPageSet::getGoodAndMissingTitles' );
-		$this->hideDeprecated( 'ApiPageSet::getRedirectTitles' );
-		$this->hideDeprecated( 'ApiPageSet::getSpecialTitles' );
+		$this->hideDeprecated( ApiPageSet::class . '::getTitles' );
+		$this->hideDeprecated( ApiPageSet::class . '::getGoodTitles' );
+		$this->hideDeprecated( ApiPageSet::class . '::getMissingTitles' );
+		$this->hideDeprecated( ApiPageSet::class . '::getGoodAndMissingTitles' );
+		$this->hideDeprecated( ApiPageSet::class . '::getRedirectTitles' );
+		$this->hideDeprecated( ApiPageSet::class . '::getSpecialTitles' );
 
 		$interwikiLookup = $this->getDummyInterwikiLookup( [ 'acme' ] );
 		$this->setService( 'InterwikiLookup', $interwikiLookup );
diff --git a/tests/phpunit/includes/api/ApiParseTest.php b/tests/phpunit/includes/api/ApiParseTest.php
index b7e3fc80a860..214d6c81cb1d 100644
--- a/tests/phpunit/includes/api/ApiParseTest.php
+++ b/tests/phpunit/includes/api/ApiParseTest.php
@@ -23,7 +23,7 @@
 
 namespace MediaWiki\Tests\Api;
 
-use ApiUsageException;
+use MediaWiki\Api\ApiUsageException;
 use MediaWiki\Context\RequestContext;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Revision\RevisionRecord;
@@ -38,7 +38,7 @@ use SkinFallback;
  * @group Database
  * @group medium
  *
- * @covers \ApiParse
+ * @covers MediaWiki\Api\ApiParse
  */
 class ApiParseTest extends ApiTestCase {
 	use DummyServicesTrait;
diff --git a/tests/phpunit/includes/api/ApiProtectTest.php b/tests/phpunit/includes/api/ApiProtectTest.php
index 19129db247ff..424b2bcb1236 100644
--- a/tests/phpunit/includes/api/ApiProtectTest.php
+++ b/tests/phpunit/includes/api/ApiProtectTest.php
@@ -12,7 +12,7 @@ use MediaWiki\Title\Title;
  * @group Database
  * @group medium
  *
- * @covers \ApiProtect
+ * @covers MediaWiki\Api\ApiProtect
  */
 class ApiProtectTest extends ApiTestCase {
 
@@ -23,7 +23,7 @@ class ApiProtectTest extends ApiTestCase {
 	}
 
 	/**
-	 * @covers \ApiProtect::execute()
+	 * @covers MediaWiki\Api\ApiProtect::execute()
 	 */
 	public function testProtectWithWatch(): void {
 		$title = Title::makeTitle( NS_MAIN, 'TestProtectWithWatch' );
diff --git a/tests/phpunit/includes/api/ApiPurgeTest.php b/tests/phpunit/includes/api/ApiPurgeTest.php
index 94f5c814b5f6..16de31f7253a 100644
--- a/tests/phpunit/includes/api/ApiPurgeTest.php
+++ b/tests/phpunit/includes/api/ApiPurgeTest.php
@@ -12,7 +12,7 @@ use MediaWiki\Permissions\PermissionStatus;
  * @group Database
  * @group medium
  *
- * @covers \ApiPurge
+ * @covers MediaWiki\Api\ApiPurge
  */
 class ApiPurgeTest extends ApiTestCase {
 
diff --git a/tests/phpunit/includes/api/ApiResultTest.php b/tests/phpunit/includes/api/ApiResultTest.php
index adb1933087f6..60f7cb7ac9cf 100644
--- a/tests/phpunit/includes/api/ApiResultTest.php
+++ b/tests/phpunit/includes/api/ApiResultTest.php
@@ -3,10 +3,10 @@
 namespace MediaWiki\Tests\Api;
 
 use AllowDynamicProperties;
-use ApiErrorFormatter;
-use ApiResult;
 use Exception;
 use InvalidArgumentException;
+use MediaWiki\Api\ApiErrorFormatter;
+use MediaWiki\Api\ApiResult;
 use MediaWiki\Title\Title;
 use MediaWikiIntegrationTestCase;
 use RuntimeException;
@@ -14,13 +14,13 @@ use Stringable;
 use UnexpectedValueException;
 
 /**
- * @covers \ApiResult
+ * @covers \MediaWiki\Api\ApiResult
  * @group API
  */
 class ApiResultTest extends MediaWikiIntegrationTestCase {
 
 	/**
-	 * @covers \ApiResult
+	 * @covers \MediaWiki\Api\ApiResult
 	 */
 	public function testStaticDataMethods() {
 		$arr = [];
@@ -245,7 +245,7 @@ class ApiResultTest extends MediaWikiIntegrationTestCase {
 	}
 
 	/**
-	 * @covers \ApiResult
+	 * @covers \MediaWiki\Api\ApiResult
 	 */
 	public function testInstanceDataMethods() {
 		$result = new ApiResult( 8_388_608 );
@@ -548,7 +548,7 @@ class ApiResultTest extends MediaWikiIntegrationTestCase {
 	}
 
 	/**
-	 * @covers \ApiResult
+	 * @covers \MediaWiki\Api\ApiResult
 	 */
 	public function testMetadata() {
 		$arr = [ 'foo' => [ 'bar' => [] ] ];
@@ -613,7 +613,7 @@ class ApiResultTest extends MediaWikiIntegrationTestCase {
 	}
 
 	/**
-	 * @covers \ApiResult
+	 * @covers \MediaWiki\Api\ApiResult
 	 */
 	public function testUtilityFunctions() {
 		$arr = [
@@ -702,7 +702,7 @@ class ApiResultTest extends MediaWikiIntegrationTestCase {
 	}
 
 	/**
-	 * @covers \ApiResult
+	 * @covers \MediaWiki\Api\ApiResult
 	 * @dataProvider provideTransformations
 	 * @param string $label
 	 * @param array $input
@@ -1293,7 +1293,7 @@ class ApiResultTest extends MediaWikiIntegrationTestCase {
 	}
 
 	/**
-	 * @covers \ApiResult
+	 * @covers \MediaWiki\Api\ApiResult
 	 */
 	public function testAddMetadataToResultVars() {
 		$arr = [
diff --git a/tests/phpunit/includes/api/ApiRevisionDeleteTest.php b/tests/phpunit/includes/api/ApiRevisionDeleteTest.php
index 7e89898e2458..21d1eb1401d7 100644
--- a/tests/phpunit/includes/api/ApiRevisionDeleteTest.php
+++ b/tests/phpunit/includes/api/ApiRevisionDeleteTest.php
@@ -12,7 +12,7 @@ use MWCryptRand;
 
 /**
  * Tests for action=revisiondelete
- * @covers \APIRevisionDelete
+ * @covers MediaWiki\Api\ApiRevisionDelete
  * @group API
  * @group medium
  * @group Database
diff --git a/tests/phpunit/includes/api/ApiRollbackTest.php b/tests/phpunit/includes/api/ApiRollbackTest.php
index 2368fce4221e..88758e62879e 100644
--- a/tests/phpunit/includes/api/ApiRollbackTest.php
+++ b/tests/phpunit/includes/api/ApiRollbackTest.php
@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Tests\Api;
 
-use ApiUsageException;
+use MediaWiki\Api\ApiUsageException;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Title\Title;
 
@@ -13,7 +13,7 @@ use MediaWiki\Title\Title;
  * @group Database
  * @group medium
  *
- * @covers \ApiRollback
+ * @covers MediaWiki\Api\ApiRollback
  */
 class ApiRollbackTest extends ApiTestCase {
 
diff --git a/tests/phpunit/includes/api/ApiSetNotificationTimestampIntegrationTest.php b/tests/phpunit/includes/api/ApiSetNotificationTimestampIntegrationTest.php
index 25bf2c36e88b..852461f6fb35 100644
--- a/tests/phpunit/includes/api/ApiSetNotificationTimestampIntegrationTest.php
+++ b/tests/phpunit/includes/api/ApiSetNotificationTimestampIntegrationTest.php
@@ -4,7 +4,7 @@ namespace MediaWiki\Tests\Api;
 
 /**
  * @author Addshore
- * @covers \ApiSetNotificationTimestamp
+ * @covers MediaWiki\Api\ApiSetNotificationTimestamp
  * @group API
  * @group medium
  * @group Database
diff --git a/tests/phpunit/includes/api/ApiStashEditTest.php b/tests/phpunit/includes/api/ApiStashEditTest.php
index e1aa3f72a815..8c2c36bf3943 100644
--- a/tests/phpunit/includes/api/ApiStashEditTest.php
+++ b/tests/phpunit/includes/api/ApiStashEditTest.php
@@ -18,7 +18,7 @@ use Wikimedia\TestingAccessWrapper;
 use Wikimedia\Timestamp\ConvertibleTimestamp;
 
 /**
- * @covers \ApiStashEdit
+ * @covers MediaWiki\Api\ApiStashEdit
  * @covers \MediaWiki\Storage\PageEditStash
  * @group API
  * @group medium
diff --git a/tests/phpunit/includes/api/ApiTestCase.php b/tests/phpunit/includes/api/ApiTestCase.php
index 9842080e20f8..7a01b454b385 100644
--- a/tests/phpunit/includes/api/ApiTestCase.php
+++ b/tests/phpunit/includes/api/ApiTestCase.php
@@ -2,15 +2,15 @@
 
 namespace MediaWiki\Tests\Api;
 
-use ApiBase;
-use ApiErrorFormatter;
-use ApiMain;
-use ApiMessage;
-use ApiQueryTokens;
-use ApiResult;
-use ApiUsageException;
 use ArrayAccess;
 use LogicException;
+use MediaWiki\Api\ApiBase;
+use MediaWiki\Api\ApiErrorFormatter;
+use MediaWiki\Api\ApiMain;
+use MediaWiki\Api\ApiMessage;
+use MediaWiki\Api\ApiQueryTokens;
+use MediaWiki\Api\ApiResult;
+use MediaWiki\Api\ApiUsageException;
 use MediaWiki\Context\RequestContext;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Message\Message;
diff --git a/tests/phpunit/includes/api/ApiUnblockTest.php b/tests/phpunit/includes/api/ApiUnblockTest.php
index 6f883f6a4a57..fecd2d28aa0c 100644
--- a/tests/phpunit/includes/api/ApiUnblockTest.php
+++ b/tests/phpunit/includes/api/ApiUnblockTest.php
@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Tests\Api;
 
-use ApiUsageException;
+use MediaWiki\Api\ApiUsageException;
 use MediaWiki\Block\DatabaseBlock;
 use MediaWiki\Title\Title;
 use MediaWiki\User\User;
@@ -12,7 +12,7 @@ use MediaWiki\User\User;
  * @group Database
  * @group medium
  *
- * @covers \ApiUnblock
+ * @covers MediaWiki\Api\ApiUnblock
  */
 class ApiUnblockTest extends ApiTestCase {
 	/** @var User */
diff --git a/tests/phpunit/includes/api/ApiUndeleteTest.php b/tests/phpunit/includes/api/ApiUndeleteTest.php
index 277c2e9f7034..181390085e00 100644
--- a/tests/phpunit/includes/api/ApiUndeleteTest.php
+++ b/tests/phpunit/includes/api/ApiUndeleteTest.php
@@ -13,7 +13,7 @@ use MediaWiki\Title\Title;
  * @group Database
  * @group medium
  *
- * @covers \ApiUndelete
+ * @covers MediaWiki\Api\ApiUndelete
  */
 class ApiUndeleteTest extends ApiTestCase {
 
@@ -24,7 +24,7 @@ class ApiUndeleteTest extends ApiTestCase {
 	}
 
 	/**
-	 * @covers \ApiUndelete::execute()
+	 * @covers MediaWiki\Api\ApiUndelete::execute()
 	 */
 	public function testUndeleteWithWatch(): void {
 		$title = Title::makeTitle( NS_MAIN, 'TestUndeleteWithWatch' );
diff --git a/tests/phpunit/includes/api/ApiUploadTest.php b/tests/phpunit/includes/api/ApiUploadTest.php
index 9222f5e6ab5b..421f8e768f88 100644
--- a/tests/phpunit/includes/api/ApiUploadTest.php
+++ b/tests/phpunit/includes/api/ApiUploadTest.php
@@ -16,7 +16,7 @@ use RepoGroup;
  * @group Database
  * @group medium
  *
- * @covers \ApiUpload
+ * @covers MediaWiki\Api\ApiUpload
  */
 class ApiUploadTest extends ApiUploadTestCase {
 	private ?Authority $uploader = null;
diff --git a/tests/phpunit/includes/api/ApiUsageExceptionTest.php b/tests/phpunit/includes/api/ApiUsageExceptionTest.php
index 341bb6b68b74..39e89e1f65da 100644
--- a/tests/phpunit/includes/api/ApiUsageExceptionTest.php
+++ b/tests/phpunit/includes/api/ApiUsageExceptionTest.php
@@ -2,14 +2,14 @@
 
 namespace MediaWiki\Tests\Api;
 
-use ApiMessage;
-use ApiUsageException;
+use MediaWiki\Api\ApiMessage;
+use MediaWiki\Api\ApiUsageException;
 use MediaWiki\Message\Message;
 use MediaWikiIntegrationTestCase;
 use StatusValue;
 
 /**
- * @covers \ApiUsageException
+ * @covers \MediaWiki\Api\ApiUsageException
  */
 class ApiUsageExceptionTest extends MediaWikiIntegrationTestCase {
 
diff --git a/tests/phpunit/includes/api/ApiUserrightsTest.php b/tests/phpunit/includes/api/ApiUserrightsTest.php
index 80e223f73d85..ec9971bf4a2d 100644
--- a/tests/phpunit/includes/api/ApiUserrightsTest.php
+++ b/tests/phpunit/includes/api/ApiUserrightsTest.php
@@ -14,7 +14,7 @@ use TestUserRegistry;
  * @group Database
  * @group medium
  *
- * @covers \ApiUserrights
+ * @covers MediaWiki\Api\ApiUserrights
  */
 class ApiUserrightsTest extends ApiTestCase {
 
diff --git a/tests/phpunit/includes/api/ApiWatchTest.php b/tests/phpunit/includes/api/ApiWatchTest.php
index 8034029603ba..0c649ba25d30 100644
--- a/tests/phpunit/includes/api/ApiWatchTest.php
+++ b/tests/phpunit/includes/api/ApiWatchTest.php
@@ -10,7 +10,7 @@ use Wikimedia\Timestamp\ConvertibleTimestamp;
  * @group API
  * @group Database
  * @group medium
- * @covers \ApiWatch
+ * @covers MediaWiki\Api\ApiWatch
  */
 class ApiWatchTest extends ApiTestCase {
 	protected function setUp(): void {
diff --git a/tests/phpunit/includes/api/MockApi.php b/tests/phpunit/includes/api/MockApi.php
index 947b724ea15e..3a2783b03e36 100644
--- a/tests/phpunit/includes/api/MockApi.php
+++ b/tests/phpunit/includes/api/MockApi.php
@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Tests\Api;
 
-use ApiBase;
+use MediaWiki\Api\ApiBase;
 
 class MockApi extends ApiBase {
 	/** @var array */
diff --git a/tests/phpunit/includes/api/MockApiQueryBase.php b/tests/phpunit/includes/api/MockApiQueryBase.php
index 965bfe7b46b8..4a3d79cf0521 100644
--- a/tests/phpunit/includes/api/MockApiQueryBase.php
+++ b/tests/phpunit/includes/api/MockApiQueryBase.php
@@ -2,7 +2,7 @@
 
 namespace MediaWiki\Tests\Api;
 
-use ApiQueryBase;
+use MediaWiki\Api\ApiQueryBase;
 
 class MockApiQueryBase extends ApiQueryBase {
 	/** @var string */
diff --git a/tests/phpunit/includes/api/Validator/ApiParamValidatorCallbacksTest.php b/tests/phpunit/includes/api/Validator/ApiParamValidatorCallbacksTest.php
index f8b479eed85c..ca74e8590fa2 100644
--- a/tests/phpunit/includes/api/Validator/ApiParamValidatorCallbacksTest.php
+++ b/tests/phpunit/includes/api/Validator/ApiParamValidatorCallbacksTest.php
@@ -2,11 +2,11 @@
 
 namespace MediaWiki\Tests\Api\Validator;
 
-use ApiBase;
-use ApiMain;
-use ApiMessage;
-use ApiQueryBase;
 use Generator;
+use MediaWiki\Api\ApiBase;
+use MediaWiki\Api\ApiMain;
+use MediaWiki\Api\ApiMessage;
+use MediaWiki\Api\ApiQueryBase;
 use MediaWiki\Api\Validator\ApiParamValidatorCallbacks;
 use MediaWiki\Request\FauxRequest;
 use MediaWiki\Tests\Api\ApiUploadTestCase;
diff --git a/tests/phpunit/includes/api/Validator/ApiParamValidatorTest.php b/tests/phpunit/includes/api/Validator/ApiParamValidatorTest.php
index 1052f9846b77..c6249a1cbfe9 100644
--- a/tests/phpunit/includes/api/Validator/ApiParamValidatorTest.php
+++ b/tests/phpunit/includes/api/Validator/ApiParamValidatorTest.php
@@ -2,10 +2,10 @@
 
 namespace MediaWiki\Tests\Api\Validator;
 
-use ApiBase;
-use ApiMain;
-use ApiMessage;
-use ApiUsageException;
+use MediaWiki\Api\ApiBase;
+use MediaWiki\Api\ApiMain;
+use MediaWiki\Api\ApiMessage;
+use MediaWiki\Api\ApiUsageException;
 use MediaWiki\Api\Validator\ApiParamValidator;
 use MediaWiki\Message\Message;
 use MediaWiki\Request\FauxRequest;
diff --git a/tests/phpunit/includes/api/Validator/SubmoduleDefTest.php b/tests/phpunit/includes/api/Validator/SubmoduleDefTest.php
index e007c698f482..b3c42f3483a8 100644
--- a/tests/phpunit/includes/api/Validator/SubmoduleDefTest.php
+++ b/tests/phpunit/includes/api/Validator/SubmoduleDefTest.php
@@ -2,8 +2,8 @@
 
 namespace MediaWiki\Tests\Api\Validator;
 
-use ApiMain;
-use ApiModuleManager;
+use MediaWiki\Api\ApiMain;
+use MediaWiki\Api\ApiModuleManager;
 use MediaWiki\Api\Validator\SubmoduleDef;
 use MediaWiki\Tests\Api\MockApi;
 use Wikimedia\Message\DataMessageValue;
diff --git a/tests/phpunit/includes/api/format/ApiFormatBaseTest.php b/tests/phpunit/includes/api/format/ApiFormatBaseTest.php
index 5950ae0c397f..d9580485ba40 100644
--- a/tests/phpunit/includes/api/format/ApiFormatBaseTest.php
+++ b/tests/phpunit/includes/api/format/ApiFormatBaseTest.php
@@ -2,9 +2,9 @@
 
 namespace MediaWiki\Tests\Api\Format;
 
-use ApiBase;
-use ApiFormatBase;
-use ApiMain;
+use MediaWiki\Api\ApiBase;
+use MediaWiki\Api\ApiFormatBase;
+use MediaWiki\Api\ApiMain;
 use MediaWiki\Context\RequestContext;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Request\FauxRequest;
@@ -15,7 +15,7 @@ use Wikimedia\TestingAccessWrapper;
 /**
  * @group API
  * @group Database
- * @covers \ApiFormatBase
+ * @covers \MediaWiki\Api\ApiFormatBase
  */
 class ApiFormatBaseTest extends ApiFormatTestBase {
 
diff --git a/tests/phpunit/includes/api/format/ApiFormatJsonTest.php b/tests/phpunit/includes/api/format/ApiFormatJsonTest.php
index 2967a0940351..e2eaa908cc37 100644
--- a/tests/phpunit/includes/api/format/ApiFormatJsonTest.php
+++ b/tests/phpunit/includes/api/format/ApiFormatJsonTest.php
@@ -2,13 +2,14 @@
 
 namespace MediaWiki\Tests\Api\Format;
 
-use ApiResult;
 use InvalidArgumentException;
+use MediaWiki\Api\ApiFormatJson;
+use MediaWiki\Api\ApiResult;
 use MWException;
 
 /**
  * @group API
- * @covers \ApiFormatJson
+ * @covers \MediaWiki\Api\ApiFormatJson
  */
 class ApiFormatJsonTest extends ApiFormatTestBase {
 
@@ -138,7 +139,7 @@ class ApiFormatJsonTest extends ApiFormatTestBase {
 				[
 					[ 'foo' => "\xFF" ],
 					new MWException(
-						'Internal error in ApiFormatJson::execute: ' .
+						'Internal error in ' . ApiFormatJson::class . '::execute: ' .
 						'Unable to encode API result as JSON'
 					),
 					[],
@@ -154,7 +155,7 @@ class ApiFormatJsonTest extends ApiFormatTestBase {
 				[
 					[ 'foo' => NAN ],
 					new MWException(
-						'Internal error in ApiFormatJson::execute: ' .
+						'Internal error in ' . ApiFormatJson::class . '::execute: ' .
 						'Unable to encode API result as JSON'
 					),
 					[],
diff --git a/tests/phpunit/includes/api/format/ApiFormatNoneTest.php b/tests/phpunit/includes/api/format/ApiFormatNoneTest.php
index 029c933831c8..eee11b7e4e23 100644
--- a/tests/phpunit/includes/api/format/ApiFormatNoneTest.php
+++ b/tests/phpunit/includes/api/format/ApiFormatNoneTest.php
@@ -2,11 +2,11 @@
 
 namespace MediaWiki\Tests\Api\Format;
 
-use ApiResult;
+use MediaWiki\Api\ApiResult;
 
 /**
  * @group API
- * @covers \ApiFormatNone
+ * @covers MediaWiki\Api\ApiFormatNone
  */
 class ApiFormatNoneTest extends ApiFormatTestBase {
 
diff --git a/tests/phpunit/includes/api/format/ApiFormatPhpTest.php b/tests/phpunit/includes/api/format/ApiFormatPhpTest.php
index 06bf0a2168fd..a1791d0bb08f 100644
--- a/tests/phpunit/includes/api/format/ApiFormatPhpTest.php
+++ b/tests/phpunit/includes/api/format/ApiFormatPhpTest.php
@@ -2,11 +2,11 @@
 
 namespace MediaWiki\Tests\Api\Format;
 
-use ApiResult;
+use MediaWiki\Api\ApiResult;
 
 /**
  * @group API
- * @covers \ApiFormatPhp
+ * @covers MediaWiki\Api\ApiFormatPhp
  */
 class ApiFormatPhpTest extends ApiFormatTestBase {
 
diff --git a/tests/phpunit/includes/api/format/ApiFormatRawTest.php b/tests/phpunit/includes/api/format/ApiFormatRawTest.php
index 52e4bed691d9..a5e911e63471 100644
--- a/tests/phpunit/includes/api/format/ApiFormatRawTest.php
+++ b/tests/phpunit/includes/api/format/ApiFormatRawTest.php
@@ -2,14 +2,14 @@
 
 namespace MediaWiki\Tests\Api\Format;
 
-use ApiFormatJson;
-use ApiFormatRaw;
-use ApiMain;
+use MediaWiki\Api\ApiFormatJson;
+use MediaWiki\Api\ApiFormatRaw;
+use MediaWiki\Api\ApiMain;
 use MWException;
 
 /**
  * @group API
- * @covers \ApiFormatRaw
+ * @covers \MediaWiki\Api\ApiFormatRaw
  */
 class ApiFormatRawTest extends ApiFormatTestBase {
 
diff --git a/tests/phpunit/includes/api/format/ApiFormatTestBase.php b/tests/phpunit/includes/api/format/ApiFormatTestBase.php
index e9487ee663f8..9bae105e3fdd 100644
--- a/tests/phpunit/includes/api/format/ApiFormatTestBase.php
+++ b/tests/phpunit/includes/api/format/ApiFormatTestBase.php
@@ -2,9 +2,9 @@
 
 namespace MediaWiki\Tests\Api\Format;
 
-use ApiMain;
 use BadMethodCallException;
 use Exception;
+use MediaWiki\Api\ApiMain;
 use MediaWiki\Context\RequestContext;
 use MediaWiki\Request\FauxRequest;
 use MediaWikiIntegrationTestCase;
diff --git a/tests/phpunit/includes/api/format/ApiFormatXmlTest.php b/tests/phpunit/includes/api/format/ApiFormatXmlTest.php
index dd8029e8818d..134d3a194f94 100644
--- a/tests/phpunit/includes/api/format/ApiFormatXmlTest.php
+++ b/tests/phpunit/includes/api/format/ApiFormatXmlTest.php
@@ -2,13 +2,13 @@
 
 namespace MediaWiki\Tests\Api\Format;
 
-use ApiResult;
+use MediaWiki\Api\ApiResult;
 use MediaWiki\Title\Title;
 
 /**
  * @group API
  * @group Database
- * @covers \ApiFormatXml
+ * @covers MediaWiki\Api\ApiFormatXml
  */
 class ApiFormatXmlTest extends ApiFormatTestBase {
 
diff --git a/tests/phpunit/includes/api/query/ApiQueryAllDeletedRevisionsTest.php b/tests/phpunit/includes/api/query/ApiQueryAllDeletedRevisionsTest.php
index 69bd6a26f87f..b2256c08fdcd 100644
--- a/tests/phpunit/includes/api/query/ApiQueryAllDeletedRevisionsTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryAllDeletedRevisionsTest.php
@@ -9,7 +9,7 @@ use MediaWiki\Title\Title;
 /**
  * @group API
  * @group Database
- * @covers \ApiQueryAllDeletedRevisions
+ * @covers MediaWiki\Api\ApiQueryAllDeletedRevisions
  */
 class ApiQueryAllDeletedRevisionsTest extends ApiTestCase {
 
diff --git a/tests/phpunit/includes/api/query/ApiQueryAllPagesTest.php b/tests/phpunit/includes/api/query/ApiQueryAllPagesTest.php
index a342f95ba6ec..0f44f2c58a2f 100644
--- a/tests/phpunit/includes/api/query/ApiQueryAllPagesTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryAllPagesTest.php
@@ -10,7 +10,7 @@ use MediaWiki\Title\Title;
  * @group Database
  * @group medium
  *
- * @covers \ApiQueryAllPages
+ * @covers MediaWiki\Api\ApiQueryAllPages
  */
 class ApiQueryAllPagesTest extends ApiTestCase {
 	/**
diff --git a/tests/phpunit/includes/api/query/ApiQueryAllRevisionsTest.php b/tests/phpunit/includes/api/query/ApiQueryAllRevisionsTest.php
index 753037bacf7d..212996e37ea8 100644
--- a/tests/phpunit/includes/api/query/ApiQueryAllRevisionsTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryAllRevisionsTest.php
@@ -9,7 +9,7 @@ use MediaWiki\Title\Title;
  * @group API
  * @group Database
  * @group medium
- * @covers \ApiQueryAllRevisions
+ * @covers MediaWiki\Api\ApiQueryAllRevisions
  */
 class ApiQueryAllRevisionsTest extends ApiTestCase {
 
diff --git a/tests/phpunit/includes/api/query/ApiQueryAllUsersTest.php b/tests/phpunit/includes/api/query/ApiQueryAllUsersTest.php
index 9aa42dc66c0f..cad9453398e6 100644
--- a/tests/phpunit/includes/api/query/ApiQueryAllUsersTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryAllUsersTest.php
@@ -13,7 +13,7 @@ use MediaWiki\User\User;
  * @group Database
  * @group medium
  *
- * @covers \ApiQueryAllUsers
+ * @covers MediaWiki\Api\ApiQueryAllUsers
  */
 class ApiQueryAllUsersTest extends ApiTestCase {
 	use MockAuthorityTrait;
diff --git a/tests/phpunit/includes/api/query/ApiQueryBasicTest.php b/tests/phpunit/includes/api/query/ApiQueryBasicTest.php
index cef08a10e415..07c6c5a16a76 100644
--- a/tests/phpunit/includes/api/query/ApiQueryBasicTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryBasicTest.php
@@ -31,7 +31,7 @@ use MediaWiki\Title\Title;
  * @group API
  * @group Database
  * @group medium
- * @covers \ApiQuery
+ * @covers MediaWiki\Api\ApiQuery
  */
 class ApiQueryBasicTest extends ApiQueryTestBase {
 	/** @var Exception|null */
diff --git a/tests/phpunit/includes/api/query/ApiQueryBlockInfoTraitTest.php b/tests/phpunit/includes/api/query/ApiQueryBlockInfoTraitTest.php
index 4e87ebca7429..915da66575d0 100644
--- a/tests/phpunit/includes/api/query/ApiQueryBlockInfoTraitTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryBlockInfoTraitTest.php
@@ -2,8 +2,8 @@
 
 namespace MediaWiki\Tests\Api\Query;
 
-use ApiQueryBase;
-use ApiQueryBlockInfoTrait;
+use MediaWiki\Api\ApiQueryBase;
+use MediaWiki\Api\ApiQueryBlockInfoTrait;
 use MediaWiki\Tests\MockDatabase;
 use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait;
 use MediaWikiIntegrationTestCase;
@@ -11,7 +11,7 @@ use Wikimedia\TestingAccessWrapper;
 use Wikimedia\Timestamp\ConvertibleTimestamp;
 
 /**
- * @covers \ApiQueryBlockInfoTrait
+ * @covers \MediaWiki\Api\ApiQueryBlockInfoTrait
  */
 class ApiQueryBlockInfoTraitTest extends MediaWikiIntegrationTestCase {
 	use MockAuthorityTrait;
diff --git a/tests/phpunit/includes/api/query/ApiQueryBlocksTest.php b/tests/phpunit/includes/api/query/ApiQueryBlocksTest.php
index 8d5c0c220c05..c8ced92b95f9 100644
--- a/tests/phpunit/includes/api/query/ApiQueryBlocksTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryBlocksTest.php
@@ -15,7 +15,7 @@ use MediaWiki\Tests\Api\ApiTestCase;
  * @group Database
  * @group medium
  *
- * @covers \ApiQueryBlocks
+ * @covers MediaWiki\Api\ApiQueryBlocks
  */
 class ApiQueryBlocksTest extends ApiTestCase {
 
diff --git a/tests/phpunit/includes/api/query/ApiQueryContinue2Test.php b/tests/phpunit/includes/api/query/ApiQueryContinue2Test.php
index a0ca939b228b..2eb6a6208711 100644
--- a/tests/phpunit/includes/api/query/ApiQueryContinue2Test.php
+++ b/tests/phpunit/includes/api/query/ApiQueryContinue2Test.php
@@ -27,7 +27,7 @@ use Exception;
  * @group API
  * @group Database
  * @group medium
- * @covers \ApiQuery
+ * @covers MediaWiki\Api\ApiQuery
  */
 class ApiQueryContinue2Test extends ApiQueryContinueTestBase {
 	/** @var Exception|null */
diff --git a/tests/phpunit/includes/api/query/ApiQueryContinueTest.php b/tests/phpunit/includes/api/query/ApiQueryContinueTest.php
index 3cebd3629993..041bcef08c45 100644
--- a/tests/phpunit/includes/api/query/ApiQueryContinueTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryContinueTest.php
@@ -31,7 +31,7 @@ use Exception;
  * @group API
  * @group Database
  * @group medium
- * @covers \ApiQuery
+ * @covers MediaWiki\Api\ApiQuery
  */
 class ApiQueryContinueTest extends ApiQueryContinueTestBase {
 	/** @var Exception|null */
diff --git a/tests/phpunit/includes/api/query/ApiQueryDisabledTest.php b/tests/phpunit/includes/api/query/ApiQueryDisabledTest.php
index 4a48bcbc6ccf..53e773caa21a 100644
--- a/tests/phpunit/includes/api/query/ApiQueryDisabledTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryDisabledTest.php
@@ -8,7 +8,7 @@ use MediaWiki\Tests\Api\ApiTestCase;
  * @group API
  * @group medium
  *
- * @covers \ApiQueryDisabled
+ * @covers MediaWiki\Api\ApiQueryDisabled
  */
 class ApiQueryDisabledTest extends ApiTestCase {
 	public function testDisabled() {
diff --git a/tests/phpunit/includes/api/query/ApiQueryImageInfoTest.php b/tests/phpunit/includes/api/query/ApiQueryImageInfoTest.php
index bc2f4757d320..56d07f711b46 100644
--- a/tests/phpunit/includes/api/query/ApiQueryImageInfoTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryImageInfoTest.php
@@ -2,8 +2,8 @@
 
 namespace MediaWiki\Tests\Api\Query;
 
-use ApiQueryImageInfo;
 use File;
+use MediaWiki\Api\ApiQueryImageInfo;
 use MediaWiki\Request\FauxRequest;
 use MediaWiki\Tests\Api\ApiTestCase;
 use MediaWiki\Tests\Unit\Permissions\MockAuthorityTrait;
@@ -13,7 +13,7 @@ use MediaWiki\User\UserIdentityValue;
 use MediaWiki\Utils\MWTimestamp;
 
 /**
- * @covers \ApiQueryImageInfo
+ * @covers \MediaWiki\Api\ApiQueryImageInfo
  * @group API
  * @group medium
  * @group Database
diff --git a/tests/phpunit/includes/api/query/ApiQueryInfoTest.php b/tests/phpunit/includes/api/query/ApiQueryInfoTest.php
index 080202581a50..a23952c0ce0c 100644
--- a/tests/phpunit/includes/api/query/ApiQueryInfoTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryInfoTest.php
@@ -16,7 +16,7 @@ use Wikimedia\Timestamp\ConvertibleTimestamp;
  * @group medium
  * @group Database
  *
- * @covers \ApiQueryInfo
+ * @covers MediaWiki\Api\ApiQueryInfo
  */
 class ApiQueryInfoTest extends ApiTestCase {
 	use TempUserTestTrait;
diff --git a/tests/phpunit/includes/api/query/ApiQueryLanguageinfoTest.php b/tests/phpunit/includes/api/query/ApiQueryLanguageinfoTest.php
index d14a52b5068a..bb21476acd19 100644
--- a/tests/phpunit/includes/api/query/ApiQueryLanguageinfoTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryLanguageinfoTest.php
@@ -9,7 +9,7 @@ use Wikimedia\Timestamp\ConvertibleTimestamp;
  * @group API
  * @group medium
  *
- * @covers \ApiQueryLanguageinfo
+ * @covers MediaWiki\Api\ApiQueryLanguageinfo
  */
 class ApiQueryLanguageinfoTest extends ApiTestCase {
 
diff --git a/tests/phpunit/includes/api/query/ApiQueryLogEventsTest.php b/tests/phpunit/includes/api/query/ApiQueryLogEventsTest.php
index 75f32fddef64..4b6b2fa705a0 100644
--- a/tests/phpunit/includes/api/query/ApiQueryLogEventsTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryLogEventsTest.php
@@ -8,7 +8,7 @@ use MediaWiki\Tests\User\TempUser\TempUserTestTrait;
 use MediaWiki\User\UserIdentityValue;
 
 /**
- * @covers \ApiQueryLogEvents
+ * @covers MediaWiki\Api\ApiQueryLogEvents
  * @group API
  * @group Database
  * @group medium
diff --git a/tests/phpunit/includes/api/query/ApiQueryPrefixSearchTest.php b/tests/phpunit/includes/api/query/ApiQueryPrefixSearchTest.php
index 39cf8d7199f5..5cdf5afea78d 100644
--- a/tests/phpunit/includes/api/query/ApiQueryPrefixSearchTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryPrefixSearchTest.php
@@ -11,7 +11,7 @@ use MockCompletionSearchEngine;
  * @group medium
  * @group Database
  *
- * @covers \ApiQueryPrefixSearch
+ * @covers MediaWiki\Api\ApiQueryPrefixSearch
  */
 class ApiQueryPrefixSearchTest extends ApiTestCase {
 	private const TEST_QUERY = 'unittest';
diff --git a/tests/phpunit/includes/api/query/ApiQueryRecentChangesIntegrationTest.php b/tests/phpunit/includes/api/query/ApiQueryRecentChangesIntegrationTest.php
index 9c0db2244a8e..8d607be1cab7 100644
--- a/tests/phpunit/includes/api/query/ApiQueryRecentChangesIntegrationTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryRecentChangesIntegrationTest.php
@@ -17,7 +17,7 @@ use RecentChange;
  * @group Database
  * @group medium
  *
- * @covers \ApiQueryRecentChanges
+ * @covers MediaWiki\Api\ApiQueryRecentChanges
  */
 class ApiQueryRecentChangesIntegrationTest extends ApiTestCase {
 	use MockAuthorityTrait;
diff --git a/tests/phpunit/includes/api/query/ApiQueryRevisionsTest.php b/tests/phpunit/includes/api/query/ApiQueryRevisionsTest.php
index 33ca56d36028..b201cebde6c9 100644
--- a/tests/phpunit/includes/api/query/ApiQueryRevisionsTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryRevisionsTest.php
@@ -14,7 +14,7 @@ use MediaWiki\User\UserIdentityValue;
  * @group API
  * @group Database
  * @group medium
- * @covers \ApiQueryRevisions
+ * @covers MediaWiki\Api\ApiQueryRevisions
  */
 class ApiQueryRevisionsTest extends ApiTestCase {
 	use TempUserTestTrait;
diff --git a/tests/phpunit/includes/api/query/ApiQuerySearchTest.php b/tests/phpunit/includes/api/query/ApiQuerySearchTest.php
index fbc9406add01..5930297ca29b 100644
--- a/tests/phpunit/includes/api/query/ApiQuerySearchTest.php
+++ b/tests/phpunit/includes/api/query/ApiQuerySearchTest.php
@@ -13,7 +13,7 @@ use MockSearchResultSet;
 
 /**
  * @group medium
- * @covers \ApiQuerySearch
+ * @covers MediaWiki\Api\ApiQuerySearch
  */
 class ApiQuerySearchTest extends ApiTestCase {
 
diff --git a/tests/phpunit/includes/api/query/ApiQuerySiteinfoTest.php b/tests/phpunit/includes/api/query/ApiQuerySiteinfoTest.php
index f2334c36d257..7b279309316c 100644
--- a/tests/phpunit/includes/api/query/ApiQuerySiteinfoTest.php
+++ b/tests/phpunit/includes/api/query/ApiQuerySiteinfoTest.php
@@ -22,7 +22,7 @@ use Wikimedia\TestingAccessWrapper;
  * @group medium
  * @group Database
  *
- * @covers \ApiQuerySiteinfo
+ * @covers MediaWiki\Api\ApiQuerySiteinfo
  */
 class ApiQuerySiteinfoTest extends ApiTestCase {
 	use TempUserTestTrait;
diff --git a/tests/phpunit/includes/api/query/ApiQueryTest.php b/tests/phpunit/includes/api/query/ApiQueryTest.php
index 03198370412a..a0f7e392636c 100644
--- a/tests/phpunit/includes/api/query/ApiQueryTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryTest.php
@@ -2,10 +2,10 @@
 
 namespace MediaWiki\Tests\Api\Query;
 
-use ApiMain;
-use ApiModuleManager;
-use ApiQuery;
-use ApiUsageException;
+use MediaWiki\Api\ApiMain;
+use MediaWiki\Api\ApiModuleManager;
+use MediaWiki\Api\ApiQuery;
+use MediaWiki\Api\ApiUsageException;
 use MediaWiki\MainConfigNames;
 use MediaWiki\Request\FauxRequest;
 use MediaWiki\Tests\Api\ApiTestCase;
@@ -18,7 +18,7 @@ use Wikimedia\TestingAccessWrapper;
  * @group API
  * @group Database
  * @group medium
- * @covers \ApiQuery
+ * @covers \MediaWiki\Api\ApiQuery
  */
 class ApiQueryTest extends ApiTestCase {
 	use DummyServicesTrait;
diff --git a/tests/phpunit/includes/api/query/ApiQueryTokensTest.php b/tests/phpunit/includes/api/query/ApiQueryTokensTest.php
index 9a21ee31736a..eb06ce72d2cb 100644
--- a/tests/phpunit/includes/api/query/ApiQueryTokensTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryTokensTest.php
@@ -9,7 +9,7 @@ use MediaWiki\Tests\Api\ApiTestCase;
 /**
  * @group API
  * @group medium
- * @covers \ApiQueryTokens
+ * @covers MediaWiki\Api\ApiQueryTokens
  */
 class ApiQueryTokensTest extends ApiTestCase {
 
diff --git a/tests/phpunit/includes/api/query/ApiQueryUserContribsTest.php b/tests/phpunit/includes/api/query/ApiQueryUserContribsTest.php
index 7c0fa1584531..0bb573a31c96 100644
--- a/tests/phpunit/includes/api/query/ApiQueryUserContribsTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryUserContribsTest.php
@@ -13,7 +13,7 @@ use MediaWiki\User\UserRigorOptions;
  * @group API
  * @group Database
  * @group medium
- * @covers \ApiQueryUserContribs
+ * @covers MediaWiki\Api\ApiQueryUserContribs
  */
 class ApiQueryUserContribsTest extends ApiTestCase {
 
diff --git a/tests/phpunit/includes/api/query/ApiQueryUserInfoTest.php b/tests/phpunit/includes/api/query/ApiQueryUserInfoTest.php
index 99b5f90a24eb..6cba4c08edd9 100644
--- a/tests/phpunit/includes/api/query/ApiQueryUserInfoTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryUserInfoTest.php
@@ -12,7 +12,7 @@ use MediaWiki\Utils\MWTimestamp;
  * @group API
  * @group Database
  * @group medium
- * @covers \ApiQueryUserInfo
+ * @covers MediaWiki\Api\ApiQueryUserInfo
  */
 class ApiQueryUserInfoTest extends ApiTestCase {
 
@@ -20,7 +20,7 @@ class ApiQueryUserInfoTest extends ApiTestCase {
 	use MockAuthorityTrait;
 
 	/**
-	 * @covers \ApiQueryUserInfo::getLatestContributionTime
+	 * @covers MediaWiki\Api\ApiQueryUserInfo::getLatestContributionTime
 	 */
 	public function testTimestamp() {
 		$clock = MWTimestamp::convert( TS_UNIX, '20100101000000' );
diff --git a/tests/phpunit/includes/api/query/ApiQueryWatchlistIntegrationTest.php b/tests/phpunit/includes/api/query/ApiQueryWatchlistIntegrationTest.php
index 7c800628f263..75ea393bc97b 100644
--- a/tests/phpunit/includes/api/query/ApiQueryWatchlistIntegrationTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryWatchlistIntegrationTest.php
@@ -19,7 +19,7 @@ use RecentChange;
  * @group API
  * @group Database
  *
- * @covers \ApiQueryWatchlist
+ * @covers MediaWiki\Api\ApiQueryWatchlist
  * @covers \MediaWiki\Watchlist\WatchedItemQueryService
  */
 class ApiQueryWatchlistIntegrationTest extends ApiTestCase {
diff --git a/tests/phpunit/includes/api/query/ApiQueryWatchlistRawIntegrationTest.php b/tests/phpunit/includes/api/query/ApiQueryWatchlistRawIntegrationTest.php
index dccf17026ab8..201604d70285 100644
--- a/tests/phpunit/includes/api/query/ApiQueryWatchlistRawIntegrationTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryWatchlistRawIntegrationTest.php
@@ -12,7 +12,7 @@ use MediaWiki\Watchlist\WatchedItemQueryService;
  * @group Database
  * @group medium
  *
- * @covers \ApiQueryWatchlistRaw
+ * @covers MediaWiki\Api\ApiQueryWatchlistRaw
  */
 class ApiQueryWatchlistRawIntegrationTest extends ApiTestCase {
 	// TODO: This test should use Authority, but can't due to User::saveSettings