diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 13b1f97de6a..77da0c81689 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -636,16 +636,17 @@
     </PossiblyUnusedMethod>
   </file>
   <file src="tests/Config/PluginListTest.php">
-    <InvalidPropertyAssignmentValue>
-      <code>Mockery::mock(ConfigFile::class)</code>
-    </InvalidPropertyAssignmentValue>
-    <MixedMethodCall>
-      <code>addPlugin</code>
-      <code>expects</code>
-      <code>expects</code>
-      <code>removePlugin</code>
-    </MixedMethodCall>
-    <NoValue>
+    <InvalidArgument>
+      <code><![CDATA[$this->composer_lock]]></code>
+      <code><![CDATA[$this->composer_lock]]></code>
+      <code><![CDATA[$this->composer_lock]]></code>
+      <code><![CDATA[$this->composer_lock]]></code>
+      <code><![CDATA[$this->composer_lock]]></code>
+      <code><![CDATA[$this->composer_lock]]></code>
+      <code><![CDATA[$this->composer_lock]]></code>
+      <code><![CDATA[$this->composer_lock]]></code>
+      <code><![CDATA[$this->composer_lock]]></code>
+      <code><![CDATA[$this->composer_lock]]></code>
       <code><![CDATA[$this->config_file]]></code>
       <code><![CDATA[$this->config_file]]></code>
       <code><![CDATA[$this->config_file]]></code>
@@ -655,7 +656,7 @@
       <code><![CDATA[$this->config_file]]></code>
       <code><![CDATA[$this->config_file]]></code>
       <code><![CDATA[$this->config_file]]></code>
-    </NoValue>
+    </InvalidArgument>
   </file>
   <file src="tests/TestConfig.php">
     <InvalidExtendClass>
diff --git a/tests/Config/PluginListTest.php b/tests/Config/PluginListTest.php
index 5ca98ab0ef8..7083f0891a2 100644
--- a/tests/Config/PluginListTest.php
+++ b/tests/Config/PluginListTest.php
@@ -20,11 +20,11 @@ class PluginListTest extends TestCase
 {
     use MockeryPHPUnitIntegration;
 
-    private ConfigFile&MockInterface $config_file;
+    private MockInterface $config_file;
 
-    private Config&MockInterface $config;
+    private MockInterface $config;
 
-    private ComposerLock&MockInterface $composer_lock;
+    private MockInterface $composer_lock;
 
     public function setUp(): void
     {
diff --git a/tests/ErrorBaselineTest.php b/tests/ErrorBaselineTest.php
index 584748d418e..3f37112e3b4 100644
--- a/tests/ErrorBaselineTest.php
+++ b/tests/ErrorBaselineTest.php
@@ -23,7 +23,7 @@ class ErrorBaselineTest extends TestCase
 {
     use MockeryPHPUnitIntegration;
 
-    private FileProvider&MockInterface $fileProvider;
+    private MockInterface $fileProvider;
 
     public function setUp(): void
     {