diff --git a/src/Entity/PageManager.php b/src/Entity/PageManager.php
index d6a6f6d58..be6a860c5 100644
--- a/src/Entity/PageManager.php
+++ b/src/Entity/PageManager.php
@@ -13,7 +13,7 @@
 
 namespace Sonata\PageBundle\Entity;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
+use Doctrine\Persistence\ManagerRegistry;
 use Sonata\DatagridBundle\Pager\Doctrine\Pager;
 use Sonata\DatagridBundle\ProxyQuery\Doctrine\ProxyQuery;
 use Sonata\Doctrine\Entity\BaseEntityManager;
diff --git a/src/Entity/SnapshotManager.php b/src/Entity/SnapshotManager.php
index 8753190d7..f6f734c38 100644
--- a/src/Entity/SnapshotManager.php
+++ b/src/Entity/SnapshotManager.php
@@ -13,7 +13,7 @@
 
 namespace Sonata\PageBundle\Entity;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
+use Doctrine\Persistence\ManagerRegistry;
 use Sonata\DatagridBundle\Pager\Doctrine\Pager;
 use Sonata\DatagridBundle\ProxyQuery\Doctrine\ProxyQuery;
 use Sonata\Doctrine\Entity\BaseEntityManager;
diff --git a/tests/Entity/BlockManagerTest.php b/tests/Entity/BlockManagerTest.php
index ce5a69ade..8dcfeb51b 100644
--- a/tests/Entity/BlockManagerTest.php
+++ b/tests/Entity/BlockManagerTest.php
@@ -13,12 +13,12 @@
 
 namespace Sonata\PageBundle\Tests\Entity;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
+use Doctrine\Persistence\ManagerRegistry;
 use PHPUnit\Framework\TestCase;
 use Sonata\PageBundle\Entity\BasePage;
 use Sonata\PageBundle\Entity\BlockManager;
diff --git a/tests/Entity/PageManagerTest.php b/tests/Entity/PageManagerTest.php
index 813b01e7c..5f51ff96b 100644
--- a/tests/Entity/PageManagerTest.php
+++ b/tests/Entity/PageManagerTest.php
@@ -13,13 +13,13 @@
 
 namespace Sonata\PageBundle\Tests\Entity;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
-use Doctrine\Common\Persistence\Mapping\ClassMetadata;
 use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
+use Doctrine\Persistence\ManagerRegistry;
+use Doctrine\Persistence\Mapping\ClassMetadata;
 use PHPUnit\Framework\TestCase;
 use Sonata\PageBundle\Entity\BasePage;
 use Sonata\PageBundle\Entity\PageManager;
diff --git a/tests/Entity/SiteManagerTest.php b/tests/Entity/SiteManagerTest.php
index 972abcd74..228a5fe6f 100644
--- a/tests/Entity/SiteManagerTest.php
+++ b/tests/Entity/SiteManagerTest.php
@@ -13,13 +13,13 @@
 
 namespace Sonata\PageBundle\Tests\Entity;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
-use Doctrine\Common\Persistence\Mapping\ClassMetadata;
 use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
+use Doctrine\Persistence\ManagerRegistry;
+use Doctrine\Persistence\Mapping\ClassMetadata;
 use PHPUnit\Framework\TestCase;
 use Sonata\PageBundle\Entity\BaseSite;
 use Sonata\PageBundle\Entity\SiteManager;
diff --git a/tests/Entity/SnapshotManagerTest.php b/tests/Entity/SnapshotManagerTest.php
index 4a283ec91..a250e0bb2 100644
--- a/tests/Entity/SnapshotManagerTest.php
+++ b/tests/Entity/SnapshotManagerTest.php
@@ -13,13 +13,13 @@
 
 namespace Sonata\PageBundle\Tests\Entity;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\DBAL\Connection;
 use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
+use Doctrine\Persistence\ManagerRegistry;
 use PHPUnit\Framework\TestCase;
 use Sonata\PageBundle\Entity\BaseSnapshot;
 use Sonata\PageBundle\Entity\SnapshotManager;
diff --git a/tests/Model/BlockInteractorTest.php b/tests/Model/BlockInteractorTest.php
index b597e6d79..2d4f63209 100644
--- a/tests/Model/BlockInteractorTest.php
+++ b/tests/Model/BlockInteractorTest.php
@@ -13,7 +13,7 @@
 
 namespace Sonata\PageBundle\Tests\Model;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
+use Doctrine\Persistence\ManagerRegistry;
 use PHPUnit\Framework\TestCase;
 use Sonata\BlockBundle\Model\Block;
 use Sonata\BlockBundle\Model\BlockInterface;