diff --git a/Repository/ContainerRepositoryFactory.php b/Repository/ContainerRepositoryFactory.php
index 1907c5384..49b172d84 100644
--- a/Repository/ContainerRepositoryFactory.php
+++ b/Repository/ContainerRepositoryFactory.php
@@ -20,7 +20,7 @@
  */
 final class ContainerRepositoryFactory implements RepositoryFactory
 {
-    /** @var ObjectRepository[] */
+    /** @var array<string, ObjectRepository> */
     private $managedRepositories = [];
 
     /** @var ContainerInterface */
@@ -68,6 +68,13 @@ public function getRepository(EntityManagerInterface $entityManager, $entityName
         return $this->getOrCreateRepository($entityManager, $metadata);
     }
 
+    /**
+     * @param ClassMetadata<TEntity> $metadata
+     *
+     * @return ObjectRepository<TEntity>
+     *
+     * @template TEntity of object
+     */
     private function getOrCreateRepository(
         EntityManagerInterface $entityManager,
         ClassMetadata $metadata
@@ -79,6 +86,7 @@ private function getOrCreateRepository(
 
         $repositoryClassName = $metadata->customRepositoryClassName ?: $entityManager->getConfiguration()->getDefaultRepositoryClassName();
 
+        /** @psalm-var ObjectRepository<TEntity> */
         return $this->managedRepositories[$repositoryHash] = new $repositoryClassName($entityManager, $metadata);
     }
 }
diff --git a/Repository/ServiceEntityRepository.php b/Repository/ServiceEntityRepository.php
index 877d447f1..dd274065f 100644
--- a/Repository/ServiceEntityRepository.php
+++ b/Repository/ServiceEntityRepository.php
@@ -22,7 +22,7 @@
  *     }
  * }
  *
- * @template T
+ * @template T of object
  * @template-extends EntityRepository<T>
  */
 class ServiceEntityRepository extends EntityRepository implements ServiceEntityRepositoryInterface
diff --git a/psalm.xml.dist b/psalm.xml.dist
index dc843675e..a0cb0fb23 100644
--- a/psalm.xml.dist
+++ b/psalm.xml.dist
@@ -33,18 +33,18 @@
         <file name="Registry.php"/>
     </projectFiles>
     <issueHandlers>
-        <TooManyTemplateParams>
-            <errorLevel type="suppress">
-                <!-- This happens on PHP 7.1 because there is no 7.1 compatible doctrine/orm version having template annotations -->
-                <file name="Repository/ServiceEntityRepository.php"/>
-            </errorLevel>
-        </TooManyTemplateParams>
         <InvalidArrayOffset>
             <errorLevel type="suppress">
                 <!-- requires a release of https://github.com/doctrine/dbal/pull/5261 -->
                 <file name="Tests/ConnectionFactoryTest.php"/>
             </errorLevel>
         </InvalidArrayOffset>
+        <UndefinedClass>
+            <errorLevel type="suppress">
+                <!-- We use the "Foo" namespace in unit tests. We are aware that those classes don't exist. -->
+                <referencedClass name="Foo\*"/>
+            </errorLevel>
+        </UndefinedClass>
         <UndefinedDocblockClass>
             <errorLevel type="suppress">
                 <!-- https://github.com/symfony/symfony/issues/45609 -->