diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 863d0b434a..58e6074d92 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -19,10 +19,6 @@
     <exclude-pattern>tests/Proxies*</exclude-pattern>
     <exclude-pattern>tests/Hydrators*</exclude-pattern>
     <exclude-pattern>tests/PersistentCollections*</exclude-pattern>
-    <!-- Figure out what to do with "Scope keyword "static" must be followed by a single space; found newline" -->
-    <exclude-pattern>tests/Doctrine/ODM/MongoDB/Tests/PersistentCollection/CollWithPHP80Types.php</exclude-pattern>
-    <!-- Figure out what to do with PHP 8.1 errors in coding standard -->
-    <exclude-pattern>tests/Doctrine/ODM/MongoDB/Tests/PersistentCollection/CollWithPHP81Types.php</exclude-pattern>
 
     <rule ref="Doctrine">
         <!-- Traversable type hints often end up as mixed[], so we skip them for now -->
diff --git a/psalm.xml.dist b/psalm.xml.dist
index bf91b31456..63e41ba00e 100644
--- a/psalm.xml.dist
+++ b/psalm.xml.dist
@@ -31,12 +31,6 @@
             </errorLevel>
         </UndefinedConstant>
 
-        <UndefinedAttributeClass>
-            <errorLevel type="suppress">
-                <!-- Remove it when using PHP 8.1 for running Psalm -->
-                <referencedClass name="ReturnTypeWillChange" />
-            </errorLevel>
-        </UndefinedAttributeClass>
         <InvalidReturnType>
             <errorLevel type="suppress">
                 <!-- Remove it when dropping support for doctrine/collections v1 -->
diff --git a/tests/Doctrine/ODM/MongoDB/Tests/PersistentCollection/CollWithPHP80Types.php b/tests/Doctrine/ODM/MongoDB/Tests/PersistentCollection/CollWithPHP80Types.php
index 9e2a6325a5..8c6bbeb5df 100644
--- a/tests/Doctrine/ODM/MongoDB/Tests/PersistentCollection/CollWithPHP80Types.php
+++ b/tests/Doctrine/ODM/MongoDB/Tests/PersistentCollection/CollWithPHP80Types.php
@@ -14,26 +14,27 @@
  */
 class CollWithPHP80Types extends ArrayCollection
 {
-    public function mixed(mixed $param) : mixed
+    public function mixed(mixed $param): mixed
     {
         return $param;
     }
 
     /**
      * @param Collection<TKey, TElement>|ArrayCollection<TKey, TElement> $param
+     *
      * @return Collection<TKey, TElement>|ArrayCollection<TKey, TElement>
      */
-    public function union(Collection|ArrayCollection $param) : Collection|ArrayCollection
+    public function union(Collection|ArrayCollection $param): Collection|ArrayCollection
     {
         return $param;
     }
 
-    public function static() : static
+    public function static(): static
     {
         return $this;
     }
 
-    public function nullableStatic() : ?static
+    public function nullableStatic(): ?static
     {
         return $this;
     }
diff --git a/tests/Doctrine/ODM/MongoDB/Tests/PersistentCollection/CollWithPHP81Types.php b/tests/Doctrine/ODM/MongoDB/Tests/PersistentCollection/CollWithPHP81Types.php
index dfb0dca207..e283386001 100644
--- a/tests/Doctrine/ODM/MongoDB/Tests/PersistentCollection/CollWithPHP81Types.php
+++ b/tests/Doctrine/ODM/MongoDB/Tests/PersistentCollection/CollWithPHP81Types.php
@@ -14,16 +14,12 @@
  */
 class CollWithPHP81Types extends ArrayCollection
 {
-    /**
-     * @param Collection<TKey, TElement>&ArrayCollection<TKey, TElement> $param
-     * @return Collection<TKey, TElement>&ArrayCollection<TKey, TElement>
-     */
-    public function intersection(Collection&ArrayCollection $param) : Collection&ArrayCollection
+    public function intersection(Collection&ArrayCollection $param): Collection&ArrayCollection
     {
         return $param;
     }
 
-    public function never() : never
+    public function never(): never
     {
         die('You shall not pass');
     }