diff --git a/extension.json b/extension.json
index 0e6845e2d..232d4f3f8 100644
--- a/extension.json
+++ b/extension.json
@@ -1153,8 +1153,8 @@
 		"MediaWiki\\Extension\\Notifications\\": "includes/"
 	},
 	"TestAutoloadClasses": {
-		"EchoAbstractMapperStub": "tests/phpunit/Mapper/EchoAbstractMapperStub.php",
-		"EchoExecuteFirstArgumentStub": "tests/phpunit/Mapper/EchoExecuteFirstArgumentStub.php"
+		"MediaWiki\\Extension\\Notifications\\Test\\EchoAbstractMapperStub": "tests/phpunit/Mapper/EchoAbstractMapperStub.php",
+		"MediaWiki\\Extension\\Notifications\\Test\\Integration\\Mapper\\EchoExecuteFirstArgumentStub": "tests/phpunit/Mapper/EchoExecuteFirstArgumentStub.php"
 	},
 	"TestAutoloadNamespaces": {
 		"MediaWiki\\Extension\\Notifications\\Test\\": "tests/phpunit/",
diff --git a/tests/phpunit/Api/ApiEchoMarkReadTest.php b/tests/phpunit/Api/ApiEchoMarkReadTest.php
index efc20afe5..1e4e325da 100644
--- a/tests/phpunit/Api/ApiEchoMarkReadTest.php
+++ b/tests/phpunit/Api/ApiEchoMarkReadTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace MediaWiki\Extension\Notifications\Test\API;
+
 use MediaWiki\Tests\Api\ApiTestCase;
 
 /**
diff --git a/tests/phpunit/Api/ApiEchoNotificationsTest.php b/tests/phpunit/Api/ApiEchoNotificationsTest.php
index be55aa14f..6a1a0ecdf 100644
--- a/tests/phpunit/Api/ApiEchoNotificationsTest.php
+++ b/tests/phpunit/Api/ApiEchoNotificationsTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace MediaWiki\Extension\Notifications\Test\API;
+
 use MediaWiki\Tests\Api\ApiTestCase;
 
 /**
diff --git a/tests/phpunit/Api/Push/ApiEchoPushSubscriptionsCreateTest.php b/tests/phpunit/Api/Push/ApiEchoPushSubscriptionsCreateTest.php
index 905a02398..ba89ffe4d 100644
--- a/tests/phpunit/Api/Push/ApiEchoPushSubscriptionsCreateTest.php
+++ b/tests/phpunit/Api/Push/ApiEchoPushSubscriptionsCreateTest.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace MediaWiki\Extension\Notifications\Test\API;
+
+use MediaWiki\Api\ApiUsageException;
 use MediaWiki\Extension\Notifications\Push\Utils;
 use MediaWiki\Extension\Notifications\Services;
 use MediaWiki\Tests\Api\ApiTestCase;
diff --git a/tests/phpunit/Api/Push/ApiEchoPushSubscriptionsDeleteTest.php b/tests/phpunit/Api/Push/ApiEchoPushSubscriptionsDeleteTest.php
index 55b6aa943..d06b8d773 100644
--- a/tests/phpunit/Api/Push/ApiEchoPushSubscriptionsDeleteTest.php
+++ b/tests/phpunit/Api/Push/ApiEchoPushSubscriptionsDeleteTest.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace MediaWiki\Extension\Notifications\Test\API;
+
+use MediaWiki\Api\ApiUsageException;
 use MediaWiki\Extension\Notifications\Push\Utils;
 use MediaWiki\Extension\Notifications\Services;
 use MediaWiki\Tests\Api\ApiTestCase;
diff --git a/tests/phpunit/Api/Push/ApiEchoPushSubscriptionsTest.php b/tests/phpunit/Api/Push/ApiEchoPushSubscriptionsTest.php
index fd93b63cf..b43f0bce3 100644
--- a/tests/phpunit/Api/Push/ApiEchoPushSubscriptionsTest.php
+++ b/tests/phpunit/Api/Push/ApiEchoPushSubscriptionsTest.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace MediaWiki\Extension\Notifications\Test\API;
+
+use MediaWiki\Api\ApiUsageException;
 use MediaWiki\Tests\Api\ApiTestCase;
 
 /**
diff --git a/tests/phpunit/Cache/TitleLocalCacheTest.php b/tests/phpunit/Cache/TitleLocalCacheTest.php
index c1dd633f1..45b9a95ef 100644
--- a/tests/phpunit/Cache/TitleLocalCacheTest.php
+++ b/tests/phpunit/Cache/TitleLocalCacheTest.php
@@ -1,7 +1,10 @@
 <?php
 
+namespace MediaWiki\Extension\Notifications\Test\Cache;
+
 use MediaWiki\Extension\Notifications\Cache\TitleLocalCache;
 use MediaWiki\Title\Title;
+use MediaWikiIntegrationTestCase;
 use Wikimedia\TestingAccessWrapper;
 
 /**
diff --git a/tests/phpunit/Controller/NotificationControllerTest.php b/tests/phpunit/Controller/NotificationControllerTest.php
index cafb7bb63..04e732369 100644
--- a/tests/phpunit/Controller/NotificationControllerTest.php
+++ b/tests/phpunit/Controller/NotificationControllerTest.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace MediaWiki\Extension\Notifications\Test\Controller;
+
+use MapCacheLRU;
 use MediaWiki\Extension\Notifications\AttributeManager;
 use MediaWiki\Extension\Notifications\Controller\NotificationController;
 use MediaWiki\Extension\Notifications\Model\Event;
@@ -8,6 +11,7 @@ use MediaWiki\Title\Title;
 use MediaWiki\User\Options\UserOptionsLookup;
 use MediaWiki\User\User;
 use MediaWiki\Utils\MWTimestamp;
+use MediaWikiIntegrationTestCase;
 use Wikimedia\TestingAccessWrapper;
 
 /**
diff --git a/tests/phpunit/DbFactoryTest.php b/tests/phpunit/DbFactoryTest.php
index d1f9334ad..8481218ea 100644
--- a/tests/phpunit/DbFactoryTest.php
+++ b/tests/phpunit/DbFactoryTest.php
@@ -1,6 +1,10 @@
 <?php
 
+namespace MediaWiki\Extension\Notifications\Test;
+
 use MediaWiki\Extension\Notifications\DbFactory;
+use MediaWikiIntegrationTestCase;
+use ReflectionClass;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\ILoadBalancer;
 
diff --git a/tests/phpunit/DiscussionParserTest.php b/tests/phpunit/DiscussionParserTest.php
index 17f5a6064..f0d36d468 100644
--- a/tests/phpunit/DiscussionParserTest.php
+++ b/tests/phpunit/DiscussionParserTest.php
@@ -1,15 +1,21 @@
 <?php
 
+namespace MediaWiki\Extension\Notifications\Test;
+
 // phpcs:disable Generic.Files.LineLength -- Long html test examples
 
 use MediaWiki\CommentStore\CommentStoreComment;
+use MediaWiki\Content\WikitextContent;
 use MediaWiki\Extension\Notifications\DiscussionParser;
 use MediaWiki\Extension\Notifications\Model\Event;
 use MediaWiki\MainConfigNames;
+use MediaWiki\Registration\ExtensionRegistry;
 use MediaWiki\Revision\MutableRevisionRecord;
 use MediaWiki\Revision\SlotRecord;
 use MediaWiki\Title\Title;
 use MediaWiki\User\User;
+use MediaWikiIntegrationTestCase;
+use ReflectionObject;
 use Wikimedia\TestingAccessWrapper;
 
 /**
diff --git a/tests/phpunit/EchoHooksTest.php b/tests/phpunit/EchoHooksTest.php
index c621fd8ab..898e4b9e3 100644
--- a/tests/phpunit/EchoHooksTest.php
+++ b/tests/phpunit/EchoHooksTest.php
@@ -1,8 +1,11 @@
 <?php
 
+namespace MediaWiki\Extension\Notifications\Test;
+
 use MediaWiki\Extension\Notifications\Hooks as EchoHooks;
 use MediaWiki\Extension\Notifications\Services;
 use MediaWiki\MainConfigNames;
+use MediaWikiIntegrationTestCase;
 
 class EchoHooksTest extends MediaWikiIntegrationTestCase {
 	/**
diff --git a/tests/phpunit/Formatters/EchoPresentationModelSectionTest.php b/tests/phpunit/Formatters/EchoPresentationModelSectionTest.php
index e1e8f7cbf..18d9dc383 100644
--- a/tests/phpunit/Formatters/EchoPresentationModelSectionTest.php
+++ b/tests/phpunit/Formatters/EchoPresentationModelSectionTest.php
@@ -1,7 +1,10 @@
 <?php
 
+namespace MediaWiki\Extension\Notifications\Test\Formatters;
+
 use MediaWiki\Extension\Notifications\Formatters\EchoPresentationModelSection;
 use MediaWiki\Extension\Notifications\Model\Event;
+use MediaWikiIntegrationTestCase;
 
 /**
  * @covers \MediaWiki\Extension\Notifications\Formatters\EchoPresentationModelSection
diff --git a/tests/phpunit/Mapper/EchoAbstractMapperStub.php b/tests/phpunit/Mapper/EchoAbstractMapperStub.php
index c71886fa4..d3d023ecf 100644
--- a/tests/phpunit/Mapper/EchoAbstractMapperStub.php
+++ b/tests/phpunit/Mapper/EchoAbstractMapperStub.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace MediaWiki\Extension\Notifications\Test;
+
 use MediaWiki\Extension\Notifications\Mapper\AbstractMapper;
 
 /**
diff --git a/tests/phpunit/Mapper/EchoExecuteFirstArgumentStub.php b/tests/phpunit/Mapper/EchoExecuteFirstArgumentStub.php
index 5281b76fd..b9f46506f 100644
--- a/tests/phpunit/Mapper/EchoExecuteFirstArgumentStub.php
+++ b/tests/phpunit/Mapper/EchoExecuteFirstArgumentStub.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace MediaWiki\Extension\Notifications\Test\Integration\Mapper;
+
 use PHPUnit\Framework\MockObject\Invocation;
 use PHPUnit\Framework\MockObject\Invocation\StaticInvocation;
 use PHPUnit\Framework\MockObject\Stub\Stub;
@@ -7,10 +9,10 @@ use PHPUnit\Framework\MockObject\Stub\Stub;
 class EchoExecuteFirstArgumentStub implements Stub {
 	public function invoke( Invocation $invocation ) {
 		if ( !$invocation instanceof StaticInvocation ) {
-			throw new PHPUnit\Framework\Exception( 'wrong invocation type' );
+			throw new \PHPUnit\Framework\Exception( 'wrong invocation type' );
 		}
 		if ( !$invocation->arguments ) {
-			throw new PHPUnit\Framework\Exception( 'Method call must have an argument' );
+			throw new \PHPUnit\Framework\Exception( 'Method call must have an argument' );
 		}
 
 		return call_user_func( reset( $invocation->arguments ) );
diff --git a/tests/phpunit/Mapper/EventMapperTest.php b/tests/phpunit/Mapper/EventMapperTest.php
index 84c4eca1e..3f86fc1af 100644
--- a/tests/phpunit/Mapper/EventMapperTest.php
+++ b/tests/phpunit/Mapper/EventMapperTest.php
@@ -1,8 +1,12 @@
 <?php
 
+namespace MediaWiki\Extension\Notifications\Test\Integration\Mapper;
+
+use InvalidArgumentException;
 use MediaWiki\Extension\Notifications\DbFactory;
 use MediaWiki\Extension\Notifications\Mapper\EventMapper;
 use MediaWiki\Extension\Notifications\Model\Event;
+use MediaWikiIntegrationTestCase;
 use Wikimedia\Rdbms\FakeResultWrapper;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\InsertQueryBuilder;
diff --git a/tests/phpunit/Mapper/NotificationMapperTest.php b/tests/phpunit/Mapper/NotificationMapperTest.php
index bbcb06d80..51301c4df 100644
--- a/tests/phpunit/Mapper/NotificationMapperTest.php
+++ b/tests/phpunit/Mapper/NotificationMapperTest.php
@@ -1,10 +1,13 @@
 <?php
 
+namespace MediaWiki\Extension\Notifications\Test\Integration\Mapper;
+
 use MediaWiki\Extension\Notifications\DbFactory;
 use MediaWiki\Extension\Notifications\Mapper\NotificationMapper;
 use MediaWiki\Extension\Notifications\Model\Notification;
 use MediaWiki\MainConfigNames;
 use MediaWiki\User\User;
+use MediaWikiIntegrationTestCase;
 use Wikimedia\Rdbms\DeleteQueryBuilder;
 use Wikimedia\Rdbms\FakeResultWrapper;
 use Wikimedia\Rdbms\IDatabase;
diff --git a/tests/phpunit/Model/NotificationTest.php b/tests/phpunit/Model/NotificationTest.php
index aa25d0483..9be653045 100644
--- a/tests/phpunit/Model/NotificationTest.php
+++ b/tests/phpunit/Model/NotificationTest.php
@@ -1,8 +1,12 @@
 <?php
 
+namespace MediaWiki\Extension\Notifications\Test\Integration\Model;
+
+use InvalidArgumentException;
 use MediaWiki\Extension\Notifications\Model\Event;
 use MediaWiki\Extension\Notifications\Model\Notification;
 use MediaWiki\Extension\Notifications\Model\TargetPage;
+use MediaWikiIntegrationTestCase;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\ILoadBalancer;
 use Wikimedia\Rdbms\LBFactory;
diff --git a/tests/phpunit/NotifUserTest.php b/tests/phpunit/NotifUserTest.php
index 604bed9a1..8f040c7f3 100644
--- a/tests/phpunit/NotifUserTest.php
+++ b/tests/phpunit/NotifUserTest.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace MediaWiki\Extension\Notifications\Test;
+
+use Exception;
 use MediaWiki\Extension\Notifications\EmailFormat;
 use MediaWiki\Extension\Notifications\Gateway\UserNotificationGateway;
 use MediaWiki\Extension\Notifications\Mapper\NotificationMapper;
@@ -13,6 +16,8 @@ use MediaWiki\User\TalkPageNotificationManager;
 use MediaWiki\User\User;
 use MediaWiki\User\UserFactory;
 use MediaWiki\User\UserGroupManager;
+use MediaWikiIntegrationTestCase;
+use Wikimedia\ObjectCache\WANObjectCache;
 use Wikimedia\Rdbms\IDatabase;
 
 /**
diff --git a/tests/phpunit/NotificationStructureTest.php b/tests/phpunit/NotificationStructureTest.php
index ec17462ea..c59042689 100644
--- a/tests/phpunit/NotificationStructureTest.php
+++ b/tests/phpunit/NotificationStructureTest.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace MediaWiki\Extension\Notifications\Test;
+
+use MediaWikiIntegrationTestCase;
+
 class NotificationStructureTest extends MediaWikiIntegrationTestCase {
 	/**
 	 * @coversNothing
diff --git a/tests/phpunit/NotificationsTest.php b/tests/phpunit/NotificationsTest.php
index 42350092e..c996f7ae5 100644
--- a/tests/phpunit/NotificationsTest.php
+++ b/tests/phpunit/NotificationsTest.php
@@ -1,11 +1,14 @@
 <?php
 
+namespace MediaWiki\Extension\Notifications\Test;
+
 use MediaWiki\Context\DerivativeContext;
 use MediaWiki\Context\RequestContext;
 use MediaWiki\Extension\Notifications\Mapper\NotificationMapper;
 use MediaWiki\Extension\Notifications\Model\Event;
 use MediaWiki\User\User;
 use MediaWiki\User\UserIdentity;
+use MediaWikiIntegrationTestCase;
 
 /**
  * Tests for the built in notification types
diff --git a/tests/phpunit/SummaryParserTest.php b/tests/phpunit/SummaryParserTest.php
index 5add56cb2..9ad822b21 100644
--- a/tests/phpunit/SummaryParserTest.php
+++ b/tests/phpunit/SummaryParserTest.php
@@ -1,8 +1,11 @@
 <?php
 
+namespace MediaWiki\Extension\Notifications\Test;
+
 use MediaWiki\Extension\Notifications\SummaryParser;
 use MediaWiki\User\User;
 use MediaWiki\User\UserIdentity;
+use MediaWikiIntegrationTestCase;
 
 /**
  * @group Echo
diff --git a/tests/phpunit/TalkPageFunctionalTest.php b/tests/phpunit/TalkPageFunctionalTest.php
index ce1992476..34bc5e5ca 100644
--- a/tests/phpunit/TalkPageFunctionalTest.php
+++ b/tests/phpunit/TalkPageFunctionalTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace MediaWiki\Extension\Notifications\Test;
+
 use MediaWiki\Extension\Notifications\Model\Event;
 use MediaWiki\Tests\Api\ApiTestCase;
 
diff --git a/tests/phpunit/ThankYouEditTest.php b/tests/phpunit/ThankYouEditTest.php
index 842b98988..1789b6407 100644
--- a/tests/phpunit/ThankYouEditTest.php
+++ b/tests/phpunit/ThankYouEditTest.php
@@ -1,8 +1,11 @@
 <?php
 
+namespace MediaWiki\Extension\Notifications\Test;
+
 use MediaWiki\Extension\Notifications\DbFactory;
 use MediaWiki\Extension\Notifications\Mapper\NotificationMapper;
 use MediaWiki\Title\Title;
+use MediaWikiIntegrationTestCase;
 use Wikimedia\Rdbms\Platform\ISQLPlatform;
 
 /**
diff --git a/tests/phpunit/UnreadWikisTest.php b/tests/phpunit/UnreadWikisTest.php
index e635ceb6d..6141d93d1 100644
--- a/tests/phpunit/UnreadWikisTest.php
+++ b/tests/phpunit/UnreadWikisTest.php
@@ -1,8 +1,11 @@
 <?php
 
+namespace MediaWiki\Extension\Notifications\Test;
+
 use MediaWiki\Extension\Notifications\DbFactory;
 use MediaWiki\Extension\Notifications\UnreadWikis;
 use MediaWiki\Utils\MWTimestamp;
+use MediaWikiIntegrationTestCase;
 use Wikimedia\TestingAccessWrapper;
 
 /**
diff --git a/tests/phpunit/integration/Push/NotificationServiceClientTest.php b/tests/phpunit/integration/Push/NotificationServiceClientTest.php
index 44794f6a3..b9b47acfb 100644
--- a/tests/phpunit/integration/Push/NotificationServiceClientTest.php
+++ b/tests/phpunit/integration/Push/NotificationServiceClientTest.php
@@ -1,6 +1,11 @@
 <?php
 
+namespace MediaWiki\Extension\Notifications\Test\Integration\Push;
+
 use MediaWiki\Extension\Notifications\Services;
+use MediaWikiIntegrationTestCase;
+use MockHttpTrait;
+use MWHttpRequest;
 use Wikimedia\TestingAccessWrapper;
 
 /** @covers \MediaWiki\Extension\Notifications\Push\NotificationServiceClient */
diff --git a/tests/phpunit/integration/Push/PushNotifierTest.php b/tests/phpunit/integration/Push/PushNotifierTest.php
index d2feede0d..231299737 100644
--- a/tests/phpunit/integration/Push/PushNotifierTest.php
+++ b/tests/phpunit/integration/Push/PushNotifierTest.php
@@ -1,9 +1,12 @@
 <?php
 
+namespace MediaWiki\Extension\Notifications\Test\Integration\Push;
+
 use MediaWiki\Extension\Notifications\Push\NotificationRequestJob;
 use MediaWiki\Extension\Notifications\Push\PushNotifier;
 use MediaWiki\User\CentralId\CentralIdLookup;
 use MediaWiki\User\User;
+use MediaWikiIntegrationTestCase;
 use Wikimedia\TestingAccessWrapper;
 
 /** @covers \MediaWiki\Extension\Notifications\Push\PushNotifier */
diff --git a/tests/phpunit/integration/Push/SubscriptionManagerTest.php b/tests/phpunit/integration/Push/SubscriptionManagerTest.php
index 0395be6c7..71e8f37ed 100644
--- a/tests/phpunit/integration/Push/SubscriptionManagerTest.php
+++ b/tests/phpunit/integration/Push/SubscriptionManagerTest.php
@@ -1,7 +1,10 @@
 <?php
 
+namespace MediaWiki\Extension\Notifications\Test\Integration\Push;
+
 use MediaWiki\Extension\Notifications\Push\Utils;
 use MediaWiki\Extension\Notifications\Services;
+use MediaWikiIntegrationTestCase;
 use Wikimedia\TestingAccessWrapper;
 
 /**
diff --git a/tests/phpunit/integration/Push/UtilsTest.php b/tests/phpunit/integration/Push/UtilsTest.php
index 3840558c7..757169c53 100644
--- a/tests/phpunit/integration/Push/UtilsTest.php
+++ b/tests/phpunit/integration/Push/UtilsTest.php
@@ -1,6 +1,9 @@
 <?php
 
+namespace MediaWiki\Extension\Notifications\Test\Integration\Push;
+
 use MediaWiki\Extension\Notifications\Push\Utils;
+use MediaWikiIntegrationTestCase;
 
 /**
  * @covers \MediaWiki\Extension\Notifications\Push\Utils
diff --git a/tests/phpunit/maintenance/SuppressionMaintenanceTest.php b/tests/phpunit/maintenance/SuppressionMaintenanceTest.php
index 63b2cae4a..a5508848c 100644
--- a/tests/phpunit/maintenance/SuppressionMaintenanceTest.php
+++ b/tests/phpunit/maintenance/SuppressionMaintenanceTest.php
@@ -1,7 +1,10 @@
 <?php
 
+namespace MediaWiki\Extension\Notifications\Test\Maintenance;
+
 use MediaWiki\Extension\Notifications\SuppressionRowUpdateGenerator;
 use MediaWiki\Title\Title;
+use MediaWikiIntegrationTestCase;
 use PHPUnit\Framework\TestCase;
 
 /**
diff --git a/tests/phpunit/unit/AttributeManagerTest.php b/tests/phpunit/unit/AttributeManagerTest.php
index b19daae35..dcdd5ba0e 100644
--- a/tests/phpunit/unit/AttributeManagerTest.php
+++ b/tests/phpunit/unit/AttributeManagerTest.php
@@ -1,10 +1,13 @@
 <?php
 
+namespace MediaWiki\Extension\Notifications\Test\Unit;
+
 use MediaWiki\Extension\Notifications\AttributeManager;
 use MediaWiki\User\Options\UserOptionsLookup;
 use MediaWiki\User\UserGroupManager;
 use MediaWiki\User\UserIdentity;
 use MediaWiki\User\UserIdentityValue;
+use MediaWikiUnitTestCase;
 
 /**
  * @covers \MediaWiki\Extension\Notifications\AttributeManager
diff --git a/tests/phpunit/unit/BundlerTest.php b/tests/phpunit/unit/BundlerTest.php
index b3c0a810d..aaac261db 100644
--- a/tests/phpunit/unit/BundlerTest.php
+++ b/tests/phpunit/unit/BundlerTest.php
@@ -1,7 +1,10 @@
 <?php
 
+namespace MediaWiki\Extension\Notifications\Test\Unit;
+
 use MediaWiki\Extension\Notifications\Bundler;
 use MediaWiki\Extension\Notifications\Model\Notification;
+use MediaWikiUnitTestCase;
 
 /**
  * @covers \MediaWiki\Extension\Notifications\Bundler
diff --git a/tests/phpunit/unit/DiffParserTest.php b/tests/phpunit/unit/DiffParserTest.php
index 18abaa004..606f36b3c 100644
--- a/tests/phpunit/unit/DiffParserTest.php
+++ b/tests/phpunit/unit/DiffParserTest.php
@@ -1,6 +1,9 @@
 <?php
 
+namespace MediaWiki\Extension\Notifications\Test\Unit;
+
 use MediaWiki\Extension\Notifications\DiscussionParser;
+use MediaWikiUnitTestCase;
 
 /**
  * @covers \MediaWiki\Extension\Notifications\DiffParser
diff --git a/tests/phpunit/unit/Gateway/UserNotificationGatewayTest.php b/tests/phpunit/unit/Gateway/UserNotificationGatewayTest.php
index ea7a675b4..ec7b8ac36 100644
--- a/tests/phpunit/unit/Gateway/UserNotificationGatewayTest.php
+++ b/tests/phpunit/unit/Gateway/UserNotificationGatewayTest.php
@@ -1,9 +1,12 @@
 <?php
 
+namespace MediaWiki\Extension\Notifications\Test\Unit;
+
 use MediaWiki\Config\HashConfig;
 use MediaWiki\Extension\Notifications\DbFactory;
 use MediaWiki\Extension\Notifications\Gateway\UserNotificationGateway;
 use MediaWiki\User\User;
+use MediaWikiUnitTestCase;
 use Wikimedia\Rdbms\FakeResultWrapper;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\SelectQueryBuilder;
diff --git a/tests/phpunit/unit/Iterator/FilteredSequentialIteratorTest.php b/tests/phpunit/unit/Iterator/FilteredSequentialIteratorTest.php
index f6c8a1cab..356f89825 100644
--- a/tests/phpunit/unit/Iterator/FilteredSequentialIteratorTest.php
+++ b/tests/phpunit/unit/Iterator/FilteredSequentialIteratorTest.php
@@ -1,7 +1,11 @@
 <?php
 
+namespace MediaWiki\Extension\Notifications\Test\Unit;
+
+use ArrayIterator;
 use MediaWiki\Extension\Notifications\Iterator\CallbackIterator;
 use MediaWiki\Extension\Notifications\Iterator\FilteredSequentialIterator;
+use MediaWikiUnitTestCase;
 
 /**
  * @covers \MediaWiki\Extension\Notifications\Iterator\CallbackIterator
diff --git a/tests/phpunit/unit/Mapper/AbstractMapperTest.php b/tests/phpunit/unit/Mapper/AbstractMapperTest.php
index 91ee473c7..c0c8636eb 100644
--- a/tests/phpunit/unit/Mapper/AbstractMapperTest.php
+++ b/tests/phpunit/unit/Mapper/AbstractMapperTest.php
@@ -1,6 +1,12 @@
 <?php
 
+namespace MediaWiki\Extension\Notifications\Test\Unit;
+
+use InvalidArgumentException;
 use MediaWiki\Extension\Notifications\Mapper\AbstractMapper;
+use MediaWiki\Extension\Notifications\Test\EchoAbstractMapperStub;
+use MediaWikiUnitTestCase;
+use ReflectionClass;
 
 /**
  * @covers \MediaWiki\Extension\Notifications\Mapper\AbstractMapper
diff --git a/tests/phpunit/unit/Mapper/TargetPageMapperTest.php b/tests/phpunit/unit/Mapper/TargetPageMapperTest.php
index 624f193ea..4c339c547 100644
--- a/tests/phpunit/unit/Mapper/TargetPageMapperTest.php
+++ b/tests/phpunit/unit/Mapper/TargetPageMapperTest.php
@@ -1,8 +1,11 @@
 <?php
 
+namespace MediaWiki\Extension\Notifications\Test\Unit;
+
 use MediaWiki\Extension\Notifications\DbFactory;
 use MediaWiki\Extension\Notifications\Mapper\TargetPageMapper;
 use MediaWiki\Extension\Notifications\Model\TargetPage;
+use MediaWikiUnitTestCase;
 use Wikimedia\Rdbms\FakeResultWrapper;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\InsertQueryBuilder;
diff --git a/tests/phpunit/unit/Model/TargetPageTest.php b/tests/phpunit/unit/Model/TargetPageTest.php
index 5dbebef07..2831ad6c1 100644
--- a/tests/phpunit/unit/Model/TargetPageTest.php
+++ b/tests/phpunit/unit/Model/TargetPageTest.php
@@ -1,8 +1,12 @@
 <?php
 
+namespace MediaWiki\Extension\Notifications\Test\Unit;
+
+use InvalidArgumentException;
 use MediaWiki\Extension\Notifications\Model\Event;
 use MediaWiki\Extension\Notifications\Model\TargetPage;
 use MediaWiki\Title\Title;
+use MediaWikiUnitTestCase;
 
 /**
  * @covers \MediaWiki\Extension\Notifications\Model\TargetPage
diff --git a/tests/phpunit/unit/Push/NotificationServiceClientUnitTest.php b/tests/phpunit/unit/Push/NotificationServiceClientUnitTest.php
index 3af23cba3..8b9a54569 100644
--- a/tests/phpunit/unit/Push/NotificationServiceClientUnitTest.php
+++ b/tests/phpunit/unit/Push/NotificationServiceClientUnitTest.php
@@ -1,7 +1,10 @@
 <?php
 
+namespace MediaWiki\Extension\Notifications\Test\Unit;
+
 use MediaWiki\Extension\Notifications\Push\NotificationServiceClient;
 use MediaWiki\Extension\Notifications\Push\Subscription;
+use MediaWikiUnitTestCase;
 
 /** @covers \MediaWiki\Extension\Notifications\Push\NotificationServiceClient */
 class NotificationServiceClientUnitTest extends MediaWikiUnitTestCase {
diff --git a/tests/phpunit/unit/Push/SubscriptionTest.php b/tests/phpunit/unit/Push/SubscriptionTest.php
index 06b66b759..0cd1a99c0 100644
--- a/tests/phpunit/unit/Push/SubscriptionTest.php
+++ b/tests/phpunit/unit/Push/SubscriptionTest.php
@@ -1,6 +1,9 @@
 <?php
 
+namespace MediaWiki\Extension\Notifications\Test\Unit;
+
 use MediaWiki\Extension\Notifications\Push\Subscription;
+use MediaWikiUnitTestCase;
 use Wikimedia\Timestamp\ConvertibleTimestamp;
 
 /** @covers \MediaWiki\Extension\Notifications\Push\Subscription */