diff --git a/maintenance/importEntities.php b/maintenance/importEntities.php
index b294662..e7013bf 100644
--- a/maintenance/importEntities.php
+++ b/maintenance/importEntities.php
@@ -13,6 +13,7 @@
 use Wikibase\Import\QueryRunner;
 use Wikibase\Import\PropertyIdLister;
 use Wikibase\Repo\WikibaseRepo;
+use MediaWiki\MediaWikiServices;
 
 $IP = getenv( 'MW_INSTALL_PATH' );
 if ( $IP === false ) {
@@ -109,7 +110,7 @@ private function newEntityIdListBuilderFactory() {
 		);
 
 		return new EntityIdListBuilderFactory(
-			WikibaseRepo::getDefaultInstance()->getEntityIdParser(),
+			WikibaseRepo::getEntityIdParser(),
 			new PropertyIdLister(),
 			$queryRunner,
 			$this->getConfig()->get( 'WBImportSourceApi' )
@@ -118,8 +119,8 @@ private function newEntityIdListBuilderFactory() {
 
 	private function newEntityImporter() {
 		$entityImporterFactory = new EntityImporterFactory(
-			WikibaseRepo::getDefaultInstance()->getStore()->getEntityStore(),
-			wfGetLB(),
+			WikibaseRepo::getEntityStore(),
+			MediaWikiServices::getInstance()->getDBLoadBalancer(),
 			$this->logger,
 			$this->getConfig()->get( 'WBImportSourceApi' )
 		);
diff --git a/src/EntityImporterFactory.php b/src/EntityImporterFactory.php
index 18b06c6..fcf9a63 100644
--- a/src/EntityImporterFactory.php
+++ b/src/EntityImporterFactory.php
@@ -5,8 +5,8 @@
 use DataValues\Serializers\DataValueSerializer;
 use LoadBalancer;
 use Psr\Log\LoggerInterface;
-use Wikibase\DataModel\DeserializerFactory;
-use Wikibase\DataModel\SerializerFactory;
+use Wikibase\DataModel\Serializers\DeserializerFactory;
+use Wikibase\DataModel\Serializers\SerializerFactory;
 use Wikibase\Lib\Store\EntityStore;
 use Wikibase\Import\Store\DBImportedEntityMappingStore;
 use Wikibase\Import\Store\ImportedEntityMappingStore;
@@ -103,11 +103,9 @@ private function newStatementsImporter() {
 
 	private function getImportedEntityMappingStore() {
 		if ( $this->importedEntityMappingStore === null ) {
-			$wikibaseRepo = WikibaseRepo::getDefaultInstance();
-
 			$this->importedEntityMappingStore = new DBImportedEntityMappingStore(
 				$this->loadBalancer,
-				$wikibaseRepo->getEntityIdParser()
+				WikibaseRepo::getEntityIdParser()
 			);
 		}
 
@@ -115,9 +113,7 @@ private function getImportedEntityMappingStore() {
 	}
 
 	private function newEntityDeserializer() {
-		$wikibaseRepo = WikibaseRepo::getDefaultInstance();
-
-		$deserializerFactory = $wikibaseRepo->getBaseDataModelDeserializerFactory();
+		$deserializerFactory = WikibaseRepo::getBaseDataModelDeserializerFactory();
 
 		return $deserializerFactory->newEntityDeserializer();
 	}
diff --git a/tests/integration/ApiEntityLookupIntegrationTest.php b/tests/integration/ApiEntityLookupIntegrationTest.php
index 42914e9..1bcb772 100644
--- a/tests/integration/ApiEntityLookupIntegrationTest.php
+++ b/tests/integration/ApiEntityLookupIntegrationTest.php
@@ -8,6 +8,7 @@
 use Wikibase\DataModel\Entity\PropertyId;
 use Wikibase\Import\EntityImporterFactory;
 use Wikibase\Repo\WikibaseRepo;
+use MediaWiki\MediaWikiServices;
 
 /**
  * @group WikibaseImport
@@ -35,8 +36,8 @@ public function testGetEntity() {
 
 	private function getApiEntityLookup() {
 		$entityImporterFactory = new EntityImporterFactory(
-			WikibaseRepo::getDefaultInstance()->getStore()->getEntityStore(),
-			wfGetLB(),
+			WikibaseRepo::getEntityStore(),
+			MediaWikiServices::getInstance()->getDBLoadBalancer(),
 			$this->newLogger(),
 			'https://www.wikidata.org/w/api.php'
 		);
diff --git a/tests/integration/EntityImporterFactoryTest.php b/tests/integration/EntityImporterFactoryTest.php
index 0878fc6..7074f25 100644
--- a/tests/integration/EntityImporterFactoryTest.php
+++ b/tests/integration/EntityImporterFactoryTest.php
@@ -7,6 +7,7 @@
 use Wikibase\Import\EntityImporter;
 use Wikibase\Import\EntityImporterFactory;
 use Wikibase\Repo\WikibaseRepo;
+use MediaWiki\MediaWikiServices;
 
 /**
  * @group WikibaseImport
@@ -31,8 +32,8 @@ public function testGetApiEntityLookup() {
 
 	private function newEntityImporterFactory() {
 		return new EntityImporterFactory(
-			WikibaseRepo::getDefaultInstance()->getStore()->getEntityStore(),
-			wfGetLB(),
+			WikibaseRepo::getEntityStore(),
+			MediaWikiServices::getInstance()->getDBLoadBalancer(),
 			$this->newLogger(),
 			'https://www.wikidata.org/w/api.php'
 		);
diff --git a/tests/integration/Store/DBImportedEntityMappingStoreTest.php b/tests/integration/Store/DBImportedEntityMappingStoreTest.php
index 77daf21..31c14ca 100644
--- a/tests/integration/Store/DBImportedEntityMappingStoreTest.php
+++ b/tests/integration/Store/DBImportedEntityMappingStoreTest.php
@@ -6,6 +6,7 @@
 use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\DataModel\Entity\PropertyId;
 use Wikibase\Import\Store\DBImportedEntityMappingStore;
+use MediaWiki\MediaWikiServices;
 
 /**
  * @group WikibaseImport
@@ -45,7 +46,7 @@ public function testGetOriginalId() {
 
 	private function newDBImportedEntityMappingStore() {
 		return new DBImportedEntityMappingStore(
-			wfGetLB(),
+			MediaWikiServices::getInstance()->getDBLoadBalancer(),
 			new BasicEntityIdParser()
 		);
 	}