diff --git a/src/Symfony/Bridge/Doctrine/ManagerRegistry.php b/src/Symfony/Bridge/Doctrine/ManagerRegistry.php
index ba07c8f84a..852aa3898a 100644
--- a/src/Symfony/Bridge/Doctrine/ManagerRegistry.php
+++ b/src/Symfony/Bridge/Doctrine/ManagerRegistry.php
@@ -12,17 +12,32 @@
 namespace Symfony\Bridge\Doctrine;
 
 use Doctrine\Common\Persistence\AbstractManagerRegistry as LegacyAbstractManagerRegistry;
+use Doctrine\Persistence\AbstractManagerRegistry;
 use ProxyManager\Proxy\LazyLoadingInterface;
 use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface as SymfonyContainerInterface;
 
+if (class_exists(AbstractManagerRegistry::class)) {
+    abstract class ManagerRegistry extends AbstractManagerRegistry implements ContainerAwareInterface
+    {
+        use ManagerRegistryTrait;
+    }
+} else {
+    abstract class ManagerRegistry extends LegacyAbstractManagerRegistry implements ContainerAwareInterface
+    {
+        use ManagerRegistryTrait;
+    }
+}
+
 /**
  * References Doctrine connections and entity/document managers.
  *
  * @author  Lukas Kahwe Smith <smith@pooteeweet.org>
+ *
+ * @internal
  */
-abstract class ManagerRegistry extends LegacyAbstractManagerRegistry implements ContainerAwareInterface
+trait ManagerRegistryTrait
 {
     /**
      * @var Container