diff --git a/maintenance/importEntities.php b/maintenance/importEntities.php
index b294662..592e158 100644
--- a/maintenance/importEntities.php
+++ b/maintenance/importEntities.php
@@ -118,7 +118,7 @@ private function newEntityIdListBuilderFactory() {
 
 	private function newEntityImporter() {
 		$entityImporterFactory = new EntityImporterFactory(
-			WikibaseRepo::getDefaultInstance()->getStore()->getEntityStore(),
+			WikibaseRepo::getEntityStore(),
 			wfGetLB(),
 			$this->logger,
 			$this->getConfig()->get( 'WBImportSourceApi' )
diff --git a/tests/integration/ApiEntityLookupIntegrationTest.php b/tests/integration/ApiEntityLookupIntegrationTest.php
index 42914e9..db9c657 100644
--- a/tests/integration/ApiEntityLookupIntegrationTest.php
+++ b/tests/integration/ApiEntityLookupIntegrationTest.php
@@ -35,7 +35,7 @@ public function testGetEntity() {
 
 	private function getApiEntityLookup() {
 		$entityImporterFactory = new EntityImporterFactory(
-			WikibaseRepo::getDefaultInstance()->getStore()->getEntityStore(),
+			WikibaseRepo::getEntityStore(),
 			wfGetLB(),
 			$this->newLogger(),
 			'https://www.wikidata.org/w/api.php'
diff --git a/tests/integration/EntityImporterFactoryTest.php b/tests/integration/EntityImporterFactoryTest.php
index 0878fc6..b40a3ba 100644
--- a/tests/integration/EntityImporterFactoryTest.php
+++ b/tests/integration/EntityImporterFactoryTest.php
@@ -31,7 +31,7 @@ public function testGetApiEntityLookup() {
 
 	private function newEntityImporterFactory() {
 		return new EntityImporterFactory(
-			WikibaseRepo::getDefaultInstance()->getStore()->getEntityStore(),
+			WikibaseRepo::getEntityStore(),
 			wfGetLB(),
 			$this->newLogger(),
 			'https://www.wikidata.org/w/api.php'