diff --git a/.psalm/baseline.xml b/.psalm/baseline.xml
index 809e61c6d83..cfe53c3c1dc 100644
--- a/.psalm/baseline.xml
+++ b/.psalm/baseline.xml
@@ -97,9 +97,29 @@
     <ImplementedReturnTypeMismatch occurrences="1">
       <code>self</code>
     </ImplementedReturnTypeMismatch>
+    <LessSpecificReturnStatement occurrences="8">
+      <code>$this-&gt;will($stub)</code>
+      <code>$this-&gt;will($stub)</code>
+      <code>$this-&gt;will($stub)</code>
+      <code>$this-&gt;will($stub)</code>
+      <code>$this-&gt;will($stub)</code>
+      <code>$this-&gt;will($stub)</code>
+      <code>$this-&gt;will($stub)</code>
+      <code>$this-&gt;will($stub)</code>
+    </LessSpecificReturnStatement>
     <MethodSignatureMismatch occurrences="1">
       <code>InvocationMocker</code>
     </MethodSignatureMismatch>
+    <MoreSpecificReturnType occurrences="8">
+      <code>self</code>
+      <code>self</code>
+      <code>self</code>
+      <code>self</code>
+      <code>self</code>
+      <code>self</code>
+      <code>self</code>
+      <code>self</code>
+    </MoreSpecificReturnType>
     <UndefinedInterfaceMethod occurrences="1">
       <code>registerId</code>
     </UndefinedInterfaceMethod>
diff --git a/src/Framework/MockObject/Builder/InvocationMocker.php b/src/Framework/MockObject/Builder/InvocationMocker.php
index 914c730e9a7..48576615886 100644
--- a/src/Framework/MockObject/Builder/InvocationMocker.php
+++ b/src/Framework/MockObject/Builder/InvocationMocker.php
@@ -68,7 +68,7 @@ public function id($id): self
         return $this;
     }
 
-    public function will(Stub $stub): self
+    public function will(Stub $stub): Identity
     {
         $this->matcher->setStub($stub);