diff --git a/includes/DataScript.php b/includes/DataScript.php
index d9635f16..d4541658 100644
--- a/includes/DataScript.php
+++ b/includes/DataScript.php
@@ -22,8 +22,8 @@
 
 namespace MediaWiki\Extension\CodeMirror;
 
-use ExtensionRegistry;
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Registration\ExtensionRegistry;
 use MediaWiki\ResourceLoader as RL;
 use MediaWiki\ResourceLoader\ResourceLoader;
 
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 88c959e9..70f97034 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -2,7 +2,6 @@
 
 namespace MediaWiki\Extension\CodeMirror;
 
-use ExtensionRegistry;
 use InvalidArgumentException;
 use MediaWiki\Config\Config;
 use MediaWiki\EditPage\EditPage;
@@ -11,6 +10,7 @@ use MediaWiki\Hook\EditPage__showEditForm_initialHook;
 use MediaWiki\Hook\EditPage__showReadOnlyForm_initialHook;
 use MediaWiki\Output\OutputPage;
 use MediaWiki\Preferences\Hook\GetPreferencesHook;
+use MediaWiki\Registration\ExtensionRegistry;
 use MediaWiki\ResourceLoader\Hook\ResourceLoaderGetConfigVarsHook;
 use MediaWiki\User\Options\UserOptionsLookup;
 use MediaWiki\User\User;
diff --git a/tests/phpunit/HookTest.php b/tests/phpunit/HookTest.php
index a434297c..db82363e 100644
--- a/tests/phpunit/HookTest.php
+++ b/tests/phpunit/HookTest.php
@@ -2,15 +2,15 @@
 
 namespace MediaWiki\Extension\CodeMirror\Tests;
 
-use ExtensionRegistry;
 use Generator;
-use Language;
 use MediaWiki\Context\RequestContext;
 use MediaWiki\EditPage\EditPage;
 use MediaWiki\Extension\CodeMirror\Hooks;
 use MediaWiki\Extension\Gadgets\Gadget;
 use MediaWiki\Extension\Gadgets\GadgetRepo;
+use MediaWiki\Language\Language;
 use MediaWiki\Output\OutputPage;
+use MediaWiki\Registration\ExtensionRegistry;
 use MediaWiki\Request\WebRequest;
 use MediaWiki\Title\Title;
 use MediaWiki\User\Options\UserOptionsLookup;