diff --git a/.psalm/baseline.xml b/.psalm/baseline.xml
index 2c547b03e9e..f2921f58dd7 100644
--- a/.psalm/baseline.xml
+++ b/.psalm/baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="3.x-dev@0279c6f6d9bbe22854526c45eaf1f5482c12ade3">
+<files psalm-version="3.4.12@86e5e50c1bb492045e70f2ebe1da3cad06e4e9b2">
   <file src="src/Framework/Assert.php">
     <ArgumentTypeCoercion occurrences="2">
       <code>$expectedElement-&gt;childNodes-&gt;item($i)</code>
@@ -97,26 +97,6 @@
     <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>
-    <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>
@@ -397,9 +377,7 @@
     </UndefinedInterfaceMethod>
   </file>
   <file src="src/Util/Log/TeamCity.php">
-    <ArgumentTypeCoercion occurrences="3">
-      <code>$split[0]</code>
-      <code>$split[0]</code>
+    <ArgumentTypeCoercion occurrences="1">
       <code>$className</code>
     </ArgumentTypeCoercion>
     <UndefinedInterfaceMethod occurrences="7">
@@ -455,18 +433,14 @@
     </PossiblyNullArgument>
   </file>
   <file src="src/Util/Test.php">
-    <ArgumentTypeCoercion occurrences="5">
+    <ArgumentTypeCoercion occurrences="4">
       <code>$className</code>
-      <code>$pieces[0]</code>
       <code>$className</code>
       <code>$className</code>
       <code>$dataProviderClassName</code>
     </ArgumentTypeCoercion>
-    <InvalidArgument occurrences="4">
+    <InvalidArgument occurrences="1">
       <code>$e</code>
-      <code>$operator</code>
-      <code>$operator</code>
-      <code>$operator</code>
     </InvalidArgument>
     <InvalidCatch occurrences="1"/>
     <InvalidReturnStatement occurrences="1">