diff --git a/tests/ConnectionTest.php b/tests/ConnectionTest.php
index 1312fa3eb8f..ea71f23558c 100644
--- a/tests/ConnectionTest.php
+++ b/tests/ConnectionTest.php
@@ -45,8 +45,7 @@ protected function setUp(): void
         $this->connection = DriverManager::getConnection(self::CONNECTION_PARAMS);
     }
 
-    /** @return Connection&MockObject */
-    private function getExecuteStatementMockConnection(): Connection
+    private function getExecuteStatementMockConnection(): Connection&MockObject
     {
         $driverMock = $this->createMock(Driver::class);
 
diff --git a/tests/Driver/AbstractDriverTestCase.php b/tests/Driver/AbstractDriverTestCase.php
index 75aceec249b..5c650744d28 100644
--- a/tests/Driver/AbstractDriverTestCase.php
+++ b/tests/Driver/AbstractDriverTestCase.php
@@ -57,8 +57,7 @@ abstract protected function createSchemaManager(Connection $connection): Abstrac
 
     abstract protected function createExceptionConverter(): ExceptionConverter;
 
-    /** @return Connection&MockObject */
-    protected function getConnectionMock(): Connection
+    protected function getConnectionMock(): Connection&MockObject
     {
         return $this->createMock(Connection::class);
     }
diff --git a/tests/Portability/StatementTest.php b/tests/Portability/StatementTest.php
index e13176660dc..cddcf152e99 100644
--- a/tests/Portability/StatementTest.php
+++ b/tests/Portability/StatementTest.php
@@ -14,9 +14,7 @@
 class StatementTest extends TestCase
 {
     protected Statement $stmt;
-
-    /** @var DriverStatement&MockObject */
-    protected DriverStatement $wrappedStmt;
+    protected DriverStatement&MockObject $wrappedStmt;
 
     protected function setUp(): void
     {
diff --git a/tests/Query/QueryBuilderTest.php b/tests/Query/QueryBuilderTest.php
index 8e287b9ba45..b146670f9f7 100644
--- a/tests/Query/QueryBuilderTest.php
+++ b/tests/Query/QueryBuilderTest.php
@@ -23,8 +23,7 @@
 /** @psalm-import-type WrapperParameterTypeArray from Connection */
 class QueryBuilderTest extends TestCase
 {
-    /** @var Connection&MockObject */
-    protected Connection $conn;
+    protected Connection&MockObject $conn;
 
     protected function setUp(): void
     {
diff --git a/tests/Tools/Console/RunSqlCommandTest.php b/tests/Tools/Console/RunSqlCommandTest.php
index 43d26cbbbce..bbc5b165f45 100644
--- a/tests/Tools/Console/RunSqlCommandTest.php
+++ b/tests/Tools/Console/RunSqlCommandTest.php
@@ -19,9 +19,7 @@ class RunSqlCommandTest extends TestCase
 {
     private CommandTester $commandTester;
     private RunSqlCommand $command;
-
-    /** @var Connection&MockObject */
-    private Connection $connectionMock;
+    private Connection&MockObject $connectionMock;
 
     protected function setUp(): void
     {
diff --git a/tests/Types/BinaryTest.php b/tests/Types/BinaryTest.php
index bdb4093c52b..993cd28fe72 100644
--- a/tests/Types/BinaryTest.php
+++ b/tests/Types/BinaryTest.php
@@ -19,9 +19,7 @@
 
 class BinaryTest extends TestCase
 {
-    /** @var AbstractPlatform&MockObject */
-    protected AbstractPlatform $platform;
-
+    protected AbstractPlatform&MockObject $platform;
     protected BinaryType $type;
 
     protected function setUp(): void
diff --git a/tests/Types/BlobTest.php b/tests/Types/BlobTest.php
index 7a405d5d501..d5aeb30a7ba 100644
--- a/tests/Types/BlobTest.php
+++ b/tests/Types/BlobTest.php
@@ -11,9 +11,7 @@
 
 class BlobTest extends TestCase
 {
-    /** @var AbstractPlatform&MockObject */
-    protected AbstractPlatform $platform;
-
+    protected AbstractPlatform&MockObject $platform;
     protected BlobType $type;
 
     protected function setUp(): void
diff --git a/tests/Types/BooleanTest.php b/tests/Types/BooleanTest.php
index 5e2f6ce6c1f..df1e271bafe 100644
--- a/tests/Types/BooleanTest.php
+++ b/tests/Types/BooleanTest.php
@@ -11,9 +11,7 @@
 
 class BooleanTest extends TestCase
 {
-    /** @var AbstractPlatform&MockObject */
-    private AbstractPlatform $platform;
-
+    private AbstractPlatform&MockObject $platform;
     private BooleanType $type;
 
     protected function setUp(): void
diff --git a/tests/Types/DateImmutableTypeTest.php b/tests/Types/DateImmutableTypeTest.php
index bca6ab8a01b..31f5cdce1fe 100644
--- a/tests/Types/DateImmutableTypeTest.php
+++ b/tests/Types/DateImmutableTypeTest.php
@@ -15,9 +15,7 @@
 
 class DateImmutableTypeTest extends TestCase
 {
-    /** @var AbstractPlatform&MockObject */
-    private AbstractPlatform $platform;
-
+    private AbstractPlatform&MockObject $platform;
     private DateImmutableType $type;
 
     protected function setUp(): void
diff --git a/tests/Types/DateIntervalTest.php b/tests/Types/DateIntervalTest.php
index 9c23201c756..c1717292ff7 100644
--- a/tests/Types/DateIntervalTest.php
+++ b/tests/Types/DateIntervalTest.php
@@ -15,9 +15,7 @@
 
 final class DateIntervalTest extends TestCase
 {
-    /** @var AbstractPlatform&MockObject */
-    private AbstractPlatform $platform;
-
+    private AbstractPlatform&MockObject $platform;
     private DateIntervalType $type;
 
     protected function setUp(): void
diff --git a/tests/Types/DateTimeImmutableTypeTest.php b/tests/Types/DateTimeImmutableTypeTest.php
index e1928826556..cce9557636b 100644
--- a/tests/Types/DateTimeImmutableTypeTest.php
+++ b/tests/Types/DateTimeImmutableTypeTest.php
@@ -15,9 +15,7 @@
 
 class DateTimeImmutableTypeTest extends TestCase
 {
-    /** @var AbstractPlatform&MockObject */
-    private AbstractPlatform $platform;
-
+    private AbstractPlatform&MockObject $platform;
     private DateTimeImmutableType $type;
 
     protected function setUp(): void
diff --git a/tests/Types/DateTimeTzImmutableTypeTest.php b/tests/Types/DateTimeTzImmutableTypeTest.php
index c5f390dc3fb..cbd2f7b730e 100644
--- a/tests/Types/DateTimeTzImmutableTypeTest.php
+++ b/tests/Types/DateTimeTzImmutableTypeTest.php
@@ -15,9 +15,7 @@
 
 class DateTimeTzImmutableTypeTest extends TestCase
 {
-    /** @var AbstractPlatform&MockObject */
-    private AbstractPlatform $platform;
-
+    private AbstractPlatform&MockObject $platform;
     private DateTimeTzImmutableType $type;
 
     protected function setUp(): void
diff --git a/tests/Types/DecimalTest.php b/tests/Types/DecimalTest.php
index 20c647531df..13e401572a7 100644
--- a/tests/Types/DecimalTest.php
+++ b/tests/Types/DecimalTest.php
@@ -11,9 +11,7 @@
 
 class DecimalTest extends TestCase
 {
-    /** @var AbstractPlatform&MockObject */
-    private AbstractPlatform $platform;
-
+    private AbstractPlatform&MockObject $platform;
     private DecimalType $type;
 
     protected function setUp(): void
diff --git a/tests/Types/FloatTest.php b/tests/Types/FloatTest.php
index 4e66941a74a..0e5f7e1f531 100644
--- a/tests/Types/FloatTest.php
+++ b/tests/Types/FloatTest.php
@@ -11,9 +11,7 @@
 
 class FloatTest extends TestCase
 {
-    /** @var AbstractPlatform&MockObject */
-    private AbstractPlatform $platform;
-
+    private AbstractPlatform&MockObject $platform;
     private FloatType $type;
 
     protected function setUp(): void
diff --git a/tests/Types/GuidTypeTest.php b/tests/Types/GuidTypeTest.php
index ec43cc3aa07..7875eedda35 100644
--- a/tests/Types/GuidTypeTest.php
+++ b/tests/Types/GuidTypeTest.php
@@ -11,9 +11,7 @@
 
 class GuidTypeTest extends TestCase
 {
-    /** @var AbstractPlatform&MockObject */
-    private AbstractPlatform $platform;
-
+    private AbstractPlatform&MockObject $platform;
     private GuidType $type;
 
     protected function setUp(): void
diff --git a/tests/Types/IntegerTest.php b/tests/Types/IntegerTest.php
index 15d862a5c65..e5ef54f2188 100644
--- a/tests/Types/IntegerTest.php
+++ b/tests/Types/IntegerTest.php
@@ -11,9 +11,7 @@
 
 class IntegerTest extends TestCase
 {
-    /** @var AbstractPlatform&MockObject */
-    private AbstractPlatform $platform;
-
+    private AbstractPlatform&MockObject $platform;
     private IntegerType $type;
 
     protected function setUp(): void
diff --git a/tests/Types/JsonTest.php b/tests/Types/JsonTest.php
index 00f4a37d689..8140fb87bf8 100644
--- a/tests/Types/JsonTest.php
+++ b/tests/Types/JsonTest.php
@@ -16,9 +16,7 @@
 
 class JsonTest extends TestCase
 {
-    /** @var AbstractPlatform&MockObject */
-    protected AbstractPlatform $platform;
-
+    protected AbstractPlatform&MockObject $platform;
     protected JsonType $type;
 
     protected function setUp(): void
diff --git a/tests/Types/SmallIntTest.php b/tests/Types/SmallIntTest.php
index 3b62df99b09..4f6c4d1c343 100644
--- a/tests/Types/SmallIntTest.php
+++ b/tests/Types/SmallIntTest.php
@@ -11,9 +11,7 @@
 
 class SmallIntTest extends TestCase
 {
-    /** @var AbstractPlatform&MockObject */
-    private AbstractPlatform $platform;
-
+    private AbstractPlatform&MockObject $platform;
     private SmallIntType $type;
 
     protected function setUp(): void
diff --git a/tests/Types/StringTest.php b/tests/Types/StringTest.php
index 0149f62e1de..070ccb74232 100644
--- a/tests/Types/StringTest.php
+++ b/tests/Types/StringTest.php
@@ -11,9 +11,7 @@
 
 class StringTest extends TestCase
 {
-    /** @var AbstractPlatform&MockObject */
-    private AbstractPlatform $platform;
-
+    private AbstractPlatform&MockObject $platform;
     private StringType $type;
 
     protected function setUp(): void
diff --git a/tests/Types/TimeImmutableTypeTest.php b/tests/Types/TimeImmutableTypeTest.php
index f346d26e412..f1738546868 100644
--- a/tests/Types/TimeImmutableTypeTest.php
+++ b/tests/Types/TimeImmutableTypeTest.php
@@ -15,9 +15,7 @@
 
 class TimeImmutableTypeTest extends TestCase
 {
-    /** @var AbstractPlatform&MockObject */
-    private AbstractPlatform $platform;
-
+    private AbstractPlatform&MockObject $platform;
     private TimeImmutableType $type;
 
     protected function setUp(): void
diff --git a/tests/Types/VarDateTimeImmutableTypeTest.php b/tests/Types/VarDateTimeImmutableTypeTest.php
index 71c34c411a0..4bd6c5badd2 100644
--- a/tests/Types/VarDateTimeImmutableTypeTest.php
+++ b/tests/Types/VarDateTimeImmutableTypeTest.php
@@ -15,9 +15,7 @@
 
 class VarDateTimeImmutableTypeTest extends TestCase
 {
-    /** @var AbstractPlatform&MockObject */
-    private AbstractPlatform $platform;
-
+    private AbstractPlatform&MockObject $platform;
     private VarDateTimeImmutableType $type;
 
     protected function setUp(): void
diff --git a/tests/Types/VarDateTimeTest.php b/tests/Types/VarDateTimeTest.php
index c137b5ffd66..9ff303e8dcb 100644
--- a/tests/Types/VarDateTimeTest.php
+++ b/tests/Types/VarDateTimeTest.php
@@ -13,9 +13,7 @@
 
 class VarDateTimeTest extends TestCase
 {
-    /** @var AbstractPlatform&MockObject */
-    private AbstractPlatform $platform;
-
+    private AbstractPlatform&MockObject $platform;
     private VarDateTimeType $type;
 
     protected function setUp(): void