diff --git a/tests/common/TestsAutoLoader.php b/tests/common/TestsAutoLoader.php
index 3e1c1790d4e..ce9d64ade84 100644
--- a/tests/common/TestsAutoLoader.php
+++ b/tests/common/TestsAutoLoader.php
@@ -174,8 +174,9 @@ $wgAutoloadClasses += [
 	'MediaWiki\\Tests\\Session\\TestUtils' => "$testDir/phpunit/includes/session/TestUtils.php",
 
 	# tests/phpunit/includes/site
-	'SiteTest' => "$testDir/phpunit/includes/site/SiteTest.php",
 	'TestSites' => "$testDir/phpunit/includes/site/TestSites.php",
+	'MediaWiki\\Tests\\Site\\SiteTest' => "$testDir/phpunit/includes/site/SiteTest.php",
+	'MediaWiki\\Tests\\Site\\TestSites' => "$testDir/phpunit/includes/site/TestSites.php",
 
 	# tests/phpunit/includes/specialpage
 	'SpecialPageTestHelper' => "$testDir/phpunit/includes/specialpage/SpecialPageTestHelper.php",
diff --git a/tests/phpunit/includes/site/CachingSiteStoreTest.php b/tests/phpunit/includes/site/CachingSiteStoreTest.php
index 1259950cfa2..36df5eaea60 100644
--- a/tests/phpunit/includes/site/CachingSiteStoreTest.php
+++ b/tests/phpunit/includes/site/CachingSiteStoreTest.php
@@ -1,11 +1,15 @@
 <?php
 
+namespace MediaWiki\Tests\Site;
+
 use MediaWiki\Site\CachingSiteStore;
 use MediaWiki\Site\HashSiteStore;
 use MediaWiki\Site\MediaWikiSite;
 use MediaWiki\Site\Site;
 use MediaWiki\Site\SiteList;
 use MediaWiki\Site\SiteStore;
+use MediaWikiIntegrationTestCase;
+use ObjectCache;
 
 /**
  * @covers \MediaWiki\Site\CachingSiteStore
@@ -13,7 +17,7 @@ use MediaWiki\Site\SiteStore;
  * @group Database
  * @author Jeroen De Dauw < jeroendedauw@gmail.com >
  */
-class CachingSiteStoreTest extends \MediaWikiIntegrationTestCase {
+class CachingSiteStoreTest extends MediaWikiIntegrationTestCase {
 
 	public function testGetSites() {
 		$testSites = TestSites::getSites();
diff --git a/tests/phpunit/includes/site/DBSiteStoreTest.php b/tests/phpunit/includes/site/DBSiteStoreTest.php
index 315bfbda1b3..6403321f3f0 100644
--- a/tests/phpunit/includes/site/DBSiteStoreTest.php
+++ b/tests/phpunit/includes/site/DBSiteStoreTest.php
@@ -1,9 +1,12 @@
 <?php
 
+namespace MediaWiki\Tests\Site;
+
 use MediaWiki\Site\DBSiteStore;
 use MediaWiki\Site\MediaWikiSite;
 use MediaWiki\Site\Site;
 use MediaWiki\Site\SiteList;
+use MediaWikiIntegrationTestCase;
 
 /**
  * This program is free software; you can redistribute it and/or modify
diff --git a/tests/phpunit/includes/site/HashSiteStoreTest.php b/tests/phpunit/includes/site/HashSiteStoreTest.php
index 4bf7f44cc04..c69ecfcc0c5 100644
--- a/tests/phpunit/includes/site/HashSiteStoreTest.php
+++ b/tests/phpunit/includes/site/HashSiteStoreTest.php
@@ -1,9 +1,12 @@
 <?php
 
+namespace MediaWiki\Tests\Site;
+
 use MediaWiki\Site\HashSiteStore;
 use MediaWiki\Site\MediaWikiSite;
 use MediaWiki\Site\Site;
 use MediaWiki\Site\SiteList;
+use MediaWikiIntegrationTestCase;
 
 /**
  * This program is free software; you can redistribute it and/or modify
@@ -29,7 +32,7 @@ use MediaWiki\Site\SiteList;
  *
  * @author Katie Filbert < aude.wiki@gmail.com >
  */
-class HashSiteStoreTest extends \MediaWikiIntegrationTestCase {
+class HashSiteStoreTest extends MediaWikiIntegrationTestCase {
 
 	/**
 	 * @covers \MediaWiki\Site\HashSiteStore::getSites
diff --git a/tests/phpunit/includes/site/MediaWikiSiteTest.php b/tests/phpunit/includes/site/MediaWikiSiteTest.php
index a4405cde62d..b32d239fe6b 100644
--- a/tests/phpunit/includes/site/MediaWikiSiteTest.php
+++ b/tests/phpunit/includes/site/MediaWikiSiteTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace MediaWiki\Tests\Site;
+
 use MediaWiki\MainConfigNames;
 use MediaWiki\Site\MediaWikiSite;
 
diff --git a/tests/phpunit/includes/site/SiteExporterTest.php b/tests/phpunit/includes/site/SiteExporterTest.php
index fc9d2fe5254..aa282bc49c1 100644
--- a/tests/phpunit/includes/site/SiteExporterTest.php
+++ b/tests/phpunit/includes/site/SiteExporterTest.php
@@ -1,11 +1,16 @@
 <?php
 
+namespace MediaWiki\Tests\Site;
+
+use DOMDocument;
+use InvalidArgumentException;
 use MediaWiki\Site\MediaWikiSite;
 use MediaWiki\Site\Site;
 use MediaWiki\Site\SiteExporter;
 use MediaWiki\Site\SiteImporter;
 use MediaWiki\Site\SiteList;
 use MediaWiki\Site\SiteStore;
+use MediaWikiIntegrationTestCase;
 
 /**
  * This program is free software; you can redistribute it and/or modify
diff --git a/tests/phpunit/includes/site/SiteImporterTest.php b/tests/phpunit/includes/site/SiteImporterTest.php
index 8aae1cf7e28..b04660c7b8a 100644
--- a/tests/phpunit/includes/site/SiteImporterTest.php
+++ b/tests/phpunit/includes/site/SiteImporterTest.php
@@ -1,10 +1,15 @@
 <?php
 
+namespace MediaWiki\Tests\Site;
+
+use Exception;
 use MediaWiki\Site\MediaWikiSite;
 use MediaWiki\Site\Site;
 use MediaWiki\Site\SiteImporter;
 use MediaWiki\Site\SiteList;
 use MediaWiki\Site\SiteStore;
+use MediaWikiIntegrationTestCase;
+use Psr\Log\LoggerInterface;
 
 /**
  * This program is free software; you can redistribute it and/or modify
@@ -47,7 +52,7 @@ class SiteImporterTest extends MediaWikiIntegrationTestCase {
 		$store->method( 'getSites' )
 			->willReturn( new SiteList() );
 
-		$errorHandler = $this->createMock( Psr\Log\LoggerInterface::class );
+		$errorHandler = $this->createMock( LoggerInterface::class );
 		$errorHandler->expects( $this->exactly( $errorCount ) )
 			->method( 'error' );
 
diff --git a/tests/phpunit/includes/site/SiteListTest.php b/tests/phpunit/includes/site/SiteListTest.php
index fccc6888d8d..2046f56c9dc 100644
--- a/tests/phpunit/includes/site/SiteListTest.php
+++ b/tests/phpunit/includes/site/SiteListTest.php
@@ -18,8 +18,11 @@
  * @file
  */
 
+namespace MediaWiki\Tests\Site;
+
 use MediaWiki\Site\Site;
 use MediaWiki\Site\SiteList;
+use MediaWikiIntegrationTestCase;
 
 /**
  * @covers \MediaWiki\Site\SiteList
diff --git a/tests/phpunit/includes/site/SiteTest.php b/tests/phpunit/includes/site/SiteTest.php
index 2d90955550f..b719dc6c259 100644
--- a/tests/phpunit/includes/site/SiteTest.php
+++ b/tests/phpunit/includes/site/SiteTest.php
@@ -1,6 +1,9 @@
 <?php
 
+namespace MediaWiki\Tests\Site;
+
 use MediaWiki\Site\Site;
+use MediaWikiIntegrationTestCase;
 
 /**
  * This program is free software; you can redistribute it and/or modify
diff --git a/tests/phpunit/includes/site/TestSites.php b/tests/phpunit/includes/site/TestSites.php
index 18e25531689..88746a31cdd 100644
--- a/tests/phpunit/includes/site/TestSites.php
+++ b/tests/phpunit/includes/site/TestSites.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace MediaWiki\Tests\Site;
+
+use MediaWiki\MediaWikiServices;
 use MediaWiki\Site\MediaWikiSite;
 use MediaWiki\Site\Site;
 
@@ -108,8 +111,10 @@ class TestSites {
 	 * @since 0.1
 	 */
 	public static function insertIntoDb() {
-		$sitesTable = \MediaWiki\MediaWikiServices::getInstance()->getSiteStore();
+		$sitesTable = MediaWikiServices::getInstance()->getSiteStore();
 		$sitesTable->clear();
 		$sitesTable->saveSites( self::getSites() );
 	}
 }
+
+class_alias( TestSites::class, 'TestSites' );
diff --git a/tests/phpunit/unit/includes/site/MediaWikiPageNameNormalizerTest.php b/tests/phpunit/unit/includes/site/MediaWikiPageNameNormalizerTest.php
index 251df2b38fe..3d145201e85 100644
--- a/tests/phpunit/unit/includes/site/MediaWikiPageNameNormalizerTest.php
+++ b/tests/phpunit/unit/includes/site/MediaWikiPageNameNormalizerTest.php
@@ -1,7 +1,10 @@
 <?php
 
+namespace MediaWiki\Tests\Site;
+
 use MediaWiki\Http\HttpRequestFactory;
 use MediaWiki\Site\MediaWikiPageNameNormalizer;
+use MediaWikiUnitTestCase;
 
 /**
  * @covers \MediaWiki\Site\MediaWikiPageNameNormalizer