diff --git a/typo3/sysext/core/Tests/Functional/Cache/Backend/FileBackendTest.php b/typo3/sysext/core/Tests/Functional/Cache/Backend/FileBackendTest.php
index ab4e41ea3e2c11743c6f135529fb2796e35ee49d..8b23e1899e49bd370a37a03c3c7bb99a56775aee 100644
--- a/typo3/sysext/core/Tests/Functional/Cache/Backend/FileBackendTest.php
+++ b/typo3/sysext/core/Tests/Functional/Cache/Backend/FileBackendTest.php
@@ -283,10 +283,7 @@ final class FileBackendTest extends FunctionalTestCase
     public function hasReturnsFalseForExpiredEntries(): void
     {
         $subject = $this->getMockBuilder(FileBackend::class)->onlyMethods(['isCacheFileExpired'])->disableOriginalConstructor()->getMock();
-        $subject->expects(self::exactly(2))->method('isCacheFileExpired')->will(self::onConsecutiveCalls(
-            true,
-            false
-        ));
+        $subject->expects(self::exactly(2))->method('isCacheFileExpired')->willReturn(true, false);
         self::assertFalse($subject->has('foo'));
         self::assertTrue($subject->has('bar'));
     }
diff --git a/typo3/sysext/core/Tests/Unit/Resource/MetaDataAspectTest.php b/typo3/sysext/core/Tests/Unit/Resource/MetaDataAspectTest.php
index 2d5fc1f8d1fb3e4bf8495c6e4890758247477b90..720aa5e71e9dbed5812dd7688c98474c5de218f7 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/MetaDataAspectTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/MetaDataAspectTest.php
@@ -190,7 +190,7 @@ final class MetaDataAspectTest extends UnitTestCase
             ->onlyMethods(['loadFromRepository'])
             ->getMock();
 
-        $metaDataAspectMock->method('loadFromRepository')->will(self::onConsecutiveCalls([], $metaData, $updatedMetadata));
+        $metaDataAspectMock->method('loadFromRepository')->willReturn([], $metaData, $updatedMetadata);
         $metaDataAspectMock->add($metaData)->save();
         $metaDataAspectMock->add(['testproperty' => 'testvalue'])->save();
 
diff --git a/typo3/sysext/core/Tests/Unit/Resource/ResourceCompressorTest.php b/typo3/sysext/core/Tests/Unit/Resource/ResourceCompressorTest.php
index 60af2eaad5568728b2cabc1ab8643bdaad0d860c..024c9ea48435499e5f7c01a63d35ec2cb4604971 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/ResourceCompressorTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/ResourceCompressorTest.php
@@ -174,10 +174,7 @@ final class ResourceCompressorTest extends UnitTestCase
         $subject = $this->getAccessibleMock(ResourceCompressor::class, ['compressCssFile', 'compressJsFile', 'createMergedCssFile', 'createMergedJsFile', 'getFilenameFromMainDir', 'checkBaseDirectory']);
         $subject->expects(self::exactly(2))
             ->method('createMergedCssFile')
-            ->will(self::onConsecutiveCalls(
-                self::returnValue('merged_' . $allFileName),
-                self::returnValue('merged_' . $screenFileName1)
-            ));
+            ->willReturn(self::returnValue('merged_' . $allFileName), self::returnValue('merged_' . $screenFileName1));
 
         $result = $subject->concatenateCssFiles($testFileFixture);
 
diff --git a/typo3/sysext/form/Tests/Unit/Mvc/Persistence/FormPersistenceManagerTest.php b/typo3/sysext/form/Tests/Unit/Mvc/Persistence/FormPersistenceManagerTest.php
index c4ab0ad98ca624c8d0b2e435cb249a3353f29565..644f70dbdad2ec94dc2fe2b33f2f2b94183f65cd 100644
--- a/typo3/sysext/form/Tests/Unit/Mvc/Persistence/FormPersistenceManagerTest.php
+++ b/typo3/sysext/form/Tests/Unit/Mvc/Persistence/FormPersistenceManagerTest.php
@@ -395,11 +395,7 @@ final class FormPersistenceManagerTest extends UnitTestCase
         $mockFormPersistenceManager
             ->expects(self::exactly(3))
             ->method('exists')
-            ->will(self::onConsecutiveCalls(
-                self::returnValue(true),
-                self::returnValue(true),
-                self::returnValue(false)
-            ));
+            ->willReturn(true, true, false);
 
         $input = 'example';
         $expected = '-1:/user_uploads/example_2.form.yaml';
@@ -415,9 +411,7 @@ final class FormPersistenceManagerTest extends UnitTestCase
         $mockFormPersistenceManager
             ->expects(self::exactly(101))
             ->method('exists')
-            ->will(self::onConsecutiveCalls(
-                ...$this->returnTrue100Times()
-            ));
+            ->willReturn(...$this->returnTrue100Times());
 
         $input = 'example';
         $expected = '#^-1:/user_uploads/example_([0-9]{10}).form.yaml$#';
@@ -432,8 +426,8 @@ final class FormPersistenceManagerTest extends UnitTestCase
     private function returnTrue100Times(): array
     {
         $returnValues = [];
-        $returnValues = array_pad($returnValues, 100, self::returnValue(true));
-        $returnValues[] = self::returnValue(false);
+        $returnValues = array_pad($returnValues, 100, true);
+        $returnValues[] = false;
         return $returnValues;
     }
 
@@ -461,9 +455,7 @@ final class FormPersistenceManagerTest extends UnitTestCase
         $mockFormPersistenceManager
                 ->expects(self::exactly(101))
                 ->method('checkForDuplicateIdentifier')
-                ->will(self::onConsecutiveCalls(
-                    ...$this->returnTrue100Times()
-                ));
+                ->willReturn(...$this->returnTrue100Times());
 
         $input = 'example';
         $expected = '#^example_([0-9]{10})$#';