diff --git a/typo3/sysext/backend/Tests/Unit/Configuration/TypoScript/ConditionMatching/ConditionMatcherTest.php b/typo3/sysext/backend/Tests/Unit/Configuration/TypoScript/ConditionMatching/ConditionMatcherTest.php
old mode 100755
new mode 100644
index 3817520e2e7c21b0fe664d13463ac2b24a1d476b..f47eb4a8914838fdfb7dee63fbee40be69bc1b35
--- a/typo3/sysext/backend/Tests/Unit/Configuration/TypoScript/ConditionMatching/ConditionMatcherTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Configuration/TypoScript/ConditionMatching/ConditionMatcherTest.php
@@ -54,7 +54,10 @@ class ConditionMatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $GLOBALS[$this->testGlobalNamespace] = array();
         GeneralUtility::flushInternalRuntimeCaches();
         $this->setUpBackend();
-        $this->matchCondition = $this->getMock(\TYPO3\CMS\Backend\Configuration\TypoScript\ConditionMatching\ConditionMatcher::class, array('determineRootline'), array(), '', false);
+        $this->matchCondition = $this->getMockBuilder(\TYPO3\CMS\Backend\Configuration\TypoScript\ConditionMatching\ConditionMatcher::class)
+            ->setMethods(array('determineRootline'))
+            ->disableOriginalConstructor()
+            ->getMock();
     }
 
     /**
@@ -67,7 +70,10 @@ class ConditionMatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             1 => array('uid' => 111, 'pid' => 101),
             0 => array('uid' => 101, 'pid' => 0)
         );
-        $GLOBALS['BE_USER'] = $this->getMock(BackendUserAuthentication::class, array('dummy'), array(), '', false);
+        $GLOBALS['BE_USER'] = $this->getMockBuilder(BackendUserAuthentication::class)
+            ->setMethods(array('dummy'))
+            ->disableOriginalConstructor()
+            ->getMock();
     }
 
     /**
@@ -75,7 +81,9 @@ class ConditionMatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     private function setUpDatabaseMockForDeterminePageId()
     {
-        $GLOBALS['TYPO3_DB'] = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array('exec_SELECTquery', 'sql_fetch_assoc', 'sql_free_result'));
+        $GLOBALS['TYPO3_DB'] = $this->getMockBuilder(\TYPO3\CMS\Core\Database\DatabaseConnection::class)
+            ->setMethods(array('exec_SELECTquery', 'sql_fetch_assoc', 'sql_free_result'))
+            ->getMock();
         $GLOBALS['TYPO3_DB']->expects($this->any())->method('exec_SELECTquery')->will($this->returnCallback(array($this, 'determinePageIdByRecordDatabaseExecuteCallback')));
         $GLOBALS['TYPO3_DB']->expects($this->any())->method('sql_fetch_assoc')->will($this->returnCallback(array($this, 'determinePageIdByRecordDatabaseFetchCallback')));
     }
@@ -499,7 +507,7 @@ class ConditionMatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function treeLevelConditionMatchesCurrentPageIdWhileEditingNewPage()
     {
-        $GLOBALS['SOBE'] = $this->getMock(\TYPO3\CMS\Backend\Controller\EditDocumentController::class, array(), array(), '', false);
+        $GLOBALS['SOBE'] = $this->createMock(\TYPO3\CMS\Backend\Controller\EditDocumentController::class);
         $GLOBALS['SOBE']->elementsData = array(
             array(
                 'table' => 'pages',
@@ -522,7 +530,7 @@ class ConditionMatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function treeLevelConditionMatchesCurrentPageIdWhileSavingNewPage()
     {
-        $GLOBALS['SOBE'] = $this->getMock(\TYPO3\CMS\Backend\Controller\EditDocumentController::class, array(), array(), '', false);
+        $GLOBALS['SOBE'] = $this->createMock(\TYPO3\CMS\Backend\Controller\EditDocumentController::class);
         $GLOBALS['SOBE']->elementsData = array(
             array(
                 'table' => 'pages',
@@ -600,7 +608,7 @@ class ConditionMatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function PIDupinRootlineConditionMatchesCurrentPageIdWhileEditingNewPage()
     {
-        $GLOBALS['SOBE'] = $this->getMock(\TYPO3\CMS\Backend\Controller\EditDocumentController::class, array(), array(), '', false);
+        $GLOBALS['SOBE'] = $this->createMock(\TYPO3\CMS\Backend\Controller\EditDocumentController::class);
         $GLOBALS['SOBE']->elementsData = array(
             array(
                 'table' => 'pages',
@@ -623,7 +631,7 @@ class ConditionMatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function PIDupinRootlineConditionMatchesCurrentPageIdWhileSavingNewPage()
     {
-        $GLOBALS['SOBE'] = $this->getMock(\TYPO3\CMS\Backend\Controller\EditDocumentController::class, array(), array(), '', false);
+        $GLOBALS['SOBE'] = $this->createMock(\TYPO3\CMS\Backend\Controller\EditDocumentController::class);
         $GLOBALS['SOBE']->elementsData = array(
             array(
                 'table' => 'pages',
diff --git a/typo3/sysext/backend/Tests/Unit/Controller/File/FileControllerTest.php b/typo3/sysext/backend/Tests/Unit/Controller/File/FileControllerTest.php
index 695edc089ade7cb748f7a5ecc29c5ce1feb1acce..197fe2596b999dd942ac71c1bc5044932fbfe853 100644
--- a/typo3/sysext/backend/Tests/Unit/Controller/File/FileControllerTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Controller/File/FileControllerTest.php
@@ -57,9 +57,18 @@ class FileControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     protected function setUp()
     {
-        $this->fileResourceMock = $this->getMock(\TYPO3\CMS\Core\Resource\File::class, array('toArray', 'getModificationTime', 'getExtension'), array(), '', false);
-        $this->folderResourceMock = $this->getMock(\TYPO3\CMS\Core\Resource\Folder::class, array('getIdentifier'), array(), '', false);
-        $this->mockFileProcessor = $this->getMock(\TYPO3\CMS\Core\Utility\File\ExtendedFileUtility::class, array('getErrorMessages'), array(), '', false);
+        $this->fileResourceMock = $this->getMockBuilder(\TYPO3\CMS\Core\Resource\File::class)
+            ->setMethods(array('toArray', 'getModificationTime', 'getExtension'))
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->folderResourceMock = $this->getMockBuilder(\TYPO3\CMS\Core\Resource\Folder::class)
+            ->setMethods(array('getIdentifier'))
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->mockFileProcessor = $this->getMockBuilder(\TYPO3\CMS\Core\Utility\File\ExtendedFileUtility::class)
+            ->setMethods(array('getErrorMessages'))
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $this->fileResourceMock->expects($this->any())->method('toArray')->will($this->returnValue(array('id' => 'foo')));
         $this->fileResourceMock->expects($this->any())->method('getModificationTime')->will($this->returnValue(123456789));
diff --git a/typo3/sysext/backend/Tests/Unit/Controller/PageLayoutControllerTest.php b/typo3/sysext/backend/Tests/Unit/Controller/PageLayoutControllerTest.php
index a01d8d3976deb9802555177821e1eea72ccd3d1b..8397d5453ec67d043fb15d948cb8ff7daa2c66ce 100644
--- a/typo3/sysext/backend/Tests/Unit/Controller/PageLayoutControllerTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Controller/PageLayoutControllerTest.php
@@ -35,11 +35,15 @@ class PageLayoutControllerTest extends UnitTestCase
     public function pageIsNotLockedForEditorsReturnsCorrectValue($isAdmin, $permissions, $editLock, $expected)
     {
         /** @var BackendUserAuthentication|\PHPUnit_Framework_MockObject_MockObject $beUserMock */
-        $beUserMock = $this->getMock(BackendUserAuthentication::class, ['isAdmin']);
+        $beUserMock = $this->getMockBuilder(BackendUserAuthentication::class)
+            ->setMethods(['isAdmin'])
+            ->getMock();
         $beUserMock->method('isAdmin')->will($this->returnValue($isAdmin));
 
         /** @var PageLayoutController|\PHPUnit_Framework_MockObject_MockObject $pageController */
-        $pageController = $this->getMock(PageLayoutController::class, ['getBackendUser']);
+        $pageController = $this->getMockBuilder(PageLayoutController::class)
+            ->setMethods(['getBackendUser'])
+            ->getMock();
         $pageController->method('getBackendUser')->will($this->returnValue($beUserMock));
 
         $pageController->CALC_PERMS = $permissions;
diff --git a/typo3/sysext/backend/Tests/Unit/Form/NodeFactoryTest.php b/typo3/sysext/backend/Tests/Unit/Form/NodeFactoryTest.php
index 2032efac2d04dd12b3ddeace28b1844418582387..a454735ec34c99770f95640399b1701f576ae832 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/NodeFactoryTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/NodeFactoryTest.php
@@ -271,7 +271,10 @@ class NodeFactoryTest extends UnitTestCase
         $this->expectExceptionCode(1431872546);
         $mockNode = new \stdClass();
         /** @var NodeFactory|\PHPUnit_Framework_MockObject_MockObject $mockSubject */
-        $mockSubject = $this->getMock(NodeFactory::class, array('instantiate'), array(), '', false);
+        $mockSubject = $this->getMockBuilder(NodeFactory::class)
+            ->setMethods(array('instantiate'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockSubject->expects($this->once())->method('instantiate')->will($this->returnValue($mockNode));
         $mockSubject->create(array('renderType' => 'foo'));
     }
@@ -331,9 +334,11 @@ class NodeFactoryTest extends UnitTestCase
                 'class' => \stdClass::class,
             ),
         );
-        $mockNode = $this->getMock(NodeInterface::class, array(), array(), '', false);
+        $mockNode = $this->createMock(NodeInterface::class);
         /** @var NodeFactory|\PHPUnit_Framework_MockObject_MockObject $mockSubject */
-        $mockSubject = $this->getMock(NodeFactory::class, array('instantiate'));
+        $mockSubject = $this->getMockBuilder(NodeFactory::class)
+            ->setMethods(array('instantiate'))
+            ->getMock();
         $mockSubject->expects($this->once())->method('instantiate')->with('stdClass')->will($this->returnValue($mockNode));
         $mockSubject->create($data);
     }
@@ -356,9 +361,11 @@ class NodeFactoryTest extends UnitTestCase
                 'class' => 'foo2Class',
             ),
         );
-        $mockNode = $this->getMock(NodeInterface::class, array(), array(), '', false);
+        $mockNode = $this->createMock(NodeInterface::class);
         /** @var NodeFactory|\PHPUnit_Framework_MockObject_MockObject $mockSubject */
-        $mockSubject = $this->getMock(NodeFactory::class, array('instantiate'));
+        $mockSubject = $this->getMockBuilder(NodeFactory::class)
+            ->setMethods(array('instantiate'))
+            ->getMock();
         $mockSubject->expects($this->once())->method('instantiate')->with('foo2Class')->will($this->returnValue($mockNode));
         $mockSubject->create($data);
     }
@@ -381,9 +388,11 @@ class NodeFactoryTest extends UnitTestCase
                 'class' => 'foo1Class',
             ),
         );
-        $mockNode = $this->getMock(NodeInterface::class, array(), array(), '', false);
+        $mockNode = $this->createMock(NodeInterface::class);
         /** @var NodeFactory|\PHPUnit_Framework_MockObject_MockObject $mockSubject */
-        $mockSubject = $this->getMock(NodeFactory::class, array('instantiate'));
+        $mockSubject = $this->getMockBuilder(NodeFactory::class)
+            ->setMethods(array('instantiate'))
+            ->getMock();
         $mockSubject->expects($this->once())->method('instantiate')->with('foo2Class')->will($this->returnValue($mockNode));
         $mockSubject->create($data);
     }
@@ -403,10 +412,12 @@ class NodeFactoryTest extends UnitTestCase
                 'class' => 'fooClass',
             ),
         );
-        $mockResolver = $this->getMock(\stdClass::class);
+        $mockResolver = $this->getMockBuilder(\stdClass::class)->getMock();
 
         /** @var NodeFactory|\PHPUnit_Framework_MockObject_MockObject $mockSubject */
-        $mockSubject = $this->getMock(NodeFactory::class, array('instantiate'));
+        $mockSubject = $this->getMockBuilder(NodeFactory::class)
+            ->setMethods(array('instantiate'))
+            ->getMock();
         $mockSubject->expects($this->at(0))->method('instantiate')->will($this->returnValue($mockResolver));
         $mockSubject->create($data);
     }
@@ -424,7 +435,7 @@ class NodeFactoryTest extends UnitTestCase
                 'class' => \stdClass::class,
             ),
         );
-        $mockNode = $this->getMock(NodeInterface::class, array(), array(), '', false);
+        $mockNode = $this->createMock(NodeInterface::class);
 
         $GLOBALS['TYPO3_CONF_VARS']['SYS']['formEngine']['nodeResolver'] = array(
             1433156887 => array(
@@ -438,11 +449,13 @@ class NodeFactoryTest extends UnitTestCase
                 'class' => 'foo2Class',
             ),
         );
-        $mockResolver1 = $this->getMock(NodeResolverInterface::class);
-        $mockResolver2 = $this->getMock(NodeResolverInterface::class);
+        $mockResolver1 = $this->getMockBuilder(NodeResolverInterface::class)->getMock();
+        $mockResolver2 = $this->getMockBuilder(NodeResolverInterface::class)->getMock();
 
         /** @var NodeFactory|\PHPUnit_Framework_MockObject_MockObject $mockSubject */
-        $mockSubject = $this->getMock(NodeFactory::class, array('instantiate'));
+        $mockSubject = $this->getMockBuilder(NodeFactory::class)
+            ->setMethods(array('instantiate'))
+            ->getMock();
         $mockSubject->expects($this->at(0))->method('instantiate')->with('foo2Class')->will($this->returnValue($mockResolver2));
         $mockSubject->expects($this->at(1))->method('instantiate')->with('foo1Class')->will($this->returnValue($mockResolver1));
         $mockSubject->expects($this->at(2))->method('instantiate')->will($this->returnValue($mockNode));
@@ -462,7 +475,7 @@ class NodeFactoryTest extends UnitTestCase
                 'class' => \stdClass::class,
             ),
         );
-        $mockNode = $this->getMock(NodeInterface::class, array(), array(), '', false);
+        $mockNode = $this->createMock(NodeInterface::class);
 
         $GLOBALS['TYPO3_CONF_VARS']['SYS']['formEngine']['nodeResolver'] = array(
             1433156887 => array(
@@ -476,11 +489,13 @@ class NodeFactoryTest extends UnitTestCase
                 'class' => 'foo2Class',
             ),
         );
-        $mockResolver1 = $this->getMock(NodeResolverInterface::class);
-        $mockResolver2 = $this->getMock(NodeResolverInterface::class);
+        $mockResolver1 = $this->getMockBuilder(NodeResolverInterface::class)->getMock();
+        $mockResolver2 = $this->getMockBuilder(NodeResolverInterface::class)->getMock();
 
         /** @var NodeFactory|\PHPUnit_Framework_MockObject_MockObject $mockSubject */
-        $mockSubject = $this->getMock(NodeFactory::class, array('instantiate'));
+        $mockSubject = $this->getMockBuilder(NodeFactory::class)
+            ->setMethods(array('instantiate'))
+            ->getMock();
         $mockSubject->expects($this->at(0))->method('instantiate')->with('foo1Class')->will($this->returnValue($mockResolver1));
         $mockSubject->expects($this->at(1))->method('instantiate')->with('foo2Class')->will($this->returnValue($mockResolver2));
         $mockSubject->expects($this->at(2))->method('instantiate')->will($this->returnValue($mockNode));
@@ -500,7 +515,7 @@ class NodeFactoryTest extends UnitTestCase
                 'class' => \stdClass::class,
             ),
         );
-        $mockNode = $this->getMock(NodeInterface::class, array(), array(), '', false);
+        $mockNode = $this->createMock(NodeInterface::class);
 
         $GLOBALS['TYPO3_CONF_VARS']['SYS']['formEngine']['nodeResolver'] = array(
             1433156887 => array(
@@ -509,11 +524,13 @@ class NodeFactoryTest extends UnitTestCase
                 'class' => 'foo1Class',
             ),
         );
-        $mockResolver1 = $this->getMock(NodeResolverInterface::class);
+        $mockResolver1 = $this->getMockBuilder(NodeResolverInterface::class)->getMock();
         $mockResolver1->expects($this->once())->method('resolve')->will($this->returnValue('fooNodeClass'));
 
         /** @var NodeFactory|\PHPUnit_Framework_MockObject_MockObject $mockSubject */
-        $mockSubject = $this->getMock(NodeFactory::class, array('instantiate'));
+        $mockSubject = $this->getMockBuilder(NodeFactory::class)
+            ->setMethods(array('instantiate'))
+            ->getMock();
         $mockSubject->expects($this->at(0))->method('instantiate')->will($this->returnValue($mockResolver1));
         $mockSubject->expects($this->at(1))->method('instantiate')->with('fooNodeClass')->will($this->returnValue($mockNode));
         $mockSubject->create($data);
@@ -532,7 +549,7 @@ class NodeFactoryTest extends UnitTestCase
                 'class' => \stdClass::class,
             ),
         );
-        $mockNode = $this->getMock(NodeInterface::class, array(), array(), '', false);
+        $mockNode = $this->createMock(NodeInterface::class);
 
         $GLOBALS['TYPO3_CONF_VARS']['SYS']['formEngine']['nodeResolver'] = array(
             1433156887 => array(
@@ -546,11 +563,13 @@ class NodeFactoryTest extends UnitTestCase
                 'class' => 'foo2Class',
             ),
         );
-        $mockResolver1 = $this->getMock(NodeResolverInterface::class);
+        $mockResolver1 = $this->getMockBuilder(NodeResolverInterface::class)->getMock();
         $mockResolver1->expects($this->once())->method('resolve')->will($this->returnValue('fooNodeClass'));
 
         /** @var NodeFactory|\PHPUnit_Framework_MockObject_MockObject $mockSubject */
-        $mockSubject = $this->getMock(NodeFactory::class, array('instantiate'));
+        $mockSubject = $this->getMockBuilder(NodeFactory::class)
+            ->setMethods(array('instantiate'))
+            ->getMock();
         $mockSubject->expects($this->at(0))->method('instantiate')->with('foo1Class')->will($this->returnValue($mockResolver1));
         $mockSubject->expects($this->at(1))->method('instantiate')->with('fooNodeClass')->will($this->returnValue($mockNode));
         $mockSubject->create($data);
diff --git a/typo3/sysext/backend/Tests/Unit/Tree/Pagetree/DataProviderTest.php b/typo3/sysext/backend/Tests/Unit/Tree/Pagetree/DataProviderTest.php
index 3092cf8c0caa65feb95fc90b065b2ccb35ec9f6d..4e01cac16c6f00eac7c478a011d38f296b995c84 100644
--- a/typo3/sysext/backend/Tests/Unit/Tree/Pagetree/DataProviderTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Tree/Pagetree/DataProviderTest.php
@@ -31,7 +31,7 @@ class DataProviderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/tree/pagetree/class.t3lib_tree_pagetree_dataprovider.php']['postProcessCollections'] = array();
         $GLOBALS['LOCKED_RECORDS'] = array();
         /** @var $backendUserMock \TYPO3\CMS\Core\Authentication\BackendUserAuthentication|\PHPUnit_Framework_MockObject_MockObject */
-        $backendUserMock = $this->getMock(\TYPO3\CMS\Core\Authentication\BackendUserAuthentication::class, array(), array(), '', false);
+        $backendUserMock = $this->createMock(\TYPO3\CMS\Core\Authentication\BackendUserAuthentication::class);
         $GLOBALS['BE_USER'] = $backendUserMock;
 
         $this->subject = new \TYPO3\CMS\Backend\Tree\Pagetree\DataProvider();
diff --git a/typo3/sysext/backend/Tests/Unit/Utility/BackendUtilityTest.php b/typo3/sysext/backend/Tests/Unit/Utility/BackendUtilityTest.php
index 109e58696f5d1e96372dc4285c85d41222c1b972..4efcaa2f7128b462c4fbb56ce86d38d503858d20 100644
--- a/typo3/sysext/backend/Tests/Unit/Utility/BackendUtilityTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Utility/BackendUtilityTest.php
@@ -223,7 +223,7 @@ class BackendUtilityTest extends UnitTestCase
      */
     public function getProcessedValueForSelectWithMMRelation()
     {
-        $GLOBALS['TYPO3_DB'] = $this->getMock(DatabaseConnection::class, array(), array(), '', false);
+        $GLOBALS['TYPO3_DB'] = $this->createMock(DatabaseConnection::class);
         $GLOBALS['TYPO3_DB']->expects($this->any())->method('fullQuoteStr')
             ->will($this->returnCallback(
                 function ($quoteStr) {
@@ -755,7 +755,7 @@ class BackendUtilityTest extends UnitTestCase
     public function getLabelsFromItemsListReturnsCorrectValue($table, $col, $keyList, $tca, array $pageTsConfig, $expectedLabel)
     {
         // Stub LanguageService and let sL() return the same value that came in again
-        $GLOBALS['LANG'] = $this->getMock(LanguageService::class, array(), array(), '', false);
+        $GLOBALS['LANG'] = $this->createMock(LanguageService::class);
         $GLOBALS['LANG']->expects($this->any())->method('sL')->will($this->returnArgument(0));
 
         $GLOBALS['TCA'][$table] = $tca;
@@ -784,7 +784,7 @@ class BackendUtilityTest extends UnitTestCase
             )
         );
         // Stub LanguageService and let sL() return the same value that came in again
-        $GLOBALS['LANG'] = $this->getMock(LanguageService::class, array(), array(), '', false);
+        $GLOBALS['LANG'] = $this->createMock(LanguageService::class);
         $GLOBALS['LANG']->expects($this->any())->method('sL')->will($this->returnArgument(0));
 
         $GLOBALS['TCA'][$table] = $tca;
@@ -812,7 +812,7 @@ class BackendUtilityTest extends UnitTestCase
             )
         );
         // Stub LanguageService and let sL() return the same value that came in again
-        $GLOBALS['LANG'] = $this->getMock(LanguageService::class, array(), array(), '', false);
+        $GLOBALS['LANG'] = $this->createMock(LanguageService::class);
         $GLOBALS['LANG']->expects($this->any())->method('sL')->will($this->returnArgument(0));
 
         $GLOBALS['TCA'][$table] = $tca;
@@ -859,7 +859,7 @@ class BackendUtilityTest extends UnitTestCase
             )
         );
 
-        $GLOBALS['BE_USER'] = $this->getMock(BackendUserAuthentication::class, array(), array(), '', false);
+        $GLOBALS['BE_USER'] = $this->createMock(BackendUserAuthentication::class);
         $GLOBALS['BE_USER']->expects($this->at(0))->method('getTSConfig')->will($this->returnValue($completeConfiguration));
         $GLOBALS['BE_USER']->expects($this->at(1))->method('getTSConfig')->will($this->returnValue(array('value' => null, 'properties' => null)));
 
@@ -1017,7 +1017,7 @@ class BackendUtilityTest extends UnitTestCase
     public function replaceL10nModeFieldsReplacesFields($table, array $row, array $tca, array $originalRow, $expected)
     {
         $GLOBALS['TCA'] = $tca;
-        $GLOBALS['TYPO3_DB'] = $this->getMock(DatabaseConnection::class);
+        $GLOBALS['TYPO3_DB'] = $this->createMock(DatabaseConnection::class);
         $GLOBALS['TYPO3_DB']->expects($this->any())->method('exec_SELECTgetSingleRow')->will($this->returnValue($originalRow));
 
         /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|BackendUtility $subject */
diff --git a/typo3/sysext/backend/Tests/Unit/View/BackendLayout/BackendLayoutCollectionTest.php b/typo3/sysext/backend/Tests/Unit/View/BackendLayout/BackendLayoutCollectionTest.php
index 202ceb6f19d27efe741bc05b052694b6dd241b32..b2f5bd490fda65f9051d71a6ad095365f86a6f23 100644
--- a/typo3/sysext/backend/Tests/Unit/View/BackendLayout/BackendLayoutCollectionTest.php
+++ b/typo3/sysext/backend/Tests/Unit/View/BackendLayout/BackendLayoutCollectionTest.php
@@ -51,7 +51,10 @@ class BackendLayoutCollectionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $identifier = $this->getUniqueId('identifier');
         $backendLayoutCollection = new \TYPO3\CMS\Backend\View\BackendLayout\BackendLayoutCollection($identifier);
         $backendLayoutIdentifier = $this->getUniqueId('identifier__');
-        $backendLayoutMock = $this->getMock(\TYPO3\CMS\Backend\View\BackendLayout\BackendLayout::class, array('getIdentifier'), array(), '', false);
+        $backendLayoutMock = $this->getMockBuilder(\TYPO3\CMS\Backend\View\BackendLayout\BackendLayout::class)
+            ->setMethods(array('getIdentifier'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $backendLayoutMock->expects($this->once())->method('getIdentifier')->will($this->returnValue($backendLayoutIdentifier));
 
         $backendLayoutCollection->add($backendLayoutMock);
@@ -67,9 +70,15 @@ class BackendLayoutCollectionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $identifier = $this->getUniqueId('identifier');
         $backendLayoutCollection = new \TYPO3\CMS\Backend\View\BackendLayout\BackendLayoutCollection($identifier);
         $backendLayoutIdentifier = $this->getUniqueId('identifier');
-        $firstBackendLayoutMock = $this->getMock(\TYPO3\CMS\Backend\View\BackendLayout\BackendLayout::class, array('getIdentifier'), array(), '', false);
+        $firstBackendLayoutMock = $this->getMockBuilder(\TYPO3\CMS\Backend\View\BackendLayout\BackendLayout::class)
+            ->setMethods(array('getIdentifier'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $firstBackendLayoutMock->expects($this->once())->method('getIdentifier')->will($this->returnValue($backendLayoutIdentifier));
-        $secondBackendLayoutMock = $this->getMock(\TYPO3\CMS\Backend\View\BackendLayout\BackendLayout::class, array('getIdentifier'), array(), '', false);
+        $secondBackendLayoutMock = $this->getMockBuilder(\TYPO3\CMS\Backend\View\BackendLayout\BackendLayout::class)
+            ->setMethods(array('getIdentifier'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $secondBackendLayoutMock->expects($this->once())->method('getIdentifier')->will($this->returnValue($backendLayoutIdentifier));
 
         $backendLayoutCollection->add($firstBackendLayoutMock);
@@ -84,7 +93,10 @@ class BackendLayoutCollectionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $identifier = $this->getUniqueId('identifier');
         $backendLayoutCollection = new \TYPO3\CMS\Backend\View\BackendLayout\BackendLayoutCollection($identifier);
         $backendLayoutIdentifier = $this->getUniqueId('identifier');
-        $backendLayoutMock = $this->getMock(\TYPO3\CMS\Backend\View\BackendLayout\BackendLayout::class, array('getIdentifier'), array(), '', false);
+        $backendLayoutMock = $this->getMockBuilder(\TYPO3\CMS\Backend\View\BackendLayout\BackendLayout::class)
+            ->setMethods(array('getIdentifier'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $backendLayoutMock->expects($this->once())->method('getIdentifier')->will($this->returnValue($backendLayoutIdentifier));
 
         $backendLayoutCollection->add($backendLayoutMock);
diff --git a/typo3/sysext/backend/Tests/Unit/View/BackendLayout/DataProviderCollectionTest.php b/typo3/sysext/backend/Tests/Unit/View/BackendLayout/DataProviderCollectionTest.php
index 9565e4ef1f18b390601682c6a78daa48d3461bc8..a113377756967065571462161c95ddc6ed475be3 100644
--- a/typo3/sysext/backend/Tests/Unit/View/BackendLayout/DataProviderCollectionTest.php
+++ b/typo3/sysext/backend/Tests/Unit/View/BackendLayout/DataProviderCollectionTest.php
@@ -40,7 +40,7 @@ class DataProviderCollectionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->expectException(\UnexpectedValueException::class);
         $this->expectExceptionCode(1381597629);
         $identifier = $this->getUniqueId('identifier__');
-        $dataProviderMock = $this->getMock('stdClass');
+        $dataProviderMock = $this->getMockBuilder('stdClass')->getMock();
 
         $this->dataProviderCollection->add($identifier, get_class($dataProviderMock));
     }
@@ -53,7 +53,7 @@ class DataProviderCollectionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->expectException(\LogicException::class);
         $this->expectExceptionCode(1381269811);
         $identifier = $this->getUniqueId('identifier');
-        $dataProviderMock = $this->getMock('stdClass');
+        $dataProviderMock = $this->getMockBuilder('stdClass')->getMock();
 
         $this->dataProviderCollection->add($identifier, get_class($dataProviderMock));
     }
@@ -65,8 +65,14 @@ class DataProviderCollectionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $backendLayoutIdentifier = $this->getUniqueId('identifier');
 
-        $dataProviderMock = $this->getMock(\TYPO3\CMS\Backend\View\BackendLayout\DefaultDataProvider::class, array('getBackendLayout'), array(), '', false);
-        $backendLayoutMock = $this->getMock(\TYPO3\CMS\Backend\View\BackendLayout\BackendLayout::class, array('getIdentifier'), array(), '', false);
+        $dataProviderMock = $this->getMockBuilder(\TYPO3\CMS\Backend\View\BackendLayout\DefaultDataProvider::class)
+            ->setMethods(array('getBackendLayout'))
+            ->disableOriginalConstructor()
+            ->getMock();
+        $backendLayoutMock = $this->getMockBuilder(\TYPO3\CMS\Backend\View\BackendLayout\BackendLayout::class)
+            ->setMethods(array('getIdentifier'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $backendLayoutMock->expects($this->any())->method('getIdentifier')->will($this->returnValue($backendLayoutIdentifier));
         $dataProviderMock->expects($this->once())->method('getBackendLayout')->will($this->returnValue($backendLayoutMock));
 
@@ -85,8 +91,14 @@ class DataProviderCollectionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $dataProviderIdentifier = $this->getUniqueId('custom');
         $backendLayoutIdentifier = $this->getUniqueId('identifier');
 
-        $dataProviderMock = $this->getMock(\TYPO3\CMS\Backend\View\BackendLayout\DefaultDataProvider::class, array('getBackendLayout'), array(), '', false);
-        $backendLayoutMock = $this->getMock(\TYPO3\CMS\Backend\View\BackendLayout\BackendLayout::class, array('getIdentifier'), array(), '', false);
+        $dataProviderMock = $this->getMockBuilder(\TYPO3\CMS\Backend\View\BackendLayout\DefaultDataProvider::class)
+            ->setMethods(array('getBackendLayout'))
+            ->disableOriginalConstructor()
+            ->getMock();
+        $backendLayoutMock = $this->getMockBuilder(\TYPO3\CMS\Backend\View\BackendLayout\BackendLayout::class)
+            ->setMethods(array('getIdentifier'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $backendLayoutMock->expects($this->any())->method('getIdentifier')->will($this->returnValue($backendLayoutIdentifier));
         $dataProviderMock->expects($this->once())->method('getBackendLayout')->will($this->returnValue($backendLayoutMock));
 
diff --git a/typo3/sysext/belog/Tests/Unit/Domain/Repository/HistoryEntryRepositoryTest.php b/typo3/sysext/belog/Tests/Unit/Domain/Repository/HistoryEntryRepositoryTest.php
index b4666366a972501f9667f91ed194fa768865aea0..5739345fc702e7a3101a5a8ce654e67bc770a673 100644
--- a/typo3/sysext/belog/Tests/Unit/Domain/Repository/HistoryEntryRepositoryTest.php
+++ b/typo3/sysext/belog/Tests/Unit/Domain/Repository/HistoryEntryRepositoryTest.php
@@ -26,8 +26,8 @@ class HistoryEntryRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 
     protected function setUp()
     {
-        $this->querySettings = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface::class);
-        $this->objectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
+        $this->querySettings = $this->getMockBuilder(\TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface::class)->getMock();
+        $this->objectManager = $this->getMockBuilder(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class)->getMock();
         $this->objectManager->expects($this->any())->method('get')->with(\TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface::class)->will($this->returnValue($this->querySettings));
     }
 
@@ -37,7 +37,10 @@ class HistoryEntryRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function initializeObjectSetsRespectStoragePidToFalse()
     {
         $this->querySettings->expects($this->atLeastOnce())->method('setRespectStoragePage')->with(false);
-        $fixture = $this->getMock(\TYPO3\CMS\Belog\Domain\Repository\HistoryEntryRepository::class, array('setDefaultQuerySettings'), array($this->objectManager));
+        $fixture = $this->getMockBuilder(\TYPO3\CMS\Belog\Domain\Repository\HistoryEntryRepository::class)
+            ->setMethods(array('setDefaultQuerySettings'))
+            ->setConstructorArgs(array($this->objectManager))
+            ->getMock();
         $fixture->expects($this->once())->method('setDefaultQuerySettings')->with($this->querySettings);
         $fixture->initializeObject();
     }
diff --git a/typo3/sysext/belog/Tests/Unit/Domain/Repository/LogEntryRepositoryTest.php b/typo3/sysext/belog/Tests/Unit/Domain/Repository/LogEntryRepositoryTest.php
index 14d07984087397f48ece5f50b7b6fac7f664432c..2f5a677dbc440e8571e74844b8d6d1bb38f18537 100644
--- a/typo3/sysext/belog/Tests/Unit/Domain/Repository/LogEntryRepositoryTest.php
+++ b/typo3/sysext/belog/Tests/Unit/Domain/Repository/LogEntryRepositoryTest.php
@@ -25,13 +25,16 @@ class LogEntryRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function initializeObjectSetsRespectStoragePidToFalse()
     {
         /** @var \TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings $querySettings */
-        $querySettings = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface::class);
-        $objectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
+        $querySettings = $this->getMockBuilder(\TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface::class)->getMock();
+        $objectManager = $this->getMockBuilder(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class)->getMock();
         $objectManager->expects($this->any())->method('get')->with(\TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface::class)->will($this->returnValue($querySettings));
-        $GLOBALS['TYPO3_DB'] = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array(), array(), '', false);
+        $GLOBALS['TYPO3_DB'] = $this->createMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class);
         $querySettings->expects($this->atLeastOnce())->method('setRespectStoragePage')->with(false);
         /** @var \TYPO3\CMS\Belog\Domain\Repository\LogEntryRepository|\PHPUnit_Framework_MockObject_MockObject $subject */
-        $subject = $this->getMock(\TYPO3\CMS\Belog\Domain\Repository\LogEntryRepository::class, array('setDefaultQuerySettings'), array($objectManager));
+        $subject = $this->getMockBuilder(\TYPO3\CMS\Belog\Domain\Repository\LogEntryRepository::class)
+            ->setMethods(array('setDefaultQuerySettings'))
+            ->setConstructorArgs(array($objectManager))
+            ->getMock();
         $subject->expects($this->once())->method('setDefaultQuerySettings')->with($querySettings);
         $subject->initializeObject();
     }
diff --git a/typo3/sysext/belog/Tests/Unit/Domain/Repository/WorkspaceRepositoryTest.php b/typo3/sysext/belog/Tests/Unit/Domain/Repository/WorkspaceRepositoryTest.php
index ef9961a419ccaa4750fabcf0b0dc68b96bf52dca..69274eb4bee25f83608c223bf702e457cf833942 100644
--- a/typo3/sysext/belog/Tests/Unit/Domain/Repository/WorkspaceRepositoryTest.php
+++ b/typo3/sysext/belog/Tests/Unit/Domain/Repository/WorkspaceRepositoryTest.php
@@ -24,11 +24,14 @@ class WorkspaceRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function initializeObjectSetsRespectStoragePidToFalse()
     {
-        $querySettings = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface::class);
-        $objectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
+        $querySettings = $this->getMockBuilder(\TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface::class)->getMock();
+        $objectManager = $this->getMockBuilder(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class)->getMock();
         $objectManager->expects($this->any())->method('get')->with(\TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface::class)->will($this->returnValue($querySettings));
         $querySettings->expects($this->atLeastOnce())->method('setRespectStoragePage')->with(false);
-        $subject = $this->getMock(\TYPO3\CMS\Belog\Domain\Repository\WorkspaceRepository::class, array('setDefaultQuerySettings'), array($objectManager));
+        $subject = $this->getMockBuilder(\TYPO3\CMS\Belog\Domain\Repository\WorkspaceRepository::class)
+            ->setMethods(array('setDefaultQuerySettings'))
+            ->setConstructorArgs(array($objectManager))
+            ->getMock();
         $subject->expects($this->once())->method('setDefaultQuerySettings')->with($querySettings);
         $subject->initializeObject();
     }
diff --git a/typo3/sysext/beuser/Tests/Unit/Domain/Repository/BackendUserRepositoryTest.php b/typo3/sysext/beuser/Tests/Unit/Domain/Repository/BackendUserRepositoryTest.php
index ab4adba77aa28a0a4606e09bf70e18af24b0d538..aa5324ae4ffc8428773a7e92fe2ee082ea85806b 100644
--- a/typo3/sysext/beuser/Tests/Unit/Domain/Repository/BackendUserRepositoryTest.php
+++ b/typo3/sysext/beuser/Tests/Unit/Domain/Repository/BackendUserRepositoryTest.php
@@ -24,7 +24,7 @@ class BackendUserRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function classCanBeInstantiated()
     {
-        $objectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class, array(), array(), '', false);
+        $objectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
         new \TYPO3\CMS\Beuser\Domain\Repository\BackendUserRepository($objectManager);
     }
 }
diff --git a/typo3/sysext/beuser/Tests/Unit/Domain/Repository/BackendUserSessionRepositoryTest.php b/typo3/sysext/beuser/Tests/Unit/Domain/Repository/BackendUserSessionRepositoryTest.php
index 70adc6945f3d01d6e79f7b5215d0c441a2f5a786..398d20e8901d57d528913149af7df4f784afc9af 100644
--- a/typo3/sysext/beuser/Tests/Unit/Domain/Repository/BackendUserSessionRepositoryTest.php
+++ b/typo3/sysext/beuser/Tests/Unit/Domain/Repository/BackendUserSessionRepositoryTest.php
@@ -24,7 +24,7 @@ class BackendUserSessionRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
      */
     public function classCanBeInstantiated()
     {
-        $objectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
+        $objectManager = $this->getMockBuilder(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class)->getMock();
         new \TYPO3\CMS\Beuser\Domain\Repository\BackendUserSessionRepository($objectManager);
     }
 }
diff --git a/typo3/sysext/beuser/Tests/Unit/Service/ModuleDataStorageServiceTest.php b/typo3/sysext/beuser/Tests/Unit/Service/ModuleDataStorageServiceTest.php
index df29dce5b4ede2d558888222cb1771f11cc79082..0e7aec5b10941689f36d5d6336bbf3ba870a075d 100644
--- a/typo3/sysext/beuser/Tests/Unit/Service/ModuleDataStorageServiceTest.php
+++ b/typo3/sysext/beuser/Tests/Unit/Service/ModuleDataStorageServiceTest.php
@@ -26,17 +26,17 @@ class ModuleDataStorageServiceTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         // The test calls several static dependencies that can not be mocked and
         // call database in the end, so we need to mock the database here.
-        $GLOBALS['TYPO3_DB'] = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array(), array(), '', false);
+        $GLOBALS['TYPO3_DB'] = $this->createMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class);
 
         // Simulate empty module data
-        $GLOBALS['BE_USER'] = $this->getMock(\TYPO3\CMS\Core\Authentication\BackendUserAuthentication::class, array(), array(), '', false);
+        $GLOBALS['BE_USER'] = $this->createMock(\TYPO3\CMS\Core\Authentication\BackendUserAuthentication::class);
         $GLOBALS['BE_USER']->uc = array();
         $GLOBALS['BE_USER']->uc['moduleData'] = array();
 
         /** @var \TYPO3\CMS\Beuser\Service\ModuleDataStorageService $subject */
         $subject = $this->getAccessibleMock(\TYPO3\CMS\Beuser\Service\ModuleDataStorageService::class, array('dummy'), array(), '', false);
-        $objectManagerMock = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManager::class, array(), array(), '', false);
-        $moduleDataMock = $this->getMock(\TYPO3\CMS\Beuser\Domain\Model\ModuleData::class, array(), array(), '', false);
+        $objectManagerMock = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
+        $moduleDataMock = $this->createMock(\TYPO3\CMS\Beuser\Domain\Model\ModuleData::class);
         $objectManagerMock
             ->expects($this->once())
             ->method('get')
diff --git a/typo3/sysext/core/Classes/Tests/BaseTestCase.php b/typo3/sysext/core/Classes/Tests/BaseTestCase.php
index 9f0f53585c28b884def163495a108f6aee01d5f3..fafb6411e1ba268e84b9231b36fa66fb37ecc716 100644
--- a/typo3/sysext/core/Classes/Tests/BaseTestCase.php
+++ b/typo3/sysext/core/Classes/Tests/BaseTestCase.php
@@ -63,15 +63,24 @@ abstract class BaseTestCase extends \PHPUnit_Framework_TestCase
             throw new \InvalidArgumentException('$originalClassName must not be empty.', 1334701880);
         }
 
-        return $this->getMock(
-            $this->buildAccessibleProxy($originalClassName),
-            $methods,
-            $arguments,
-            $mockClassName,
-            $callOriginalConstructor,
-            $callOriginalClone,
-            $callAutoload
-        );
+        $mockBuilder = $this->getMockBuilder($this->buildAccessibleProxy($originalClassName))
+            ->setMethods($methods)
+            ->setConstructorArgs($arguments)
+            ->setMockClassName($mockClassName);
+
+        if (!$callOriginalConstructor) {
+            $mockBuilder->disableOriginalConstructor();
+        }
+
+        if (!$callOriginalClone) {
+            $mockBuilder->disableOriginalClone();
+        }
+
+        if (!$callAutoload) {
+            $mockBuilder->disableAutoload();
+        }
+
+        return $mockBuilder->getMock();
     }
 
     /**
diff --git a/typo3/sysext/core/Tests/Unit/Authentication/AbstractUserAuthenticationTest.php b/typo3/sysext/core/Tests/Unit/Authentication/AbstractUserAuthenticationTest.php
index b49bbc1865d822c0d26c296bbdcb4d66619f6a49..c75b6476dd0bd0701f8a4c08021757b89e54e478 100644
--- a/typo3/sysext/core/Tests/Unit/Authentication/AbstractUserAuthenticationTest.php
+++ b/typo3/sysext/core/Tests/Unit/Authentication/AbstractUserAuthenticationTest.php
@@ -54,7 +54,9 @@ class AbstractUserAuthenticationTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         GeneralUtility::addInstance(ConnectionPool::class, $connectionPool->reveal());
 
         /** @var $mock \TYPO3\CMS\Core\Authentication\AbstractUserAuthentication */
-        $mock = $this->getMock(\TYPO3\CMS\Core\Authentication\AbstractUserAuthentication::class, array('dummy'));
+        $mock = $this->getMockBuilder(\TYPO3\CMS\Core\Authentication\AbstractUserAuthentication::class)
+            ->setMethods(array('dummy'))
+            ->getMock();
         $mock->checkPid = true;
         $mock->checkPid_value = null;
         $mock->user_table = 'be_users';
diff --git a/typo3/sysext/core/Tests/Unit/Authentication/BackendUserAuthenticationTest.php b/typo3/sysext/core/Tests/Unit/Authentication/BackendUserAuthenticationTest.php
index e5ecd2701c8eb2ba9d0321497c732a9b8688b82d..5f5f741bde196d5f0f42626c0c2e7024cff516fc 100644
--- a/typo3/sysext/core/Tests/Unit/Authentication/BackendUserAuthenticationTest.php
+++ b/typo3/sysext/core/Tests/Unit/Authentication/BackendUserAuthenticationTest.php
@@ -94,12 +94,15 @@ class BackendUserAuthenticationTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         );
 
         // logoff() call the static factory that has a dependency to a valid BE_USER object. Mock this away
-        $GLOBALS['BE_USER'] = $this->getMock(BackendUserAuthentication::class, array(), array(), '', false);
+        $GLOBALS['BE_USER'] = $this->createMock(BackendUserAuthentication::class);
         $GLOBALS['BE_USER']->user = array('uid' => $this->getUniqueId());
-        $GLOBALS['TYPO3_DB'] = $this->getMock(DatabaseConnection::class, array(), array(), '', false);
+        $GLOBALS['TYPO3_DB'] = $this->createMock(DatabaseConnection::class);
 
         /** @var BackendUserAuthentication|\PHPUnit_Framework_MockObject_MockObject $subject */
-        $subject = $this->getMock(BackendUserAuthentication::class, array('dummy'), array(), '', false);
+        $subject = $this->getMockBuilder(BackendUserAuthentication::class)
+            ->setMethods(array('dummy'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $subject->logoff();
     }
 
@@ -250,7 +253,10 @@ class BackendUserAuthenticationTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function getTSConfigReturnsCorrectArrayForGivenObjectString(array $completeConfiguration, $objectString, array $expectedConfiguration)
     {
-        $subject = $this->getMock(BackendUserAuthentication::class, array('dummy'), array(), '', false);
+        $subject = $this->getMockBuilder(BackendUserAuthentication::class)
+            ->setMethods(array('dummy'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $subject->userTS = $completeConfiguration;
 
         $actualConfiguration = $subject->getTSConfig($objectString);
@@ -316,7 +322,9 @@ class BackendUserAuthenticationTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function getFilePermissionsTakesUserDefaultPermissionsFromTsConfigIntoAccountIfUserIsNotAdmin(array $userTsConfiguration)
     {
-        $subject = $this->getMock(BackendUserAuthentication::class, array('isAdmin'));
+        $subject = $this->getMockBuilder(BackendUserAuthentication::class)
+            ->setMethods(array('isAdmin'))
+            ->getMock();
 
         $subject
             ->expects($this->any())
@@ -451,8 +459,10 @@ class BackendUserAuthenticationTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function getFilePermissionsFromStorageOverwritesDefaultPermissions(array $defaultPermissions, $storageUid, array $storagePermissions, array $expectedPermissions)
     {
-        $subject = $this->getMock(BackendUserAuthentication::class, array('isAdmin', 'getFilePermissions'));
-        $storageMock = $this->getMock(\TYPO3\CMS\Core\Resource\ResourceStorage::class, array(), array(), '', false);
+        $subject = $this->getMockBuilder(BackendUserAuthentication::class)
+            ->setMethods(array('isAdmin', 'getFilePermissions'))
+            ->getMock();
+        $storageMock = $this->createMock(\TYPO3\CMS\Core\Resource\ResourceStorage::class);
         $storageMock->expects($this->any())->method('getUid')->will($this->returnValue($storageUid));
 
         $subject
@@ -487,8 +497,10 @@ class BackendUserAuthenticationTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function getFilePermissionsFromStorageAlwaysReturnsDefaultPermissionsForAdmins(array $defaultPermissions, $storageUid, array $storagePermissions)
     {
-        $subject = $this->getMock(BackendUserAuthentication::class, array('isAdmin', 'getFilePermissions'));
-        $storageMock = $this->getMock(\TYPO3\CMS\Core\Resource\ResourceStorage::class, array(), array(), '', false);
+        $subject = $this->getMockBuilder(BackendUserAuthentication::class)
+            ->setMethods(array('isAdmin', 'getFilePermissions'))
+            ->getMock();
+        $storageMock = $this->createMock(\TYPO3\CMS\Core\Resource\ResourceStorage::class);
         $storageMock->expects($this->any())->method('getUid')->will($this->returnValue($storageUid));
 
         $subject
@@ -629,7 +641,9 @@ class BackendUserAuthenticationTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function getFilePermissionsTakesUserDefaultPermissionsFromRecordIntoAccountIfUserIsNotAdmin($permissionValue, $expectedPermissions)
     {
-        $subject = $this->getMock(BackendUserAuthentication::class, array('isAdmin'));
+        $subject = $this->getMockBuilder(BackendUserAuthentication::class)
+            ->setMethods(array('isAdmin'))
+            ->getMock();
 
         $subject
             ->expects($this->any())
@@ -646,7 +660,9 @@ class BackendUserAuthenticationTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function getFilePermissionsGrantsAllPermissionsToAdminUsers()
     {
-        $subject = $this->getMock(BackendUserAuthentication::class, array('isAdmin'));
+        $subject = $this->getMockBuilder(BackendUserAuthentication::class)
+            ->setMethods(array('isAdmin'))
+            ->getMock();
 
         $subject
             ->expects($this->any())
@@ -679,7 +695,9 @@ class BackendUserAuthenticationTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function jsConfirmationReturnsTrueIfPassedValueEqualsConfiguration()
     {
-        $subject = $this->getMock(BackendUserAuthentication::class, ['getTSConfig']);
+        $subject = $this->getMockBuilder(BackendUserAuthentication::class)
+            ->setMethods(['getTSConfig'])
+            ->getMock();
         $subject->method('getTSConfig')->with('options.alertPopups')->willReturn(['value' => 1]);
 
         $this->assertTrue($subject->jsConfirmation(JsConfirmation::TYPE_CHANGE));
@@ -691,7 +709,9 @@ class BackendUserAuthenticationTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function jsConfirmationAllowsSettingMultipleBitsInValue()
     {
-        $subject = $this->getMock(BackendUserAuthentication::class, ['getTSConfig']);
+        $subject = $this->getMockBuilder(BackendUserAuthentication::class)
+            ->setMethods(['getTSConfig'])
+            ->getMock();
         $subject->method('getTSConfig')->with('options.alertPopups')->willReturn(['value' => 3]);
 
         $this->assertTrue($subject->jsConfirmation(JsConfirmation::TYPE_CHANGE));
@@ -703,7 +723,9 @@ class BackendUserAuthenticationTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function jsConfirmationAlwaysReturnsFalseIfNoConfirmationIsSet()
     {
-        $subject = $this->getMock(BackendUserAuthentication::class, ['getTSConfig']);
+        $subject = $this->getMockBuilder(BackendUserAuthentication::class)
+            ->setMethods(['getTSConfig'])
+            ->getMock();
         $subject->method('getTSConfig')->with('options.alertPopups')->willReturn(['value' => 0]);
 
         $this->assertFalse($subject->jsConfirmation(JsConfirmation::TYPE_CHANGE));
@@ -715,7 +737,9 @@ class BackendUserAuthenticationTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function jsConfirmationReturnsTrueIfConfigurationIsMissing()
     {
-        $subject = $this->getMock(BackendUserAuthentication::class, ['getTSConfig']);
+        $subject = $this->getMockBuilder(BackendUserAuthentication::class)
+            ->setMethods(['getTSConfig'])
+            ->getMock();
 
         $this->assertTrue($subject->jsConfirmation(JsConfirmation::TYPE_CHANGE));
     }
@@ -798,7 +822,9 @@ class BackendUserAuthenticationTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         }
 
         /** @var BackendUserAuthentication|\PHPUnit_Framework_MockObject_MockObject $subject */
-        $subject = $this->getMock(BackendUserAuthentication::class, ['isAdmin']);
+        $subject = $this->getMockBuilder(BackendUserAuthentication::class)
+            ->setMethods(['isAdmin'])
+            ->getMock();
         $subject->expects($this->any())
             ->method('isAdmin')
             ->will($this->returnValue($admin));
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Backend/ApcBackendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Backend/ApcBackendTest.php
index 344abe6f8e799a6b90368fb74245c23a24a5f0d2..19e804627c068067023c116a814902b5e74fb39f 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Backend/ApcBackendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Backend/ApcBackendTest.php
@@ -146,17 +146,16 @@ class ApcBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function setCacheIsSettingIdentifierPrefixWithCacheIdentifier()
     {
         /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $cacheMock */
-        $cacheMock = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', false);
+        $cacheMock = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class);
         $cacheMock->expects($this->any())->method('getIdentifier')->will($this->returnValue(
             'testidentifier'
         ));
 
         /** @var $backendMock \PHPUnit_Framework_MockObject_MockObject|ApcBackend */
-        $backendMock = $this->getMock(
-            ApcBackend::class,
-            array('setIdentifierPrefix', 'getCurrentUserData', 'getPathSite'),
-            array('testcontext')
-        );
+        $backendMock = $this->getMockBuilder(ApcBackend::class)
+            ->setMethods(array('setIdentifierPrefix', 'getCurrentUserData', 'getPathSite'))
+            ->setConstructorArgs(array('testcontext'))
+            ->getMock();
 
         $backendMock->expects($this->once())->method('getCurrentUserData')->will(
             $this->returnValue(array('name' => 'testname'))
@@ -231,13 +230,13 @@ class ApcBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function flushRemovesOnlyOwnEntries()
     {
         /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $thisCache */
-        $thisCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', false);
+        $thisCache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class);
         $thisCache->expects($this->any())->method('getIdentifier')->will($this->returnValue('thisCache'));
         $thisBackend = new ApcBackend('Testing');
         $thisBackend->setCache($thisCache);
 
         /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $thatCache */
-        $thatCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', false);
+        $thatCache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class);
         $thatCache->expects($this->any())->method('getIdentifier')->will($this->returnValue('thatCache'));
         $thatBackend = new ApcBackend('Testing');
         $thatBackend->setCache($thatCache);
@@ -294,7 +293,7 @@ class ApcBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     protected function setUpBackend($accessible = false)
     {
         /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $cache */
-        $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', false);
+        $cache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class);
         if ($accessible) {
             $accessibleClassName = $this->buildAccessibleProxy(ApcBackend::class);
             $backend = new $accessibleClassName('Testing');
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Backend/FileBackendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Backend/FileBackendTest.php
index 8a3822cb290c59956f4ac12e6dc271ef3418f31b..a7b805cc64919e3ab7d391daedef147e3cb05071 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Backend/FileBackendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Backend/FileBackendTest.php
@@ -49,9 +49,12 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->expectException(\TYPO3\CMS\Core\Cache\Exception::class);
         $this->expectExceptionCode(1303669848);
 
-        $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', false);
+        $mockCache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class);
 
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('dummy'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class)
+            ->setMethods(array('dummy'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $backend->setCacheDirectory('http://localhost/');
 
         $backend->setCache($mockCache);
@@ -158,10 +161,13 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function getCacheDirectoryReturnsTheCurrentCacheDirectory()
     {
-        $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', false);
+        $mockCache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class);
         $mockCache->expects($this->any())->method('getIdentifier')->will($this->returnValue('SomeCache'));
 
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('dummy'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class)
+            ->setMethods(array('dummy'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $backend->setCacheDirectory('vfs://Foo/');
         $backend->setCache($mockCache);
 
@@ -173,10 +179,13 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function aDedicatedCacheDirectoryIsUsedForCodeCaches()
     {
-        $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\PhpFrontend::class, array(), array(), '', false);
+        $mockCache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\PhpFrontend::class);
         $mockCache->expects($this->any())->method('getIdentifier')->will($this->returnValue('SomeCache'));
 
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('dummy'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class)
+            ->setMethods(array('dummy'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $backend->setCacheDirectory('vfs://Foo/');
         $backend->setCache($mockCache);
 
@@ -191,9 +200,12 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->expectException(InvalidDataException::class);
         $this->expectExceptionCode(1204481674);
 
-        $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', false);
+        $mockCache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class);
 
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('dummy'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class)
+            ->setMethods(array('dummy'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $backend->setCacheDirectory('vfs://Foo/');
         $backend->setCache($mockCache);
 
@@ -205,14 +217,17 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function setReallySavesToTheSpecifiedDirectory()
     {
-        $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', false);
+        $mockCache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class);
         $mockCache->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('UnitTestCache'));
 
         $data = 'some data' . microtime();
         $entryIdentifier = 'BackendFileTest';
         $pathAndFilename = 'vfs://Foo/Cache/Data/UnitTestCache/' . $entryIdentifier;
 
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('dummy'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class)
+            ->setMethods(array('dummy'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $backend->setCacheDirectory('vfs://Foo/');
         $backend->setCache($mockCache);
 
@@ -228,14 +243,17 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function setOverwritesAnAlreadyExistingCacheEntryForTheSameIdentifier()
     {
-        $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', false);
+        $mockCache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class);
         $mockCache->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('UnitTestCache'));
 
         $data1 = 'some data' . microtime();
         $data2 = 'some data' . microtime();
         $entryIdentifier = 'BackendFileRemoveBeforeSetTest';
 
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('dummy'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class)
+            ->setMethods(array('dummy'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $backend->setCacheDirectory('vfs://Foo/');
         $backend->setCache($mockCache);
 
@@ -253,13 +271,16 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function setAlsoSavesSpecifiedTags()
     {
-        $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', false);
+        $mockCache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class);
         $mockCache->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('UnitTestCache'));
 
         $data = 'some data' . microtime();
         $entryIdentifier = 'BackendFileRemoveBeforeSetTest';
 
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('dummy'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class)
+            ->setMethods(array('dummy'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $backend->setCacheDirectory('vfs://Foo/');
         $backend->setCache($mockCache);
 
@@ -276,13 +297,16 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function setCacheDetectsAndLoadsAFrozenCache()
     {
-        $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', false);
+        $mockCache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class);
         $mockCache->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('UnitTestCache'));
 
         $data = 'some data' . microtime();
         $entryIdentifier = 'BackendFileTest';
 
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('dummy'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class)
+            ->setMethods(array('dummy'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $backend->setCacheDirectory('vfs://Foo/');
         $backend->setCache($mockCache);
 
@@ -292,7 +316,10 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 
         unset($backend);
 
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('dummy'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class)
+            ->setMethods(array('dummy'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $backend->setCacheDirectory('vfs://Foo/');
         $backend->setCache($mockCache);
 
@@ -305,10 +332,13 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function getReturnsContentOfTheCorrectCacheFile()
     {
-        $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', false);
+        $mockCache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class);
         $mockCache->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('UnitTestCache'));
 
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('setTag'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class)
+            ->setMethods(array('setTag'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $backend->setCacheDirectory('vfs://Foo/');
         $backend->setCache($mockCache);
 
@@ -329,10 +359,13 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function getReturnsFalseForExpiredEntries()
     {
-        $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', false);
+        $mockCache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class);
         $mockCache->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('UnitTestCache'));
 
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('isCacheFileExpired'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class)
+            ->setMethods(array('isCacheFileExpired'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $backend->expects($this->once())->method('isCacheFileExpired')->with('vfs://Foo/Cache/Data/UnitTestCache/ExpiredEntry')->will($this->returnValue(true));
         $backend->setCacheDirectory('vfs://Foo/');
         $backend->setCache($mockCache);
@@ -345,10 +378,13 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function getDoesNotCheckIfAnEntryIsExpiredIfTheCacheIsFrozen()
     {
-        $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', false);
+        $mockCache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class);
         $mockCache->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('UnitTestCache'));
 
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('isCacheFileExpired'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class)
+            ->setMethods(array('isCacheFileExpired'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $backend->setCacheDirectory('vfs://Foo/');
         $backend->setCache($mockCache);
 
@@ -365,10 +401,13 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function hasReturnsTrueIfAnEntryExists()
     {
-        $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', false);
+        $mockCache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class);
         $mockCache->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('UnitTestCache'));
 
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('dummy'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class)
+            ->setMethods(array('dummy'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $backend->setCacheDirectory('vfs://Foo/');
         $backend->setCache($mockCache);
 
@@ -386,7 +425,10 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function hasReturnsFalseForExpiredEntries()
     {
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('isCacheFileExpired'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class)
+            ->setMethods(array('isCacheFileExpired'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $backend->expects($this->exactly(2))->method('isCacheFileExpired')->will($this->onConsecutiveCalls(true, false));
 
         $this->assertFalse($backend->has('foo'));
@@ -398,10 +440,13 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function hasDoesNotCheckIfAnEntryIsExpiredIfTheCacheIsFrozen()
     {
-        $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', false);
+        $mockCache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class);
         $mockCache->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('UnitTestCache'));
 
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('isCacheFileExpired'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class)
+            ->setMethods(array('isCacheFileExpired'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $backend->setCacheDirectory('vfs://Foo/');
         $backend->setCache($mockCache);
 
@@ -418,14 +463,17 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function removeReallyRemovesACacheEntry()
     {
-        $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', false);
+        $mockCache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class);
         $mockCache->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('UnitTestCache'));
 
         $data = 'some data' . microtime();
         $entryIdentifier = 'BackendFileTest';
         $pathAndFilename = 'vfs://Foo/Cache/Data/UnitTestCache/' . $entryIdentifier;
 
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('dummy'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class)
+            ->setMethods(array('dummy'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $backend->setCacheDirectory('vfs://Foo/');
         $backend->setCache($mockCache);
 
@@ -465,10 +513,13 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionCode(1282073032);
 
-        $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', false);
+        $mockCache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class);
         $mockCache->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('UnitTestCache'));
 
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('dummy'), array('test'), '', true);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class)
+            ->setMethods(array('dummy'))
+            ->setConstructorArgs(array('test'))
+            ->getMock();
         $backend->setCacheDirectory('vfs://Foo/');
         $backend->setCache($mockCache);
 
@@ -484,10 +535,13 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionCode(1282073033);
 
-        $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', false);
+        $mockCache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class);
         $mockCache->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('UnitTestCache'));
 
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('dummy'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class)
+            ->setMethods(array('dummy'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $backend->setCacheDirectory('vfs://Foo/');
         $backend->setCache($mockCache);
 
@@ -503,7 +557,11 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionCode(1282073034);
 
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('dummy'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class)
+            ->setMethods(array('dummy'))
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $backend->has($identifier);
     }
 
@@ -516,10 +574,13 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionCode(1282073035);
 
-        $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', false);
+        $mockCache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class);
         $mockCache->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('UnitTestCache'));
 
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('dummy'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class)
+            ->setMethods(array('dummy'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $backend->setCacheDirectory('vfs://Foo/');
         $backend->setCache($mockCache);
 
@@ -535,10 +596,13 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionCode(1282073036);
 
-        $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', false);
+        $mockCache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class);
         $mockCache->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('UnitTestCache'));
 
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('dummy'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class)
+            ->setMethods(array('dummy'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $backend->setCacheDirectory('vfs://Foo/');
         $backend->setCache($mockCache);
 
@@ -550,10 +614,13 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function requireOnceIncludesAndReturnsResultOfIncludedPhpFile()
     {
-        $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', false);
+        $mockCache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class);
         $mockCache->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('UnitTestCache'));
 
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('dummy'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class)
+            ->setMethods(array('dummy'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $backend->setCacheDirectory('vfs://Foo/');
         $backend->setCache($mockCache);
 
@@ -571,10 +638,13 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function requireOnceDoesNotCheckExpiryTimeIfBackendIsFrozen()
     {
-        $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', false);
+        $mockCache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class);
         $mockCache->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('UnitTestCache'));
 
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('isCacheFileExpired'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class)
+            ->setMethods(array('isCacheFileExpired'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $backend->setCacheDirectory('vfs://Foo/');
         $backend->setCache($mockCache);
 
@@ -594,10 +664,13 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function findIdentifiersByTagFindsCacheEntriesWithSpecifiedTag()
     {
-        $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', false);
+        $mockCache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class);
         $mockCache->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('UnitTestCache'));
 
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('dummy'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class)
+            ->setMethods(array('dummy'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $backend->setCacheDirectory('vfs://Foo/');
         $backend->setCache($mockCache);
 
@@ -618,10 +691,13 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function findIdentifiersByTagDoesNotReturnExpiredEntries()
     {
-        $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', false);
+        $mockCache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class);
         $mockCache->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('UnitTestCache'));
 
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('dummy'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class)
+            ->setMethods(array('dummy'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $backend->setCacheDirectory('vfs://Foo/');
         $backend->setCache($mockCache);
 
@@ -639,10 +715,13 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function flushRemovesAllCacheEntries()
     {
-        $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', false);
+        $mockCache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class);
         $mockCache->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('UnitTestCache'));
 
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('dummy'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class)
+            ->setMethods(array('dummy'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $backend->setCacheDirectory('vfs://Foo/');
         $backend->setCache($mockCache);
 
@@ -664,10 +743,13 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function flushCreatesCacheDirectoryAgain()
     {
-        $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', false);
+        $mockCache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class);
         $mockCache->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('UnitTestCache'));
 
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('dummy'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class)
+            ->setMethods(array('dummy'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $backend->setCacheDirectory('vfs://Foo/');
         $backend->setCache($mockCache);
 
@@ -680,7 +762,10 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function flushByTagRemovesCacheEntriesWithSpecifiedTag()
     {
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('findIdentifiersByTag', 'remove'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class)
+            ->setMethods(array('findIdentifiersByTag', 'remove'))
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $backend->expects($this->once())->method('findIdentifiersByTag')->with('UnitTestTag%special')->will($this->returnValue(array('foo', 'bar', 'baz')));
         $backend->expects($this->at(1))->method('remove')->with('foo');
@@ -695,10 +780,13 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function collectGarbageRemovesExpiredCacheEntries()
     {
-        $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', false);
+        $mockCache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class);
         $mockCache->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('UnitTestCache'));
 
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('isCacheFileExpired'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class)
+            ->setMethods(array('isCacheFileExpired'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $backend->expects($this->exactly(2))->method('isCacheFileExpired')->will($this->onConsecutiveCalls(true, false));
         $backend->setCacheDirectory('vfs://Foo/');
         $backend->setCache($mockCache);
@@ -720,10 +808,13 @@ class FileBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function flushUnfreezesTheCache()
     {
-        $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', false);
+        $mockCache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class);
         $mockCache->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('UnitTestCache'));
 
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, array('dummy'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class)
+            ->setMethods(array('dummy'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $backend->setCacheDirectory('vfs://Foo/');
         $backend->setCache($mockCache);
 
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Backend/MemcachedBackendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Backend/MemcachedBackendTest.php
index 9fd2bea4554b7600b93d85cae046ef985311fe58..83ebb5d910c7ae17e165f328b013e01edc619544 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Backend/MemcachedBackendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Backend/MemcachedBackendTest.php
@@ -215,14 +215,14 @@ class MemcachedBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $backendOptions = array('servers' => array('localhost:11211'));
         /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $thisCache */
-        $thisCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', false);
+        $thisCache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class);
         $thisCache->expects($this->any())->method('getIdentifier')->will($this->returnValue('thisCache'));
         $thisBackend = new MemcachedBackend('Testing', $backendOptions);
         $thisBackend->setCache($thisCache);
         $thisBackend->initializeObject();
 
         /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $thatCache */
-        $thatCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', false);
+        $thatCache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class);
         $thatCache->expects($this->any())->method('getIdentifier')->will($this->returnValue('thatCache'));
         $thatBackend = new MemcachedBackend('Testing', $backendOptions);
         $thatBackend->setCache($thatCache);
@@ -282,7 +282,7 @@ class MemcachedBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     protected function setUpBackend(array $backendOptions = array(), $accessible = false)
     {
         /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $cache */
-        $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', false);
+        $cache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class);
         if ($backendOptions == array()) {
             $backendOptions = array('servers' => array('localhost:11211'));
         }
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Backend/PdoBackendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Backend/PdoBackendTest.php
index 11cab0a876baeba1e16e11a6c612510e29fa8bcb..cc19e9cd5ac0b47f4b1426878eac4fbaad9e9b03 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Backend/PdoBackendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Backend/PdoBackendTest.php
@@ -197,11 +197,11 @@ class PdoBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function flushRemovesOnlyOwnEntries()
     {
-        $thisCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', false);
+        $thisCache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class);
         $thisCache->expects($this->any())->method('getIdentifier')->will($this->returnValue('thisCache'));
         $thisBackend = $this->setUpBackend();
         $thisBackend->setCache($thisCache);
-        $thatCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', false);
+        $thatCache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class);
         $thatCache->expects($this->any())->method('getIdentifier')->will($this->returnValue('thatCache'));
         $thatBackend = $this->setUpBackend();
         $thatBackend->setCache($thatCache);
@@ -258,7 +258,7 @@ class PdoBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     protected function setUpBackend()
     {
-        $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', false);
+        $mockCache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class);
         $mockCache->expects($this->any())->method('getIdentifier')->will($this->returnValue('TestCache'));
         $backend = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Cache\Backend\PdoBackend::class, 'Testing');
         $backend->setCache($mockCache);
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Backend/RedisBackendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Backend/RedisBackendTest.php
index 9606124f9bd85bbff59d2b5e03805b6f17563029..bf4b5782590f33aad60d2060be4b81a72f73b7cd 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Backend/RedisBackendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Backend/RedisBackendTest.php
@@ -68,7 +68,7 @@ class RedisBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     protected function setUpBackend(array $backendOptions = array())
     {
-        $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', false);
+        $mockCache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class);
         $mockCache->expects($this->any())->method('getIdentifier')->will($this->returnValue('TestCache'));
         $this->backend = new \TYPO3\CMS\Core\Cache\Backend\RedisBackend('Testing', $backendOptions);
         $this->backend->setCache($mockCache);
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Backend/TransientMemoryBackendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Backend/TransientMemoryBackendTest.php
index a2ec6daa188b493b06fe65d5c8d23f636b34169a..d795ef4fc2502293b9cf8a366a241dcf3b36e6c9 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Backend/TransientMemoryBackendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Backend/TransientMemoryBackendTest.php
@@ -40,7 +40,7 @@ class TransientMemoryBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function itIsPossibleToSetAndCheckExistenceInCache()
     {
-        $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', false);
+        $cache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class);
         $backend = new \TYPO3\CMS\Core\Cache\Backend\TransientMemoryBackend('Testing');
         $backend->setCache($cache);
         $data = 'Some data';
@@ -55,7 +55,7 @@ class TransientMemoryBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function itIsPossibleToSetAndGetEntry()
     {
-        $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', false);
+        $cache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class);
         $backend = new \TYPO3\CMS\Core\Cache\Backend\TransientMemoryBackend('Testing');
         $backend->setCache($cache);
         $data = 'Some data';
@@ -70,7 +70,7 @@ class TransientMemoryBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function itIsPossibleToRemoveEntryFromCache()
     {
-        $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', false);
+        $cache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class);
         $backend = new \TYPO3\CMS\Core\Cache\Backend\TransientMemoryBackend('Testing');
         $backend->setCache($cache);
         $data = 'Some data';
@@ -86,7 +86,7 @@ class TransientMemoryBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function itIsPossibleToOverwriteAnEntryInTheCache()
     {
-        $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', false);
+        $cache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class);
         $backend = new \TYPO3\CMS\Core\Cache\Backend\TransientMemoryBackend('Testing');
         $backend->setCache($cache);
         $data = 'Some data';
@@ -103,7 +103,7 @@ class TransientMemoryBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function findIdentifiersByTagFindsCacheEntriesWithSpecifiedTag()
     {
-        $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', false);
+        $cache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class);
         $backend = new \TYPO3\CMS\Core\Cache\Backend\TransientMemoryBackend('Testing');
         $backend->setCache($cache);
         $data = 'Some data';
@@ -120,7 +120,7 @@ class TransientMemoryBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function hasReturnsFalseIfTheEntryDoesntExist()
     {
-        $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', false);
+        $cache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class);
         $backend = new \TYPO3\CMS\Core\Cache\Backend\TransientMemoryBackend('Testing');
         $backend->setCache($cache);
         $identifier = 'NonExistingIdentifier';
@@ -133,7 +133,7 @@ class TransientMemoryBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function removeReturnsFalseIfTheEntryDoesntExist()
     {
-        $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', false);
+        $cache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class);
         $backend = new \TYPO3\CMS\Core\Cache\Backend\TransientMemoryBackend('Testing');
         $backend->setCache($cache);
         $identifier = 'NonExistingIdentifier';
@@ -146,7 +146,7 @@ class TransientMemoryBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function flushByTagRemovesCacheEntriesWithSpecifiedTag()
     {
-        $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', false);
+        $cache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class);
         $backend = new \TYPO3\CMS\Core\Cache\Backend\TransientMemoryBackend('Testing');
         $backend->setCache($cache);
         $data = 'some data' . microtime();
@@ -164,7 +164,7 @@ class TransientMemoryBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function flushRemovesAllCacheEntries()
     {
-        $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', false);
+        $cache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class);
         $backend = new \TYPO3\CMS\Core\Cache\Backend\TransientMemoryBackend('Testing');
         $backend->setCache($cache);
         $data = 'some data' . microtime();
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Backend/Typo3DatabaseBackendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Backend/Typo3DatabaseBackendTest.php
index 65ed04899698f792bd167e75897595c5fc72ea61..f1db2c06cb4957c77eaf8b961a19883088a0da71 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Backend/Typo3DatabaseBackendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Backend/Typo3DatabaseBackendTest.php
@@ -33,7 +33,7 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     protected function setUpMockFrontendOfBackend(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend $backend)
     {
-        $mockCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class, array(), array(), '', false);
+        $mockCache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class);
         $mockCache->expects($this->any())->method('getIdentifier')->will($this->returnValue('Testing'));
         $backend->setCache($mockCache);
         return $mockCache;
@@ -45,7 +45,10 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function setCacheCalculatesCacheTableName()
     {
         /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class)
+            ->setMethods(array('dummy'))
+            ->setConstructorArgs(array('Testing'))
+            ->getMock();
         $this->setUpMockFrontendOfBackend($backend);
         $this->assertEquals('cf_Testing', $backend->getCacheTable());
     }
@@ -56,7 +59,10 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function setCacheCalculatesTagsTableName()
     {
         /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class)
+            ->setMethods(array('dummy'))
+            ->setConstructorArgs(array('Testing'))
+            ->getMock();
         $this->setUpMockFrontendOfBackend($backend);
         $this->assertEquals('cf_Testing_tags', $backend->getTagsTable());
     }
@@ -70,7 +76,10 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->expectExceptionCode(1236518288);
 
         /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class)
+            ->setMethods(array('dummy'))
+            ->setConstructorArgs(array('Testing'))
+            ->getMock();
         $backend->set('identifier', 'data');
     }
 
@@ -83,7 +92,10 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->expectExceptionCode(1236518298);
 
         /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class)
+            ->setMethods(array('dummy'))
+            ->setConstructorArgs(array('Testing'))
+            ->getMock();
         $this->setUpMockFrontendOfBackend($backend);
         $data = array('Some data');
         $entryIdentifier = 'BackendDbTest';
@@ -96,9 +108,12 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function setInsertsEntryInTable()
     {
         /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class)
+            ->setMethods(array('dummy'))
+            ->setConstructorArgs(array('Testing'))
+            ->getMock();
         $this->setUpMockFrontendOfBackend($backend);
-        $GLOBALS['TYPO3_DB'] = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array(), array(), '', false);
+        $GLOBALS['TYPO3_DB'] = $this->createMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class);
         $GLOBALS['TYPO3_DB']
             ->expects($this->once())
             ->method('exec_INSERTquery')
@@ -120,9 +135,12 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function setRemovesAnAlreadyExistingCacheEntryForTheSameIdentifier()
     {
         /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('remove'), array('Testing'));
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class)
+            ->setMethods(array('remove'))
+            ->setConstructorArgs(array('Testing'))
+            ->getMock();
         $this->setUpMockFrontendOfBackend($backend);
-        $GLOBALS['TYPO3_DB'] = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array(), array(), '', false);
+        $GLOBALS['TYPO3_DB'] = $this->createMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class);
 
         $backend->expects($this->once())->method('remove');
         $data = $this->getUniqueId('someData');
@@ -136,11 +154,14 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function setReallySavesSpecifiedTags()
     {
         /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class)
+            ->setMethods(array('dummy'))
+            ->setConstructorArgs(array('Testing'))
+            ->getMock();
         $this->setUpMockFrontendOfBackend($backend);
-        $GLOBALS['TYPO3_DB'] = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array(), array(), '', false);
-        $connectionPool = $this->getMock(ConnectionPool::class);
-        $connection = $this->getMock(Connection::class, array(), array(), '', false);
+        $GLOBALS['TYPO3_DB'] = $this->createMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class);
+        $connectionPool = $this->createMock(ConnectionPool::class);
+        $connection = $this->createMock(Connection::class);
         $connectionPool->expects($this->once())->method('getConnectionForTable')->willReturn($connection);
         $connection->expects($this->once())->method('bulkInsert')->with(
             'cf_Testing_tags',
@@ -173,14 +194,14 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             'compression' => true
         );
         /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-        $backend = $this->getMock(
-            \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class,
-            array('dummy'),
-            array('Testing', $backendOptions)
-        );
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class)
+            ->setMethods(array('dummy'))
+            ->setConstructorArgs(array('Testing', $backendOptions))
+            ->getMock();
+
         $this->setUpMockFrontendOfBackend($backend);
 
-        $GLOBALS['TYPO3_DB'] = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array(), array(), '', false);
+        $GLOBALS['TYPO3_DB'] = $this->createMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class);
         $GLOBALS['TYPO3_DB']
             ->expects($this->once())
             ->method('exec_INSERTquery')
@@ -203,10 +224,13 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function setWithUnlimitedLifetimeWritesCorrectEntry()
     {
         /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class)
+            ->setMethods(array('dummy'))
+            ->setConstructorArgs(array('Testing'))
+            ->getMock();
         $this->setUpMockFrontendOfBackend($backend);
 
-        $GLOBALS['TYPO3_DB'] = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array(), array(), '', false);
+        $GLOBALS['TYPO3_DB'] = $this->createMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class);
         $GLOBALS['TYPO3_DB']
             ->expects($this->once())
             ->method('exec_INSERTquery')
@@ -233,7 +257,10 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->expectExceptionCode(1236518288);
 
         /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class)
+            ->setMethods(array('dummy'))
+            ->setConstructorArgs(array('Testing'))
+            ->getMock();
         $backend->get('identifier');
     }
 
@@ -243,10 +270,13 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function getReturnsContentOfTheCorrectCacheEntry()
     {
         /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class)
+            ->setMethods(array('dummy'))
+            ->setConstructorArgs(array('Testing'))
+            ->getMock();
         $this->setUpMockFrontendOfBackend($backend);
 
-        $GLOBALS['TYPO3_DB'] = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array(), array(), '', false);
+        $GLOBALS['TYPO3_DB'] = $this->createMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class);
         $GLOBALS['TYPO3_DB']
             ->expects($this->once())
             ->method('exec_SELECTgetSingleRow')
@@ -263,10 +293,13 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function getSetsExceededLifetimeQueryPart()
     {
         /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class)
+            ->setMethods(array('dummy'))
+            ->setConstructorArgs(array('Testing'))
+            ->getMock();
         $this->setUpMockFrontendOfBackend($backend);
 
-        $GLOBALS['TYPO3_DB'] = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array(), array(), '', false);
+        $GLOBALS['TYPO3_DB'] = $this->createMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class);
         $GLOBALS['TYPO3_DB']
             ->expects($this->once())
             ->method('exec_SELECTgetSingleRow')
@@ -288,7 +321,10 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->expectExceptionCode(1236518288);
 
         /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class)
+            ->setMethods(array('dummy'))
+            ->setConstructorArgs(array('Testing'))
+            ->getMock();
         $backend->has('identifier');
     }
 
@@ -298,10 +334,13 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function hasReturnsTrueForExistingEntry()
     {
         /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class)
+            ->setMethods(array('dummy'))
+            ->setConstructorArgs(array('Testing'))
+            ->getMock();
         $this->setUpMockFrontendOfBackend($backend);
 
-        $GLOBALS['TYPO3_DB'] = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array(), array(), '', false);
+        $GLOBALS['TYPO3_DB'] = $this->createMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class);
         $GLOBALS['TYPO3_DB']
             ->expects($this->once())
             ->method('exec_SELECTcountRows')
@@ -317,10 +356,13 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function hasSetsExceededLifetimeQueryPart()
     {
         /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class)
+            ->setMethods(array('dummy'))
+            ->setConstructorArgs(array('Testing'))
+            ->getMock();
         $this->setUpMockFrontendOfBackend($backend);
 
-        $GLOBALS['TYPO3_DB'] = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array(), array(), '', false);
+        $GLOBALS['TYPO3_DB'] = $this->createMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class);
         $GLOBALS['TYPO3_DB']
             ->expects($this->once())
             ->method('exec_SELECTcountRows')
@@ -342,7 +384,10 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->expectExceptionCode(1236518288);
 
         /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class)
+            ->setMethods(array('dummy'))
+            ->setConstructorArgs(array('Testing'))
+            ->getMock();
         $backend->remove('identifier');
     }
 
@@ -352,10 +397,13 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function removeReallyRemovesACacheEntry()
     {
         /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class)
+            ->setMethods(array('dummy'))
+            ->setConstructorArgs(array('Testing'))
+            ->getMock();
         $this->setUpMockFrontendOfBackend($backend);
 
-        $GLOBALS['TYPO3_DB'] = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array(), array(), '', false);
+        $GLOBALS['TYPO3_DB'] = $this->createMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class);
         $GLOBALS['TYPO3_DB']
             ->expects($this->at(0))
             ->method('fullQuoteStr')
@@ -385,7 +433,10 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->expectExceptionCode(1236518288);
 
         /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class)
+            ->setMethods(array('dummy'))
+            ->setConstructorArgs(array('Testing'))
+            ->getMock();
         $backend->collectGarbage();
     }
 
@@ -395,10 +446,13 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function collectGarbageDeletesTagsFromExpiredEntries()
     {
         /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class)
+            ->setMethods(array('dummy'))
+            ->setConstructorArgs(array('Testing'))
+            ->getMock();
         $this->setUpMockFrontendOfBackend($backend);
 
-        $GLOBALS['TYPO3_DB'] = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array(), array(), '', false);
+        $GLOBALS['TYPO3_DB'] = $this->createMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class);
         $GLOBALS['TYPO3_DB']
             ->expects($this->at(1))
             ->method('sql_fetch_assoc')
@@ -425,10 +479,13 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function collectGarbageDeletesExpiredEntry()
     {
         /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class)
+            ->setMethods(array('dummy'))
+            ->setConstructorArgs(array('Testing'))
+            ->getMock();
         $this->setUpMockFrontendOfBackend($backend);
 
-        $GLOBALS['TYPO3_DB'] = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array(), array(), '', false);
+        $GLOBALS['TYPO3_DB'] = $this->createMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class);
         $GLOBALS['TYPO3_DB']
             ->expects($this->at(1))
             ->method('sql_fetch_assoc')
@@ -450,7 +507,10 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->expectExceptionCode(1236518288);
 
         /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class)
+            ->setMethods(array('dummy'))
+            ->setConstructorArgs(array('Testing'))
+            ->getMock();
         $backend->findIdentifiersByTag('identifier');
     }
 
@@ -460,10 +520,13 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function findIdentifiersByTagFindsCacheEntriesWithSpecifiedTag()
     {
         /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class)
+            ->setMethods(array('dummy'))
+            ->setConstructorArgs(array('Testing'))
+            ->getMock();
         $this->setUpMockFrontendOfBackend($backend);
 
-        $GLOBALS['TYPO3_DB'] = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array(), array(), '', false);
+        $GLOBALS['TYPO3_DB'] = $this->createMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class);
         $GLOBALS['TYPO3_DB']
             ->expects($this->at(0))
             ->method('fullQuoteStr')
@@ -490,7 +553,10 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->expectExceptionCode(1236518288);
 
         /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class)
+            ->setMethods(array('dummy'))
+            ->setConstructorArgs(array('Testing'))
+            ->getMock();
         $backend->flush();
     }
 
@@ -500,7 +566,10 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function flushRemovesAllCacheEntries()
     {
         /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class)
+            ->setMethods(array('dummy'))
+            ->setConstructorArgs(array('Testing'))
+            ->getMock();
         $this->setUpMockFrontendOfBackend($backend);
 
         $connectionProphet = $this->prophesize(Connection::class);
@@ -526,7 +595,10 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->expectExceptionCode(1236518288);
 
         /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class)
+            ->setMethods(array('dummy'))
+            ->setConstructorArgs(array('Testing'))
+            ->getMock();
         $backend->flushByTag(array());
     }
 
@@ -536,10 +608,13 @@ class Typo3DatabaseBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function flushByTagRemovesCacheEntriesWithSpecifiedTag()
     {
         /** @var \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend|\PHPUnit_Framework_MockObject_MockObject $backend */
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class, array('dummy'), array('Testing'));
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class)
+            ->setMethods(array('dummy'))
+            ->setConstructorArgs(array('Testing'))
+            ->getMock();
         $this->setUpMockFrontendOfBackend($backend);
 
-        $GLOBALS['TYPO3_DB'] = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array(), array(), '', false);
+        $GLOBALS['TYPO3_DB'] = $this->createMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class);
         $GLOBALS['TYPO3_DB']
             ->expects($this->at(0))
             ->method('fullQuoteStr')
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Backend/WincacheBackendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Backend/WincacheBackendTest.php
index 2cacdb7fa2811b338d3eb49619c7e5bf628a9034..34d47c1c7cf5160d5848c492f489ef152a7255b0 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Backend/WincacheBackendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Backend/WincacheBackendTest.php
@@ -191,13 +191,13 @@ class WincacheBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function flushRemovesOnlyOwnEntries()
     {
         /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $thisCache */
-        $thisCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', false);
+        $thisCache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class);
         $thisCache->expects($this->any())->method('getIdentifier')->will($this->returnValue('thisCache'));
         $thisBackend = new WincacheBackend('Testing');
         $thisBackend->setCache($thisCache);
 
         /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $thatCache */
-        $thatCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', false);
+        $thatCache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class);
         $thatCache->expects($this->any())->method('getIdentifier')->will($this->returnValue('thatCache'));
         $thatBackend = new WincacheBackend('Testing');
         $thatBackend->setCache($thatCache);
@@ -254,7 +254,7 @@ class WincacheBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     protected function setUpBackend($accessible = false)
     {
         /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $cache */
-        $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', false);
+        $cache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class);
         if ($accessible) {
             $accessibleClassName = $this->buildAccessibleProxy(WincacheBackend::class);
             $backend = new $accessibleClassName('Testing');
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Backend/XcacheBackendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Backend/XcacheBackendTest.php
index 49ac3e06e5d4c73d3eaa90391a8fc59a9728f854..ea27df75275740715db1d01fd750137db14a2035 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Backend/XcacheBackendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Backend/XcacheBackendTest.php
@@ -194,13 +194,13 @@ class XcacheBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function flushRemovesOnlyOwnEntries()
     {
         /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $thisCache */
-        $thisCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', false);
+        $thisCache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class);
         $thisCache->expects($this->any())->method('getIdentifier')->will($this->returnValue('thisCache'));
         $thisBackend = new XcacheBackend('Testing');
         $thisBackend->setCache($thisCache);
 
         /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $thatCache */
-        $thatCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', false);
+        $thatCache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class);
         $thatCache->expects($this->any())->method('getIdentifier')->will($this->returnValue('thatCache'));
         $thatBackend = new XcacheBackend('Testing');
         $thatBackend->setCache($thatCache);
@@ -257,7 +257,7 @@ class XcacheBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     protected function setUpBackend($accessible = false)
     {
         /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $cache */
-        $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', false);
+        $cache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class);
         if ($accessible) {
             $accessibleClassName = $this->buildAccessibleProxy(XcacheBackend::class);
             $backend = new $accessibleClassName('Testing');
diff --git a/typo3/sysext/core/Tests/Unit/Cache/CacheFactoryTest.php b/typo3/sysext/core/Tests/Unit/Cache/CacheFactoryTest.php
index ea7b56260d54690752d640bc78f81645edcaece3..0ead78d8810f91cbb88e82f8f2ad4b6755d6f85c 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/CacheFactoryTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/CacheFactoryTest.php
@@ -26,7 +26,10 @@ class CacheFactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function createReturnsInstanceOfTheSpecifiedCacheFrontend()
     {
-        $mockCacheManager = $this->getMock(\TYPO3\CMS\Core\Cache\CacheManager::class, array('registerCache'), array(), '', false);
+        $mockCacheManager = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\CacheManager::class)
+            ->setMethods(array('registerCache'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $factory = new \TYPO3\CMS\Core\Cache\CacheFactory('Testing', $mockCacheManager);
         $cache = $factory->create('TYPO3_Cache_FactoryTest_Cache', \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend::class, \TYPO3\CMS\Core\Cache\Backend\NullBackend::class);
         $this->assertInstanceOf(\TYPO3\CMS\Core\Cache\Frontend\VariableFrontend::class, $cache);
@@ -37,7 +40,10 @@ class CacheFactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function createInjectsAnInstanceOfTheSpecifiedBackendIntoTheCacheFrontend()
     {
-        $mockCacheManager = $this->getMock(\TYPO3\CMS\Core\Cache\CacheManager::class, array('registerCache'), array(), '', false);
+        $mockCacheManager = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\CacheManager::class)
+            ->setMethods(array('registerCache'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $factory = new \TYPO3\CMS\Core\Cache\CacheFactory('Testing', $mockCacheManager);
         $cache = $factory->create('TYPO3_Cache_FactoryTest_Cache', \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend::class, \TYPO3\CMS\Core\Cache\Backend\FileBackend::class);
         $this->assertInstanceOf(\TYPO3\CMS\Core\Cache\Backend\FileBackend::class, $cache->getBackend());
@@ -48,7 +54,10 @@ class CacheFactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function createRegistersTheCacheAtTheCacheManager()
     {
-        $mockCacheManager = $this->getMock(\TYPO3\CMS\Core\Cache\CacheManager::class, array('registerCache'), array(), '', false);
+        $mockCacheManager = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\CacheManager::class)
+            ->setMethods(array('registerCache'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockCacheManager->expects($this->once())->method('registerCache');
         $factory = new \TYPO3\CMS\Core\Cache\CacheFactory('Testing', $mockCacheManager);
         $factory->create('TYPO3_Cache_FactoryTest_Cache', \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend::class, \TYPO3\CMS\Core\Cache\Backend\FileBackend::class);
diff --git a/typo3/sysext/core/Tests/Unit/Cache/CacheManagerTest.php b/typo3/sysext/core/Tests/Unit/Cache/CacheManagerTest.php
index 6ba219e77e8fc13928d78720422d11255cfd1016..3773deb8973c3e5664a75c8ec89e318811709fb8 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/CacheManagerTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/CacheManagerTest.php
@@ -46,9 +46,15 @@ class CacheManagerTest extends UnitTestCase
         $this->expectExceptionCode(1203698223);
 
         $manager = new CacheManager();
-        $cache1 = $this->getMock(AbstractFrontend::class, array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag'), array(), '', false);
+        $cache1 = $this->getMockBuilder(AbstractFrontend::class)
+            ->setMethods(array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $cache1->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('test'));
-        $cache2 = $this->getMock(AbstractFrontend::class, array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag'), array(), '', false);
+        $cache2 = $this->getMockBuilder(AbstractFrontend::class)
+            ->setMethods(array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $cache2->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('test'));
         $manager->registerCache($cache1);
         $manager->registerCache($cache2);
@@ -60,9 +66,15 @@ class CacheManagerTest extends UnitTestCase
     public function managerReturnsThePreviouslyRegisteredCache()
     {
         $manager = new CacheManager();
-        $cache1 = $this->getMock(AbstractFrontend::class, array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag'), array(), '', false);
+        $cache1 = $this->getMockBuilder(AbstractFrontend::class)
+            ->setMethods(array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $cache1->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('cache1'));
-        $cache2 = $this->getMock(AbstractFrontend::class, array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag'), array(), '', false);
+        $cache2 = $this->getMockBuilder(AbstractFrontend::class)
+            ->setMethods(array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $cache2->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('cache2'));
         $manager->registerCache($cache1);
         $manager->registerCache($cache2);
@@ -78,7 +90,10 @@ class CacheManagerTest extends UnitTestCase
         $this->expectExceptionCode(1203699034);
 
         $manager = new CacheManager();
-        $cache = $this->getMock(AbstractFrontend::class, array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag'), array(), '', false);
+        $cache = $this->getMockBuilder(AbstractFrontend::class)
+            ->setMethods(array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $cache->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('someidentifier'));
         $manager->registerCache($cache);
         $manager->getCache('someidentifier');
@@ -91,7 +106,10 @@ class CacheManagerTest extends UnitTestCase
     public function hasCacheReturnsCorrectResult()
     {
         $manager = new CacheManager();
-        $cache1 = $this->getMock(AbstractFrontend::class, array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag'), array(), '', false);
+        $cache1 = $this->getMockBuilder(AbstractFrontend::class)
+            ->setMethods(array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $cache1->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('cache1'));
         $manager->registerCache($cache1);
         $this->assertTrue($manager->hasCache('cache1'), 'hasCache() did not return TRUE.');
@@ -104,11 +122,17 @@ class CacheManagerTest extends UnitTestCase
     public function flushCachesByTagCallsTheFlushByTagMethodOfAllRegisteredCaches()
     {
         $manager = new CacheManager();
-        $cache1 = $this->getMock(AbstractFrontend::class, array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag'), array(), '', false);
+        $cache1 = $this->getMockBuilder(AbstractFrontend::class)
+            ->setMethods(array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $cache1->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('cache1'));
         $cache1->expects($this->once())->method('flushByTag')->with($this->equalTo('theTag'));
         $manager->registerCache($cache1);
-        $cache2 = $this->getMock(AbstractFrontend::class, array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag'), array(), '', false);
+        $cache2 = $this->getMockBuilder(AbstractFrontend::class)
+            ->setMethods(array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $cache2->expects($this->once())->method('flushByTag')->with($this->equalTo('theTag'));
         $manager->registerCache($cache2);
         $manager->flushCachesByTag('theTag');
@@ -120,11 +144,17 @@ class CacheManagerTest extends UnitTestCase
     public function flushCachesCallsTheFlushMethodOfAllRegisteredCaches()
     {
         $manager = new CacheManager();
-        $cache1 = $this->getMock(AbstractFrontend::class, array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag'), array(), '', false);
+        $cache1 = $this->getMockBuilder(AbstractFrontend::class)
+            ->setMethods(array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $cache1->expects($this->atLeastOnce())->method('getIdentifier')->will($this->returnValue('cache1'));
         $cache1->expects($this->once())->method('flush');
         $manager->registerCache($cache1);
-        $cache2 = $this->getMock(AbstractFrontend::class, array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag'), array(), '', false);
+        $cache2 = $this->getMockBuilder(AbstractFrontend::class)
+            ->setMethods(array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $cache2->expects($this->once())->method('flush');
         $manager->registerCache($cache2);
         $manager->flushCaches();
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Frontend/AbstractFrontendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Frontend/AbstractFrontendTest.php
index dc281f5b203ff754689e2639ec1cc082c140e7ec..e9fa2fe22234b194d4a0a29e5b371a088d0603b0 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Frontend/AbstractFrontendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Frontend/AbstractFrontendTest.php
@@ -26,9 +26,15 @@ class AbstractFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function theConstructorAcceptsValidIdentifiers()
     {
-        $mockBackend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', false);
+        $mockBackend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class)
+            ->setMethods(array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'))
+            ->disableOriginalConstructor()
+            ->getMock();
         foreach (array('x', 'someValue', '123fivesixseveneight', 'some&', 'ab_cd%', rawurlencode('resource://some/äöü$&% sadf'), str_repeat('x', 250)) as $identifier) {
-            $abstractCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class, array('__construct', 'get', 'set', 'has', 'remove', 'getByTag', 'flush', 'flushByTag', 'collectGarbage'), array($identifier, $mockBackend));
+            $abstractCache = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class)
+                ->setMethods(array('__construct', 'get', 'set', 'has', 'remove', 'getByTag', 'flush', 'flushByTag', 'collectGarbage'))
+                ->setConstructorArgs(array($identifier, $mockBackend))
+                ->getMock();
         }
     }
 
@@ -37,10 +43,16 @@ class AbstractFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function theConstructorRejectsInvalidIdentifiers()
     {
-        $mockBackend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', false);
+        $mockBackend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class)
+            ->setMethods(array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'))
+            ->disableOriginalConstructor()
+            ->getMock();
         foreach (array('', 'abc def', 'foo!', 'bar:', 'some/', 'bla*', 'one+', 'äöü', str_repeat('x', 251), 'x$', '\\a', 'b#') as $identifier) {
             try {
-                $abstractCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class, array('__construct', 'get', 'set', 'has', 'remove', 'getByTag', 'flush', 'flushByTag', 'collectGarbage'), array($identifier, $mockBackend));
+                $abstractCache = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class)
+                    ->setMethods(array('__construct', 'get', 'set', 'has', 'remove', 'getByTag', 'flush', 'flushByTag', 'collectGarbage'))
+                    ->setConstructorArgs(array($identifier, $mockBackend))
+                    ->getMock();
                 $this->fail('Identifier "' . $identifier . '" was not rejected.');
             } catch (\InvalidArgumentException $exception) {
             }
@@ -53,9 +65,15 @@ class AbstractFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function flushCallsBackend()
     {
         $identifier = 'someCacheIdentifier';
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class)
+            ->setMethods(array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $backend->expects($this->once())->method('flush');
-        $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class, array('__construct', 'get', 'set', 'has', 'remove', 'getByTag'), array($identifier, $backend));
+        $cache = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class)
+            ->setMethods(array('__construct', 'get', 'set', 'has', 'remove', 'getByTag'))
+            ->setConstructorArgs(array($identifier, $backend))
+            ->getMock();
         $cache->flush();
     }
 
@@ -68,9 +86,12 @@ class AbstractFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->expectExceptionCode(1233057359);
 
         $identifier = 'someCacheIdentifier';
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\TaggableBackendInterface::class, array(), array(), '', false);
+        $backend = $this->createMock(\TYPO3\CMS\Core\Cache\Backend\TaggableBackendInterface::class);
         $backend->expects($this->never())->method('flushByTag');
-        $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class, array('__construct', 'get', 'set', 'has', 'remove', 'getByTag'), array($identifier, $backend));
+        $cache = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class)
+            ->setMethods(array('__construct', 'get', 'set', 'has', 'remove', 'getByTag'))
+            ->setConstructorArgs(array($identifier, $backend))
+            ->getMock();
         $cache->flushByTag('SomeInvalid\\Tag');
     }
 
@@ -81,9 +102,15 @@ class AbstractFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $tag = 'sometag';
         $identifier = 'someCacheIdentifier';
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\TaggableBackendInterface::class, array('setCache', 'get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\TaggableBackendInterface::class)
+            ->setMethods(array('setCache', 'get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $backend->expects($this->once())->method('flushByTag')->with($tag);
-        $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class, array('__construct', 'get', 'set', 'has', 'remove', 'getByTag'), array($identifier, $backend));
+        $cache = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class)
+            ->setMethods(array('__construct', 'get', 'set', 'has', 'remove', 'getByTag'))
+            ->setConstructorArgs(array($identifier, $backend))
+            ->getMock();
         $cache->flushByTag($tag);
     }
 
@@ -93,9 +120,15 @@ class AbstractFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function collectGarbageCallsBackend()
     {
         $identifier = 'someCacheIdentifier';
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class)
+            ->setMethods(array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $backend->expects($this->once())->method('collectGarbage');
-        $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class, array('__construct', 'get', 'set', 'has', 'remove', 'getByTag'), array($identifier, $backend));
+        $cache = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class)
+            ->setMethods(array('__construct', 'get', 'set', 'has', 'remove', 'getByTag'))
+            ->setConstructorArgs(array($identifier, $backend))
+            ->getMock();
         $cache->collectGarbage();
     }
 
@@ -105,8 +138,11 @@ class AbstractFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function invalidEntryIdentifiersAreRecognizedAsInvalid()
     {
         $identifier = 'someCacheIdentifier';
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array(), array(), '', false);
-        $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class, array('__construct', 'get', 'set', 'has', 'remove', 'getByTag'), array($identifier, $backend));
+        $backend = $this->createMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class);
+        $cache = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class)
+            ->setMethods(array('__construct', 'get', 'set', 'has', 'remove', 'getByTag'))
+            ->setConstructorArgs(array($identifier, $backend))
+            ->getMock();
         foreach (array('', 'abc def', 'foo!', 'bar:', 'some/', 'bla*', 'one+', 'äöü', str_repeat('x', 251), 'x$', '\\a', 'b#') as $entryIdentifier) {
             $this->assertFalse($cache->isValidEntryIdentifier($entryIdentifier), 'Invalid identifier "' . $entryIdentifier . '" was not rejected.');
         }
@@ -118,8 +154,11 @@ class AbstractFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function validEntryIdentifiersAreRecognizedAsValid()
     {
         $identifier = 'someCacheIdentifier';
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array(), array(), '', false);
-        $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class, array('__construct', 'get', 'set', 'has', 'remove', 'getByTag'), array($identifier, $backend));
+        $backend = $this->createMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class);
+        $cache = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class)
+            ->setMethods(array('__construct', 'get', 'set', 'has', 'remove', 'getByTag'))
+            ->setConstructorArgs(array($identifier, $backend))
+            ->getMock();
         foreach (array('_', 'abcdef', 'foo', 'bar123', '3some', '_bl_a', 'some&', 'one%TWO', str_repeat('x', 250)) as $entryIdentifier) {
             $this->assertTrue($cache->isValidEntryIdentifier($entryIdentifier), 'Valid identifier "' . $entryIdentifier . '" was not accepted.');
         }
@@ -131,8 +170,11 @@ class AbstractFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function invalidTagsAreRecognizedAsInvalid()
     {
         $identifier = 'someCacheIdentifier';
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array(), array(), '', false);
-        $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class, array('__construct', 'get', 'set', 'has', 'remove', 'getByTag'), array($identifier, $backend));
+        $backend = $this->createMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class);
+        $cache = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class)
+            ->setMethods(array('__construct', 'get', 'set', 'has', 'remove', 'getByTag'))
+            ->setConstructorArgs(array($identifier, $backend))
+            ->getMock();
         foreach (array('', 'abc def', 'foo!', 'bar:', 'some/', 'bla*', 'one+', 'äöü', str_repeat('x', 251), 'x$', '\\a', 'b#') as $tag) {
             $this->assertFalse($cache->isValidTag($tag), 'Invalid tag "' . $tag . '" was not rejected.');
         }
@@ -144,8 +186,11 @@ class AbstractFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function validTagsAreRecognizedAsValid()
     {
         $identifier = 'someCacheIdentifier';
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array(), array(), '', false);
-        $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class, array('__construct', 'get', 'set', 'has', 'remove', 'getByTag'), array($identifier, $backend));
+        $backend = $this->createMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class);
+        $cache = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class)
+            ->setMethods(array('__construct', 'get', 'set', 'has', 'remove', 'getByTag'))
+            ->setConstructorArgs(array($identifier, $backend))
+            ->getMock();
         foreach (array('abcdef', 'foo-bar', 'foo_baar', 'bar123', '3some', 'file%Thing', 'some&', '%x%', str_repeat('x', 250)) as $tag) {
             $this->assertTrue($cache->isValidTag($tag), 'Valid tag "' . $tag . '" was not accepted.');
         }
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Frontend/PhpFrontendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Frontend/PhpFrontendTest.php
index 423febc0736bea4c28b9db042bc4f7ee4f681210..6b6ffa443a99707e74789f08b427494128230f55 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Frontend/PhpFrontendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Frontend/PhpFrontendTest.php
@@ -30,7 +30,10 @@ class PhpFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionCode(1233057566);
 
-        $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class, array('isValidEntryIdentifier'), array(), '', false);
+        $cache = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class)
+            ->setMethods(array('isValidEntryIdentifier'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $cache->expects($this->once())->method('isValidEntryIdentifier')->with('foo')->will($this->returnValue(false));
         $cache->set('foo', 'bar');
     }
@@ -42,7 +45,7 @@ class PhpFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $originalSourceCode = 'return "hello world!";';
         $modifiedSourceCode = '<?php' . chr(10) . $originalSourceCode . chr(10) . '#';
-        $mockBackend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\PhpCapableBackendInterface::class, array(), array(), '', false);
+        $mockBackend = $this->createMock(\TYPO3\CMS\Core\Cache\Backend\PhpCapableBackendInterface::class);
         $mockBackend->expects($this->once())->method('set')->with('Foo-Bar', $modifiedSourceCode, array('tags'), 1234);
         $cache = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Cache\Frontend\PhpFrontend::class, 'PhpFrontend', $mockBackend);
         $cache->set('Foo-Bar', $originalSourceCode, array('tags'), 1234);
@@ -56,7 +59,10 @@ class PhpFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->expectException(InvalidDataException::class);
         $this->expectExceptionCode(1264023824);
 
-        $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\PhpFrontend::class, array('dummy'), array(), '', false);
+        $cache = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Frontend\PhpFrontend::class)
+            ->setMethods(array('dummy'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $cache->set('Foo-Bar', array());
     }
 
@@ -65,7 +71,7 @@ class PhpFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function requireOnceCallsTheBackendsRequireOnceMethod()
     {
-        $mockBackend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\PhpCapableBackendInterface::class, array(), array(), '', false);
+        $mockBackend = $this->createMock(\TYPO3\CMS\Core\Cache\Backend\PhpCapableBackendInterface::class);
         $mockBackend->expects($this->once())->method('requireOnce')->with('Foo-Bar')->will($this->returnValue('hello world!'));
         $cache = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Cache\Frontend\PhpFrontend::class, 'PhpFrontend', $mockBackend);
         $result = $cache->requireOnce('Foo-Bar');
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Frontend/StringFrontendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Frontend/StringFrontendTest.php
index 34bf348f7ad44ca55164e3a116e87cdc6b464f83..b75efc0a79b20eb3e036c6bda36ae5e5227fd880 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Frontend/StringFrontendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Frontend/StringFrontendTest.php
@@ -30,7 +30,10 @@ class StringFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionCode(1233057566);
 
-        $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class, array('isValidEntryIdentifier'), array(), '', false);
+        $cache = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class)
+            ->setMethods(array('isValidEntryIdentifier'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $cache->expects($this->once())->method('isValidEntryIdentifier')->with('foo')->will($this->returnValue(false));
         $cache->set('foo', 'bar');
     }
@@ -41,7 +44,10 @@ class StringFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function setPassesStringToBackend()
     {
         $theString = 'Just some value';
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class)
+            ->setMethods(array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $backend->expects($this->once())->method('set')->with($this->equalTo('StringCacheTest'), $this->equalTo($theString));
         $cache = new \TYPO3\CMS\Core\Cache\Frontend\StringFrontend('StringFrontend', $backend);
         $cache->set('StringCacheTest', $theString);
@@ -54,7 +60,10 @@ class StringFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $theString = 'Just some value';
         $theLifetime = 1234;
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class)
+            ->setMethods(array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $backend->expects($this->once())->method('set')->with($this->equalTo('StringCacheTest'), $this->equalTo($theString), $this->equalTo(array()), $this->equalTo($theLifetime));
         $cache = new \TYPO3\CMS\Core\Cache\Frontend\StringFrontend('StringFrontend', $backend);
         $cache->set('StringCacheTest', $theString, array(), $theLifetime);
@@ -68,7 +77,10 @@ class StringFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->expectException(InvalidDataException::class);
         $this->expectExceptionCode(1222808333);
 
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class)
+            ->setMethods(array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $cache = new \TYPO3\CMS\Core\Cache\Frontend\StringFrontend('StringFrontend', $backend);
         $cache->set('StringCacheTest', array());
     }
@@ -78,7 +90,10 @@ class StringFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function getFetchesStringValueFromBackend()
     {
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class)
+            ->setMethods(array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $backend->expects($this->once())->method('get')->will($this->returnValue('Just some value'));
         $cache = new \TYPO3\CMS\Core\Cache\Frontend\StringFrontend('StringFrontend', $backend);
         $this->assertEquals('Just some value', $cache->get('StringCacheTest'), 'The returned value was not the expected string.');
@@ -89,7 +104,10 @@ class StringFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function hasReturnsResultFromBackend()
     {
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class)
+            ->setMethods(array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $backend->expects($this->once())->method('has')->with($this->equalTo('StringCacheTest'))->will($this->returnValue(true));
         $cache = new \TYPO3\CMS\Core\Cache\Frontend\StringFrontend('StringFrontend', $backend);
         $this->assertTrue($cache->has('StringCacheTest'), 'has() did not return TRUE.');
@@ -101,7 +119,10 @@ class StringFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function removeCallsBackend()
     {
         $cacheIdentifier = 'someCacheIdentifier';
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class)
+            ->setMethods(array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $backend->expects($this->once())->method('remove')->with($this->equalTo($cacheIdentifier))->will($this->returnValue(true));
         $cache = new \TYPO3\CMS\Core\Cache\Frontend\StringFrontend('StringFrontend', $backend);
         $this->assertTrue($cache->remove($cacheIdentifier), 'remove() did not return TRUE');
@@ -115,7 +136,7 @@ class StringFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionCode(1233057772);
 
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\TaggableBackendInterface::class, array(), array(), '', false);
+        $backend = $this->createMock(\TYPO3\CMS\Core\Cache\Backend\TaggableBackendInterface::class);
         $cache = new \TYPO3\CMS\Core\Cache\Frontend\StringFrontend('StringFrontend', $backend);
         $cache->getByTag('SomeInvalid\\Tag');
     }
@@ -128,7 +149,10 @@ class StringFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $tag = 'sometag';
         $identifiers = array('one', 'two');
         $entries = array('one value', 'two value');
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class)
+            ->setMethods(array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $backend->expects($this->once())->method('findIdentifiersByTag')->with($this->equalTo($tag))->will($this->returnValue($identifiers));
         $backend->expects($this->exactly(2))->method('get')->will($this->onConsecutiveCalls('one value', 'two value'));
         $cache = new \TYPO3\CMS\Core\Cache\Frontend\StringFrontend('StringFrontend', $backend);
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Frontend/VariableFrontendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Frontend/VariableFrontendTest.php
index dd6c8ee9883f8034963d7cfefc66e64705a7a3a8..83b4afcf298170902e7ca4558245d83bf373067d 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Frontend/VariableFrontendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Frontend/VariableFrontendTest.php
@@ -29,7 +29,10 @@ class VariableFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionCode(1233057566);
 
-        $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class, array('isValidEntryIdentifier'), array(), '', false);
+        $cache = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class)
+            ->setMethods(array('isValidEntryIdentifier'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $cache->expects($this->once())->method('isValidEntryIdentifier')->with('foo')->will($this->returnValue(false));
         $cache->set('foo', 'bar');
     }
@@ -40,7 +43,10 @@ class VariableFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function setPassesSerializedStringToBackend()
     {
         $theString = 'Just some value';
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class)
+            ->setMethods(array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $backend->expects($this->once())->method('set')->with($this->equalTo('VariableCacheTest'), $this->equalTo(serialize($theString)));
 
         $cache = new \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend('VariableFrontend', $backend);
@@ -53,7 +59,10 @@ class VariableFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function setPassesSerializedArrayToBackend()
     {
         $theArray = array('Just some value', 'and another one.');
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class)
+            ->setMethods(array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $backend->expects($this->once())->method('set')->with($this->equalTo('VariableCacheTest'), $this->equalTo(serialize($theArray)));
 
         $cache = new \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend('VariableFrontend', $backend);
@@ -67,7 +76,10 @@ class VariableFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $theString = 'Just some value';
         $theLifetime = 1234;
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class)
+            ->setMethods(array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $backend->expects($this->once())->method('set')->with($this->equalTo('VariableCacheTest'), $this->equalTo(serialize($theString)), $this->equalTo(array()), $this->equalTo($theLifetime));
 
         $cache = new \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend('VariableFrontend', $backend);
@@ -79,7 +91,10 @@ class VariableFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function getFetchesStringValueFromBackend()
     {
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class)
+            ->setMethods(array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $backend->expects($this->once())->method('get')->will($this->returnValue(serialize('Just some value')));
 
         $cache = new \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend('VariableFrontend', $backend);
@@ -92,7 +107,10 @@ class VariableFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function getFetchesArrayValueFromBackend()
     {
         $theArray = array('Just some value', 'and another one.');
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class)
+            ->setMethods(array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $backend->expects($this->once())->method('get')->will($this->returnValue(serialize($theArray)));
 
         $cache = new \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend('VariableFrontend', $backend);
@@ -104,7 +122,10 @@ class VariableFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function getFetchesFalseBooleanValueFromBackend()
     {
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class)
+            ->setMethods(array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $backend->expects($this->once())->method('get')->will($this->returnValue(serialize(false)));
 
         $cache = new \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend('VariableFrontend', $backend);
@@ -116,7 +137,10 @@ class VariableFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function hasReturnsResultFromBackend()
     {
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class)
+            ->setMethods(array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $backend->expects($this->once())->method('has')->with($this->equalTo('VariableCacheTest'))->will($this->returnValue(true));
 
         $cache = new \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend('VariableFrontend', $backend);
@@ -129,7 +153,10 @@ class VariableFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function removeCallsBackend()
     {
         $cacheIdentifier = 'someCacheIdentifier';
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class)
+            ->setMethods(array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'))
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $backend->expects($this->once())->method('remove')->with($this->equalTo($cacheIdentifier))->will($this->returnValue(true));
 
@@ -145,7 +172,7 @@ class VariableFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionCode(1233058312);
 
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\TaggableBackendInterface::class, array(), array(), '', false);
+        $backend = $this->createMock(\TYPO3\CMS\Core\Cache\Backend\TaggableBackendInterface::class);
         $cache = new \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend('VariableFrontend', $backend);
         $cache->getByTag('SomeInvalid\Tag');
     }
@@ -158,7 +185,10 @@ class VariableFrontendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $tag = 'sometag';
         $identifiers = array('one', 'two');
         $entries = array('one value', 'two value');
-        $backend = $this->getMock(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class, array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'), array(), '', false);
+        $backend = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class)
+            ->setMethods(array('get', 'set', 'has', 'remove', 'findIdentifiersByTag', 'flush', 'flushByTag', 'collectGarbage'))
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $backend->expects($this->once())->method('findIdentifiersByTag')->with($this->equalTo($tag))->will($this->returnValue($identifiers));
         $backend->expects($this->exactly(2))->method('get')->will($this->onConsecutiveCalls(serialize('one value'), serialize('two value')));
diff --git a/typo3/sysext/core/Tests/Unit/Collection/RecordCollectionRepositoryTest.php b/typo3/sysext/core/Tests/Unit/Collection/RecordCollectionRepositoryTest.php
index 030b67c75609765b7fecfd95fd624faa7b37293b..45035daa6c764512b1718502064f513f07d421ab 100644
--- a/typo3/sysext/core/Tests/Unit/Collection/RecordCollectionRepositoryTest.php
+++ b/typo3/sysext/core/Tests/Unit/Collection/RecordCollectionRepositoryTest.php
@@ -49,11 +49,12 @@ class RecordCollectionRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     protected function setUp()
     {
-        $this->databaseMock = $this->getMock(
-            \TYPO3\CMS\Core\Database\DatabaseConnection::class,
-            array('exec_UPDATEquery', 'exec_SELECTgetSingleRow', 'exec_SELECTgetRows', 'fullQuoteStr')
-        );
-        $this->subject = $this->getMock(\TYPO3\CMS\Core\Collection\RecordCollectionRepository::class, array('getDatabaseConnection'));
+        $this->databaseMock = $this->getMockBuilder(\TYPO3\CMS\Core\Database\DatabaseConnection::class)
+            ->setMethods(array('exec_UPDATEquery', 'exec_SELECTgetSingleRow', 'exec_SELECTgetRows', 'fullQuoteStr'))
+            ->getMock();
+        $this->subject = $this->getMockBuilder(\TYPO3\CMS\Core\Collection\RecordCollectionRepository::class)
+            ->setMethods(array('getDatabaseConnection'))
+            ->getMock();
         $this->subject->expects($this->any())->method('getDatabaseConnection')->will($this->returnValue($this->databaseMock));
         $this->testTableName = $this->getUniqueId('tx_testtable');
     }
diff --git a/typo3/sysext/core/Tests/Unit/Configuration/ConfigurationManagerTest.php b/typo3/sysext/core/Tests/Unit/Configuration/ConfigurationManagerTest.php
index 3b8c10b761eadcf7e5b3c6a36acb4a5009a8e380..1c2588cadf3488dd643dd5db9946753fb739ed3f 100644
--- a/typo3/sysext/core/Tests/Unit/Configuration/ConfigurationManagerTest.php
+++ b/typo3/sysext/core/Tests/Unit/Configuration/ConfigurationManagerTest.php
@@ -39,10 +39,9 @@ class ConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     protected function createSubjectWithMockedMethods(array $methods)
     {
-        $this->subject = $this->getMock(
-            \TYPO3\CMS\Core\Configuration\ConfigurationManager::class,
-            $methods
-        );
+        $this->subject = $this->getMockBuilder(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class)
+            ->setMethods($methods)
+            ->getMock();
     }
 
     /**
diff --git a/typo3/sysext/core/Tests/Unit/Configuration/FlexForm/FlexFormToolsTest.php b/typo3/sysext/core/Tests/Unit/Configuration/FlexForm/FlexFormToolsTest.php
index 31d611fa85369bbaa09e99f47ba62ad6fbbca3c5..33c56b34e90c91155ef7d9e32211bf944a54ef91 100644
--- a/typo3/sysext/core/Tests/Unit/Configuration/FlexForm/FlexFormToolsTest.php
+++ b/typo3/sysext/core/Tests/Unit/Configuration/FlexForm/FlexFormToolsTest.php
@@ -39,7 +39,9 @@ class FlexFormToolsTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         );
         $editData = '';
         /** @var \TYPO3\CMS\Core\Configuration\FlexForm\FlexFormTools|\PHPUnit_Framework_MockObject_MockObject $subject */
-        $subject = $this->getMock(FlexFormTools::class, array('executeCallBackMethod'));
+        $subject = $this->getMockBuilder(FlexFormTools::class)
+            ->setMethods(array('executeCallBackMethod'))
+            ->getMock();
         $subject->expects($this->never())->method('executeCallBackMethod');
         $subject->traverseFlexFormXMLData_recurse($dataStruct, $editData, $pA);
     }
@@ -66,7 +68,7 @@ class FlexFormToolsTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         );
         $editData2 = '';
         /** @var \TYPO3\CMS\Core\Configuration\FlexForm\FlexFormTools|\PHPUnit_Framework_MockObject_MockObject $subject */
-        $subject = $this->getMock(FlexFormTools::class);
+        $subject = $this->createMock(FlexFormTools::class);
         $this->assertEquals(
             $subject->traverseFlexFormXMLData_recurse($dataStruct, $editData, $pA),
             $subject->traverseFlexFormXMLData_recurse($dataStruct, $editData2, $pA)
diff --git a/typo3/sysext/core/Tests/Unit/Core/BootstrapTest.php b/typo3/sysext/core/Tests/Unit/Core/BootstrapTest.php
index a6e2ce474d4d8fa5f549be34976ef645f8c8b99a..7c1aeba338eed0f09af0553feba334587d7a5663 100644
--- a/typo3/sysext/core/Tests/Unit/Core/BootstrapTest.php
+++ b/typo3/sysext/core/Tests/Unit/Core/BootstrapTest.php
@@ -36,17 +36,14 @@ class BootstrapTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             '',
             false
         );
-        $mockCache = $this->getMock(
-            \TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class,
-            array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag', 'requireOnce'),
-            array(),
-            '',
-            false
-        );
-        $mockCacheManager = $this->getMock(
-            \TYPO3\CMS\Core\Cache\CacheManager::class,
-            array('getCache')
-        );
+        $mockCache = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class)
+            ->setMethods(array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag', 'requireOnce'))
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $mockCacheManager = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\CacheManager::class)
+            ->setMethods(array('getCache'))
+            ->getMock();
         $mockCacheManager
             ->expects($this->any())
             ->method('getCache')
@@ -75,17 +72,14 @@ class BootstrapTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             '',
             false
         );
-        $mockCache = $this->getMock(
-            \TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class,
-            array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag', 'requireOnce'),
-            array(),
-            '',
-            false
-        );
-        $mockCacheManager = $this->getMock(
-            \TYPO3\CMS\Core\Cache\CacheManager::class,
-            array('getCache')
-        );
+        $mockCache = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend::class)
+            ->setMethods(array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag', 'requireOnce'))
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $mockCacheManager = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\CacheManager::class)
+            ->setMethods(array('getCache'))
+            ->getMock();
         $mockCacheManager
             ->expects($this->any())
             ->method('getCache')
diff --git a/typo3/sysext/core/Tests/Unit/Core/ClassLoadingInformationGeneratorTest.php b/typo3/sysext/core/Tests/Unit/Core/ClassLoadingInformationGeneratorTest.php
index 350467c89f597b71fa346d6c81b8bf6c239f90b1..5c03bb1de4299e98df1184b41094939680fbbf6e 100644
--- a/typo3/sysext/core/Tests/Unit/Core/ClassLoadingInformationGeneratorTest.php
+++ b/typo3/sysext/core/Tests/Unit/Core/ClassLoadingInformationGeneratorTest.php
@@ -43,7 +43,7 @@ class ClassLoadingInformationGeneratorTest extends UnitTestCase
             ],
         ]);
         /** @var ClassLoader|\PHPUnit_Framework_MockObject_MockObject $classLoaderMock */
-        $classLoaderMock = $this->getMock(ClassLoader::class);
+        $classLoaderMock = $this->createMock(ClassLoader::class);
         $generator = new ClassLoadingInformationGenerator($classLoaderMock, [], __DIR__);
         $generator->buildClassAliasMapForPackage($packageMock);
     }
@@ -66,7 +66,7 @@ class ClassLoadingInformationGeneratorTest extends UnitTestCase
             ],
         ]);
         /** @var ClassLoader|\PHPUnit_Framework_MockObject_MockObject $classLoaderMock */
-        $classLoaderMock = $this->getMock(ClassLoader::class);
+        $classLoaderMock = $this->createMock(ClassLoader::class);
         $generator = new ClassLoadingInformationGenerator($classLoaderMock, [], __DIR__);
         $generator->buildClassAliasMapForPackage($packageMock);
     }
@@ -92,7 +92,7 @@ class ClassLoadingInformationGeneratorTest extends UnitTestCase
         ];
         $packageMock = $this->createPackageMock(array());
         /** @var ClassLoader|\PHPUnit_Framework_MockObject_MockObject $classLoaderMock */
-        $classLoaderMock = $this->getMock(ClassLoader::class);
+        $classLoaderMock = $this->createMock(ClassLoader::class);
         $generator = new ClassLoadingInformationGenerator($classLoaderMock, [], __DIR__);
         $this->assertEquals($expectedClassMap, $generator->buildClassAliasMapForPackage($packageMock));
     }
@@ -126,7 +126,7 @@ class ClassLoadingInformationGeneratorTest extends UnitTestCase
             ],
         ]);
         /** @var ClassLoader|\PHPUnit_Framework_MockObject_MockObject $classLoaderMock */
-        $classLoaderMock = $this->getMock(ClassLoader::class);
+        $classLoaderMock = $this->createMock(ClassLoader::class);
         $generator = new ClassLoadingInformationGenerator($classLoaderMock, [], __DIR__);
         $this->assertEquals($expectedClassMap, $generator->buildClassAliasMapForPackage($packageMock));
     }
@@ -251,7 +251,7 @@ class ClassLoadingInformationGeneratorTest extends UnitTestCase
     public function autoloadFilesAreBuildCorrectly($packageManifest, $expectedPsr4Files, $expectedClassMapFiles)
     {
         /** @var ClassLoader|\PHPUnit_Framework_MockObject_MockObject $classLoaderMock */
-        $classLoaderMock = $this->getMock(ClassLoader::class);
+        $classLoaderMock = $this->createMock(ClassLoader::class);
         $generator = new ClassLoadingInformationGenerator($classLoaderMock, [$this->createPackageMock($packageManifest)], __DIR__);
         $files = $generator->buildAutoloadInformationFiles();
 
@@ -361,7 +361,7 @@ class ClassLoadingInformationGeneratorTest extends UnitTestCase
     public function autoloadDevFilesAreBuildCorrectly($packageManifest, $expectedPsr4Files, $expectedClassMapFiles)
     {
         /** @var ClassLoader|\PHPUnit_Framework_MockObject_MockObject $classLoaderMock */
-        $classLoaderMock = $this->getMock(ClassLoader::class);
+        $classLoaderMock = $this->createMock(ClassLoader::class);
         $generator = new ClassLoadingInformationGenerator($classLoaderMock, [$this->createPackageMock($packageManifest)], __DIR__, true);
         $files = $generator->buildAutoloadInformationFiles();
 
@@ -391,7 +391,7 @@ class ClassLoadingInformationGeneratorTest extends UnitTestCase
      */
     protected function createPackageMock($packageManifest)
     {
-        $packageMock = $this->getMock(PackageInterface::class);
+        $packageMock = $this->createMock(PackageInterface::class);
         $packageMock->expects($this->any())->method('getPackagePath')->willReturn(__DIR__ . '/Fixtures/test_extension/');
         $packageMock->expects($this->any())->method('getValueFromComposerManifest')->willReturn(
             json_decode(json_encode($packageManifest))
diff --git a/typo3/sysext/core/Tests/Unit/DataHandling/DataHandlerTest.php b/typo3/sysext/core/Tests/Unit/DataHandling/DataHandlerTest.php
index 3405d69b73eb9b51cc07fc208ab73cf57313bb06..3b602f95a8215c83108f07a860079ea458d5b1ae 100644
--- a/typo3/sysext/core/Tests/Unit/DataHandling/DataHandlerTest.php
+++ b/typo3/sysext/core/Tests/Unit/DataHandling/DataHandlerTest.php
@@ -54,8 +54,8 @@ class DataHandlerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $GLOBALS['TCA'] = array();
         $this->singletonInstances = GeneralUtility::getSingletonInstances();
-        $this->backEndUser = $this->getMock(BackendUserAuthentication::class);
-        $this->mockDatabaseConnection = $this->getMock(DatabaseConnection::class, array(), array(), '', false);
+        $this->backEndUser = $this->createMock(BackendUserAuthentication::class);
+        $this->mockDatabaseConnection = $this->createMock(DatabaseConnection::class);
         $GLOBALS['TYPO3_DB'] = $this->mockDatabaseConnection;
         $this->subject = $this->getAccessibleMock(DataHandler::class, ['dummy']);
         $this->subject->start(array(), '', $this->backEndUser);
@@ -359,7 +359,10 @@ class DataHandlerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function doesCheckModifyAccessListHookGetsCalled()
     {
         $hookClass = $this->getUniqueId('tx_coretest');
-        $hookMock = $this->getMock(\TYPO3\CMS\Core\DataHandling\DataHandlerCheckModifyAccessListHookInterface::class, array('checkModifyAccessList'), array(), $hookClass);
+        $hookMock = $this->getMockBuilder(\TYPO3\CMS\Core\DataHandling\DataHandlerCheckModifyAccessListHookInterface::class)
+            ->setMethods(array('checkModifyAccessList'))
+            ->setMockClassName($hookClass)
+            ->getMock();
         $hookMock->expects($this->once())->method('checkModifyAccessList');
         $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['checkModifyAccessList'][] = $hookClass;
         GeneralUtility::addInstance($hookClass, $hookMock);
@@ -386,7 +389,9 @@ class DataHandlerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function processDatamapForFrozenNonZeroWorkspaceReturnsFalse()
     {
         /** @var DataHandler $subject */
-        $subject = $this->getMock(DataHandler::class, array('newlog'));
+        $subject = $this->getMockBuilder(DataHandler::class)
+            ->setMethods(array('newlog'))
+            ->getMock();
         $this->backEndUser->workspace = 1;
         $this->backEndUser->workspaceRec = array('freeze' => true);
         $subject->BE_USER = $this->backEndUser;
@@ -409,10 +414,9 @@ class DataHandlerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         );
 
         /** @var $subject DataHandler|\PHPUnit_Framework_MockObject_MockObject */
-        $subject = $this->getMock(
-            DataHandler::class,
-            array('newlog', 'checkModifyAccessList', 'tableReadOnly', 'checkRecordUpdateAccess')
-        );
+        $subject = $this->getMockBuilder(DataHandler::class)
+            ->setMethods(array('newlog', 'checkModifyAccessList', 'tableReadOnly', 'checkRecordUpdateAccess'))
+            ->getMock();
 
         $subject->bypassWorkspaceRestrictions = false;
         $subject->datamap = array(
@@ -427,14 +431,14 @@ class DataHandlerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $subject->expects($this->once())->method('checkRecordUpdateAccess')->will($this->returnValue(true));
 
         /** @var BackendUserAuthentication|\PHPUnit_Framework_MockObject_MockObject $backEndUser */
-        $backEndUser = $this->getMock(BackendUserAuthentication::class);
+        $backEndUser = $this->createMock(BackendUserAuthentication::class);
         $backEndUser->workspace = 1;
         $backEndUser->workspaceRec = array('freeze' => false);
         $backEndUser->expects($this->once())->method('workspaceAllowAutoCreation')->will($this->returnValue(true));
         $backEndUser->expects($this->once())->method('workspaceCannotEditRecord')->will($this->returnValue(true));
         $backEndUser->expects($this->once())->method('recordEditAccessInternals')->with('pages', 1)->will($this->returnValue(true));
         $subject->BE_USER = $backEndUser;
-        $createdTceMain = $this->getMock(DataHandler::class, array());
+        $createdTceMain = $this->createMock(DataHandler::class);
         $createdTceMain->expects($this->once())->method('start')->with(array(), array(
             'pages' => array(
                 1 => array(
@@ -458,7 +462,9 @@ class DataHandlerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function doesCheckFlexFormValueHookGetsCalled()
     {
         $hookClass = $this->getUniqueId('tx_coretest');
-        $hookMock = $this->getMock($hookClass, array('checkFlexFormValue_beforeMerge'));
+        $hookMock = $this->getMockBuilder($hookClass)
+            ->setMethods(array('checkFlexFormValue_beforeMerge'))
+            ->getMock();
         $hookMock->expects($this->once())->method('checkFlexFormValue_beforeMerge');
         $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['checkFlexFormValue'][] = $hookClass;
         GeneralUtility::addInstance($hookClass, $hookMock);
@@ -473,7 +479,7 @@ class DataHandlerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function logCallsWriteLogOfBackendUserIfLoggingIsEnabled()
     {
-        $backendUser = $this->getMock(BackendUserAuthentication::class);
+        $backendUser = $this->createMock(BackendUserAuthentication::class);
         $backendUser->expects($this->once())->method('writelog');
         $this->subject->enableLogging = true;
         $this->subject->BE_USER = $backendUser;
@@ -485,7 +491,7 @@ class DataHandlerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function logDoesNotCallWriteLogOfBackendUserIfLoggingIsDisabled()
     {
-        $backendUser = $this->getMock(BackendUserAuthentication::class);
+        $backendUser = $this->createMock(BackendUserAuthentication::class);
         $backendUser->expects($this->never())->method('writelog');
         $this->subject->enableLogging = false;
         $this->subject->BE_USER = $backendUser;
@@ -497,7 +503,7 @@ class DataHandlerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function logAddsEntryToLocalErrorLogArray()
     {
-        $backendUser = $this->getMock(BackendUserAuthentication::class);
+        $backendUser = $this->createMock(BackendUserAuthentication::class);
         $this->subject->BE_USER = $backendUser;
         $this->subject->enableLogging = true;
         $this->subject->errorLog = array();
@@ -511,7 +517,7 @@ class DataHandlerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function logFormatsDetailMessageWithAdditionalDataInLocalErrorArray()
     {
-        $backendUser = $this->getMock(BackendUserAuthentication::class);
+        $backendUser = $this->createMock(BackendUserAuthentication::class);
         $this->subject->BE_USER = $backendUser;
         $this->subject->enableLogging = true;
         $this->subject->errorLog = array();
@@ -738,7 +744,7 @@ class DataHandlerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             array('dummy')
         );
 
-        $backendUser = $this->getMock(BackendUserAuthentication::class);
+        $backendUser = $this->createMock(BackendUserAuthentication::class);
         $subject->BE_USER = $backendUser;
         $subject->BE_USER->workspace = 1;
 
@@ -786,7 +792,9 @@ class DataHandlerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function deletePagesOnRootLevelIsDenied()
     {
         /** @var DataHandler|\PHPUnit_Framework_MockObject_MockObject|AccessibleObjectInterface $dataHandlerMock */
-        $dataHandlerMock = $this->getMock(DataHandler::class, ['canDeletePage', 'newlog2']);
+        $dataHandlerMock = $this->getMockBuilder(DataHandler::class)
+            ->setMethods(['canDeletePage', 'newlog2'])
+            ->getMock();
         $dataHandlerMock
             ->expects($this->never())
             ->method('canDeletePage');
@@ -813,7 +821,7 @@ class DataHandlerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         );
 
         /** @var \TYPO3\CMS\Core\Database\RelationHandler $mockRelationHandler */
-        $mockRelationHandler = $this->getMock(\TYPO3\CMS\Core\Database\RelationHandler::class, array(), array(), '', false);
+        $mockRelationHandler = $this->createMock(\TYPO3\CMS\Core\Database\RelationHandler::class);
         $mockRelationHandler->itemArray = array(
             '1' => array('table' => $this->getUniqueId('bar_'), 'id' => 67)
         );
diff --git a/typo3/sysext/core/Tests/Unit/Database/ConnectionTest.php b/typo3/sysext/core/Tests/Unit/Database/ConnectionTest.php
index 6d3f70f4b1aff10a4cf1b3cb4fdb63de129c8a8c..702f44df2a5cbe0f4f69b609aead515fa9fbb6c9 100644
--- a/typo3/sysext/core/Tests/Unit/Database/ConnectionTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/ConnectionTest.php
@@ -391,9 +391,7 @@ class ConnectionTest extends UnitTestCase
      */
     public function selectQueries(array $args, string $expectedQuery, array $expectedParameters)
     {
-        $resultStatement = $this->getMockBuilder(Statement::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $resultStatement = $this->createMock(Statement::class);
 
         $this->connection->expects($this->once())
             ->method('executeQuery')
@@ -443,9 +441,7 @@ class ConnectionTest extends UnitTestCase
      */
     public function countQueries(array $args, string $expectedQuery, array $expectedParameters)
     {
-        $resultStatement = $this->getMockBuilder(Statement::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $resultStatement = $this->createMock(Statement::class);
 
         $resultStatement->expects($this->once())
             ->method('fetchColumn')
diff --git a/typo3/sysext/core/Tests/Unit/Database/DatabaseConnectionTest.php b/typo3/sysext/core/Tests/Unit/Database/DatabaseConnectionTest.php
index acdac77ae38052ed202f1753a9977d65e900d8fe..42dfd5c934df6607e3bb392e7ad49e885de48e28 100644
--- a/typo3/sysext/core/Tests/Unit/Database/DatabaseConnectionTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/DatabaseConnectionTest.php
@@ -79,7 +79,7 @@ class DatabaseConnectionTest extends UnitTestCase
             ->will($this->returnCallback(function ($data) {
                 return $data;
             }));
-        $mysqliMock = $this->getMock('mysqli');
+        $mysqliMock = $this->createMock('mysqli');
         $mysqliMock
             ->expects($this->once())
             ->method('query')
@@ -106,7 +106,7 @@ class DatabaseConnectionTest extends UnitTestCase
             ->will($this->returnCallback(function ($data) {
                 return $data;
             }));
-        $mysqliMock = $this->getMock('mysqli');
+        $mysqliMock = $this->createMock('mysqli');
         $mysqliMock
             ->expects($this->once())
             ->method('query')
@@ -233,7 +233,10 @@ class DatabaseConnectionTest extends UnitTestCase
     public function searchQueryCreatesQuery($expectedResult, array $searchWords, array $fields, $table, $constraint)
     {
         /** @var DatabaseConnection|\PHPUnit_Framework_MockObject_MockObject $subject */
-        $subject = $this->getMock(DatabaseConnection::class, ['quoteStr'], [], '', false);
+        $subject = $this->getMockBuilder(DatabaseConnection::class)
+            ->setMethods(['quoteStr'])
+            ->disableOriginalConstructor()
+            ->getMock();
         $subject
             ->expects($this->any())
             ->method('quoteStr')
@@ -254,7 +257,10 @@ class DatabaseConnectionTest extends UnitTestCase
     public function escapeStringForLikeComparison()
     {
         /** @var DatabaseConnection|\PHPUnit_Framework_MockObject_MockObject $subject */
-        $subject = $this->getMock(DatabaseConnection::class, ['dummy'], [], '', false);
+        $subject = $this->getMockBuilder(DatabaseConnection::class)
+            ->setMethods(['dummy'])
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->assertEquals('foo\\_bar\\%', $subject->escapeStrForLike('foo_bar%', 'table'));
     }
 
@@ -320,7 +326,10 @@ class DatabaseConnectionTest extends UnitTestCase
     public function stripOrderByForOrderByKeyword($orderByClause, $expectedResult)
     {
         /** @var DatabaseConnection|\PHPUnit_Framework_MockObject_MockObject $subject */
-        $subject = $this->getMock(DatabaseConnection::class, ['dummy'], [], '', false);
+        $subject = $this->getMockBuilder(DatabaseConnection::class)
+            ->setMethods(['dummy'])
+            ->disableOriginalConstructor()
+            ->getMock();
         $strippedQuery = $subject->stripOrderBy($orderByClause);
         $this->assertEquals($expectedResult, $strippedQuery);
     }
@@ -387,7 +396,10 @@ class DatabaseConnectionTest extends UnitTestCase
     public function stripGroupByForGroupByKeyword($groupByClause, $expectedResult)
     {
         /** @var DatabaseConnection|\PHPUnit_Framework_MockObject_MockObject $subject */
-        $subject = $this->getMock(DatabaseConnection::class, ['dummy'], [], '', false);
+        $subject = $this->getMockBuilder(DatabaseConnection::class)
+            ->setMethods(['dummy'])
+            ->disableOriginalConstructor()
+            ->getMock();
         $strippedQuery = $subject->stripGroupBy($groupByClause);
         $this->assertEquals($expectedResult, $strippedQuery);
     }
@@ -541,13 +553,11 @@ class DatabaseConnectionTest extends UnitTestCase
     public function noQuoteForFullQuoteArray(array $input, array $expected, $noQuote)
     {
         /** @var DatabaseConnection|\PHPUnit_Framework_MockObject_MockObject|AccessibleObjectInterface $subject */
-        $subject = $this->getMock(
-            DatabaseConnection::class,
-            ['fullQuoteStr'],
-            [],
-            '',
-            false
-        );
+        $subject = $this->getMockBuilder(DatabaseConnection::class)
+            ->setMethods(['fullQuoteStr'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $subject
             ->expects($this->any())
             ->method('fullQuoteStr')
@@ -567,7 +577,7 @@ class DatabaseConnectionTest extends UnitTestCase
         $subject->_set('isConnected', true);
         $subject->_set('databaseName', $this->testTable);
 
-        $mysqliMock = $this->getMock('mysqli');
+        $mysqliMock = $this->getMockBuilder('mysqli')->getMock();
         $mysqliMock
             ->expects($this->once())
             ->method('select_db')
@@ -589,7 +599,7 @@ class DatabaseConnectionTest extends UnitTestCase
         $subject->_set('isConnected', true);
         $subject->_set('databaseName', $this->testTable);
 
-        $mysqliMock = $this->getMock('mysqli');
+        $mysqliMock = $this->getMockBuilder('mysqli')->getMock();
         $mysqliMock
             ->expects($this->once())
             ->method('select_db')
diff --git a/typo3/sysext/core/Tests/Unit/Database/Query/BulkInsertTest.php b/typo3/sysext/core/Tests/Unit/Database/Query/BulkInsertTest.php
index 2cb78c4a68ee64a5a043ca4b3e93cd2fdb7f2bd0..79a17e18e0f056938df3048d8797611a79a6f754 100644
--- a/typo3/sysext/core/Tests/Unit/Database/Query/BulkInsertTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/Query/BulkInsertTest.php
@@ -46,9 +46,7 @@ class BulkInsertTest extends UnitTestCase
     {
         parent::setUp();
 
-        $this->connection = $this->getMockBuilder(Connection::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->connection = $this->createMock(Connection::class);
 
         $this->connection->expects($this->any())
             ->method('quoteIdentifier')
diff --git a/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/FrontendRestrictionContainerTest.php b/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/FrontendRestrictionContainerTest.php
index 0927168e5b39db1f68dc8c3a98b72bff36aeaf1b..c280b09b8329675ca79448637f803be81e06a116 100644
--- a/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/FrontendRestrictionContainerTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/FrontendRestrictionContainerTest.php
@@ -161,7 +161,7 @@ class FrontendRestrictionContainerTest extends AbstractRestrictionTestCase
             )
         ];
 
-        $pageRepository = $this->getMock(PageRepository::class);
+        $pageRepository = $this->createMock(PageRepository::class);
         $pageRepository->versioningWorkspaceId = $workspaceId;
         $pageRepository->versioningPreview = $workspacePreview;
 
@@ -171,7 +171,9 @@ class FrontendRestrictionContainerTest extends AbstractRestrictionTestCase
         $typoScriptFrontendController->gr_list = $feGroupList;
         $typoScriptFrontendController->sys_page = $pageRepository;
 
-        $dbMock = $this->getMock(DatabaseConnection::class, ['quoteStr']);
+        $dbMock = $this->getMockBuilder(DatabaseConnection::class)
+            ->setMethods(['quoteStr'])
+            ->getMock();
         $dbMock->expects($this->any())->method('quoteStr')->willReturnArgument(0);
 
         $GLOBALS['TSFE'] = $typoScriptFrontendController;
diff --git a/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/FrontendWorkspaceRestrictionTest.php b/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/FrontendWorkspaceRestrictionTest.php
index e7689f7e0c9a47ace9d6e766adb9b8913eb86ae7..2844e79ce9d5971078bec9547fa93b4bbbf9b200 100644
--- a/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/FrontendWorkspaceRestrictionTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/Query/Restriction/FrontendWorkspaceRestrictionTest.php
@@ -41,7 +41,7 @@ class FrontendWorkspaceRestrictionTest extends AbstractRestrictionTestCase
             ]
         ];
 
-        $pageRepository = $this->getMock(PageRepository::class);
+        $pageRepository = $this->createMock(PageRepository::class);
         $pageRepository->versioningPreview = false;
 
         $subject = new FrontendWorkspaceRestriction(0);
@@ -62,7 +62,7 @@ class FrontendWorkspaceRestrictionTest extends AbstractRestrictionTestCase
             ]
         ];
 
-        $pageRepository = $this->getMock(PageRepository::class);
+        $pageRepository = $this->createMock(PageRepository::class);
         $pageRepository->versioningPreview = true;
         $pageRepository->versioningWorkspaceId = 42;
 
@@ -84,7 +84,7 @@ class FrontendWorkspaceRestrictionTest extends AbstractRestrictionTestCase
             ]
         ];
 
-        $pageRepository = $this->getMock(PageRepository::class);
+        $pageRepository = $this->createMock(PageRepository::class);
         $pageRepository->versioningPreview = true;
         $pageRepository->versioningWorkspaceId = 42;
 
diff --git a/typo3/sysext/core/Tests/Unit/Database/RelationHandlerTest.php b/typo3/sysext/core/Tests/Unit/Database/RelationHandlerTest.php
index 33056fe10af6c581932387a8e9b0cd6d8ae0046e..8cc44cd77d3e54abe4fff35e2500032a5f3d5492 100644
--- a/typo3/sysext/core/Tests/Unit/Database/RelationHandlerTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/RelationHandlerTest.php
@@ -29,7 +29,9 @@ class RelationHandlerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     protected function setUp()
     {
-        $this->subject = $this->getMock(\TYPO3\CMS\Core\Database\RelationHandler::class, array('purgeVersionedIds', 'purgeLiveVersionedIds'));
+        $this->subject = $this->getMockBuilder(\TYPO3\CMS\Core\Database\RelationHandler::class)
+            ->setMethods(array('purgeVersionedIds', 'purgeLiveVersionedIds'))
+            ->getMock();
     }
 
     /**
diff --git a/typo3/sysext/core/Tests/Unit/Error/DebugExceptionHandlerTest.php b/typo3/sysext/core/Tests/Unit/Error/DebugExceptionHandlerTest.php
index 82d8c7ce50c4e152a94dfc3f8abcc2b966d220e4..6ac5ae15bd5b88ef1252158c78e05706033c83b1 100644
--- a/typo3/sysext/core/Tests/Unit/Error/DebugExceptionHandlerTest.php
+++ b/typo3/sysext/core/Tests/Unit/Error/DebugExceptionHandlerTest.php
@@ -29,7 +29,10 @@ class DebugExceptionHandlerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     protected function setUp()
     {
-        $this->subject = $this->getMock(\TYPO3\CMS\Core\Error\DebugExceptionHandler::class, array('sendStatusHeaders', 'writeLogEntries'), array(), '', false);
+        $this->subject = $this->getMockBuilder(\TYPO3\CMS\Core\Error\DebugExceptionHandler::class)
+            ->setMethods(array('sendStatusHeaders', 'writeLogEntries'))
+            ->disableOriginalConstructor()
+            ->getMock();
     }
 
     /**
diff --git a/typo3/sysext/core/Tests/Unit/Error/ProductionExceptionHandlerTest.php b/typo3/sysext/core/Tests/Unit/Error/ProductionExceptionHandlerTest.php
index 346627b80c82229729a2b03afbc33d4334ecd67b..32ce57b56ee555c92aceb58d585b8f3d17442ff7 100644
--- a/typo3/sysext/core/Tests/Unit/Error/ProductionExceptionHandlerTest.php
+++ b/typo3/sysext/core/Tests/Unit/Error/ProductionExceptionHandlerTest.php
@@ -29,7 +29,10 @@ class ProductionExceptionHandlerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     protected function setUp()
     {
-        $this->subject = $this->getMock(\TYPO3\CMS\Core\Error\ProductionExceptionHandler::class, array('discloseExceptionInformation', 'sendStatusHeaders', 'writeLogEntries'), array(), '', false);
+        $this->subject = $this->getMockBuilder(\TYPO3\CMS\Core\Error\ProductionExceptionHandler::class)
+            ->setMethods(array('discloseExceptionInformation', 'sendStatusHeaders', 'writeLogEntries'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->subject->expects($this->any())->method('discloseExceptionInformation')->will($this->returnValue(true));
     }
 
@@ -55,7 +58,10 @@ class ProductionExceptionHandlerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $title = '<b>b</b><script>alert(1);</script>';
         /** @var $exception \Exception|\PHPUnit_Framework_MockObject_MockObject */
-        $exception = $this->getMock('Exception', array('getTitle'), array('some message'));
+        $exception = $this->getMockBuilder('Exception')
+            ->setMethods(array('getTitle'))
+            ->setConstructorArgs(array('some message'))
+            ->getMock();
         $exception->expects($this->any())->method('getTitle')->will($this->returnValue($title));
         ob_start();
         $this->subject->echoExceptionWeb($exception);
diff --git a/typo3/sysext/core/Tests/Unit/FormProtection/AbstractFormProtectionTest.php b/typo3/sysext/core/Tests/Unit/FormProtection/AbstractFormProtectionTest.php
index f9e6ee7c83319a5b7317b951136421b63cb0b002..c72b81dde83120e30d28619585d57fd9d449dd5f 100644
--- a/typo3/sysext/core/Tests/Unit/FormProtection/AbstractFormProtectionTest.php
+++ b/typo3/sysext/core/Tests/Unit/FormProtection/AbstractFormProtectionTest.php
@@ -37,7 +37,9 @@ class AbstractFormProtectionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function generateTokenRetrievesTokenOnce()
     {
-        $subject = $this->getMock(\TYPO3\CMS\Core\Tests\Unit\FormProtection\Fixtures\FormProtectionTesting::class, array('retrieveSessionToken'));
+        $subject = $this->getMockBuilder(\TYPO3\CMS\Core\Tests\Unit\FormProtection\Fixtures\FormProtectionTesting::class)
+            ->setMethods(array('retrieveSessionToken'))
+            ->getMock();
         $subject->expects($this->once())->method('retrieveSessionToken')->will($this->returnValue('token'));
         $subject->generateToken('foo');
         $subject->generateToken('foo');
@@ -48,7 +50,9 @@ class AbstractFormProtectionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function validateTokenRetrievesTokenOnce()
     {
-        $subject = $this->getMock(\TYPO3\CMS\Core\Tests\Unit\FormProtection\Fixtures\FormProtectionTesting::class, array('retrieveSessionToken'));
+        $subject = $this->getMockBuilder(\TYPO3\CMS\Core\Tests\Unit\FormProtection\Fixtures\FormProtectionTesting::class)
+            ->setMethods(array('retrieveSessionToken'))
+            ->getMock();
         $subject->expects($this->once())->method('retrieveSessionToken')->will($this->returnValue('token'));
         $subject->validateToken('foo', 'bar');
         $subject->validateToken('foo', 'bar');
@@ -70,7 +74,9 @@ class AbstractFormProtectionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function cleanPersistsToken()
     {
-        $subject = $this->getMock(\TYPO3\CMS\Core\Tests\Unit\FormProtection\Fixtures\FormProtectionTesting::class, array('persistSessionToken'));
+        $subject = $this->getMockBuilder(\TYPO3\CMS\Core\Tests\Unit\FormProtection\Fixtures\FormProtectionTesting::class)
+            ->setMethods(array('persistSessionToken'))
+            ->getMock();
         $subject->expects($this->once())->method('persistSessionToken');
         $subject->clean();
     }
@@ -234,7 +240,9 @@ class AbstractFormProtectionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function validateTokenForValidTokenNotCallsCreateValidationErrorMessage()
     {
         /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\Unit\FormProtection\Fixtures\FormProtectionTesting $subject */
-        $subject = $this->getMock(\TYPO3\CMS\Core\Tests\Unit\FormProtection\Fixtures\FormProtectionTesting::class, array('createValidationErrorMessage'));
+        $subject = $this->getMockBuilder(\TYPO3\CMS\Core\Tests\Unit\FormProtection\Fixtures\FormProtectionTesting::class)
+            ->setMethods(array('createValidationErrorMessage'))
+            ->getMock();
         $subject->expects($this->never())->method('createValidationErrorMessage');
         $formName = 'foo';
         $action = 'edit';
@@ -250,7 +258,9 @@ class AbstractFormProtectionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function validateTokenForInvalidTokenCallsCreateValidationErrorMessage()
     {
         /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\Unit\FormProtection\Fixtures\FormProtectionTesting $subject */
-        $subject = $this->getMock(\TYPO3\CMS\Core\Tests\Unit\FormProtection\Fixtures\FormProtectionTesting::class, array('createValidationErrorMessage'));
+        $subject = $this->getMockBuilder(\TYPO3\CMS\Core\Tests\Unit\FormProtection\Fixtures\FormProtectionTesting::class)
+            ->setMethods(array('createValidationErrorMessage'))
+            ->getMock();
         $subject->expects($this->once())->method('createValidationErrorMessage');
         $formName = 'foo';
         $action = 'edit';
@@ -266,7 +276,9 @@ class AbstractFormProtectionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function validateTokenForInvalidFormNameCallsCreateValidationErrorMessage()
     {
         /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\Unit\FormProtection\Fixtures\FormProtectionTesting $subject */
-        $subject = $this->getMock(\TYPO3\CMS\Core\Tests\Unit\FormProtection\Fixtures\FormProtectionTesting::class, array('createValidationErrorMessage'));
+        $subject = $this->getMockBuilder(\TYPO3\CMS\Core\Tests\Unit\FormProtection\Fixtures\FormProtectionTesting::class)
+            ->setMethods(array('createValidationErrorMessage'))
+            ->getMock();
         $subject->expects($this->once())->method('createValidationErrorMessage');
         $formName = 'foo';
         $action = 'edit';
diff --git a/typo3/sysext/core/Tests/Unit/FormProtection/BackendFormProtectionTest.php b/typo3/sysext/core/Tests/Unit/FormProtection/BackendFormProtectionTest.php
index d7fc0cd82e0ad8b282d859b5508af004fc81994b..371e06aaa0a43e74598664425234153cb04d527d 100644
--- a/typo3/sysext/core/Tests/Unit/FormProtection/BackendFormProtectionTest.php
+++ b/typo3/sysext/core/Tests/Unit/FormProtection/BackendFormProtectionTest.php
@@ -43,9 +43,9 @@ class BackendFormProtectionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     protected function setUp()
     {
-        $this->backendUserMock = $this->getMock(\TYPO3\CMS\Core\Authentication\BackendUserAuthentication::class);
+        $this->backendUserMock = $this->createMock(\TYPO3\CMS\Core\Authentication\BackendUserAuthentication::class);
         $this->backendUserMock->user['uid'] = 1;
-        $this->registryMock = $this->getMock(Registry::class);
+        $this->registryMock = $this->createMock(Registry::class);
         $this->subject = new BackendFormProtection(
             $this->backendUserMock,
             $this->registryMock,
diff --git a/typo3/sysext/core/Tests/Unit/FormProtection/FormProtectionFactoryTest.php b/typo3/sysext/core/Tests/Unit/FormProtection/FormProtectionFactoryTest.php
index f6aae7ee96eadfc78e002b2bb427f72167772cca..a8e8039193513b97520254faef7fb2901f0a9f15 100644
--- a/typo3/sysext/core/Tests/Unit/FormProtection/FormProtectionFactoryTest.php
+++ b/typo3/sysext/core/Tests/Unit/FormProtection/FormProtectionFactoryTest.php
@@ -62,14 +62,14 @@ class FormProtectionFactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function getForTypeBackEndWithExistingBackEndReturnsBackEndFormProtection()
     {
-        $userMock = $this->getMock(\TYPO3\CMS\Core\Authentication\BackendUserAuthentication::class, array(), array(), '', false);
+        $userMock = $this->createMock(\TYPO3\CMS\Core\Authentication\BackendUserAuthentication::class);
         $userMock->user = array('uid' => $this->getUniqueId());
         $this->assertInstanceOf(
             \TYPO3\CMS\Core\FormProtection\BackendFormProtection::class,
             FormProtectionFactory::get(
                 \TYPO3\CMS\Core\FormProtection\BackendFormProtection::class,
                 $userMock,
-                $this->getMock(Registry::class)
+                $this->createMock(Registry::class)
             )
         );
     }
@@ -79,12 +79,12 @@ class FormProtectionFactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function getForTypeBackEndCalledTwoTimesReturnsTheSameInstance()
     {
-        $userMock = $this->getMock(\TYPO3\CMS\Core\Authentication\BackendUserAuthentication::class, array(), array(), '', false);
+        $userMock = $this->createMock(\TYPO3\CMS\Core\Authentication\BackendUserAuthentication::class);
         $userMock->user = array('uid' => $this->getUniqueId());
         $arguments = [
             \TYPO3\CMS\Core\FormProtection\BackendFormProtection::class,
             $userMock,
-            $this->getMock(Registry::class)
+            $this->createMock(Registry::class)
         ];
         $this->assertSame(
             call_user_func_array([FormProtectionFactory::class, 'get'], $arguments),
@@ -144,19 +144,13 @@ class FormProtectionFactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function createValidationErrorMessageAddsErrorFlashMessageButNotInSessionInAjaxRequest()
     {
-        $flashMessageQueueMock = $this->getMock(
-            \TYPO3\CMS\Core\Messaging\FlashMessageQueue::class,
-            array(),
-            array(),
-            '',
-            false
-        );
+        $flashMessageQueueMock = $this->createMock(\TYPO3\CMS\Core\Messaging\FlashMessageQueue::class);
         $flashMessageQueueMock
             ->expects($this->once())
             ->method('enqueue')
             ->with($this->isInstanceOf(\TYPO3\CMS\Core\Messaging\FlashMessage::class))
             ->will($this->returnCallback(array($this, 'enqueueAjaxFlashMessageCallback')));
-        $languageServiceMock = $this->getMock(\TYPO3\CMS\Lang\LanguageService::class, array(), array(), '', false);
+        $languageServiceMock = $this->createMock(\TYPO3\CMS\Lang\LanguageService::class);
         $languageServiceMock->expects($this->once())->method('sL')->will($this->returnValue('foo'));
 
         FormProtectionFactory::getMessageClosure($languageServiceMock, $flashMessageQueueMock, true)->__invoke();
diff --git a/typo3/sysext/core/Tests/Unit/Imaging/IconFactoryTest.php b/typo3/sysext/core/Tests/Unit/Imaging/IconFactoryTest.php
index 9622f9c6c9435b6fd4cfc722c6af7a08203234e4..479d490e674b183c34b36ca71001f8f658eb4053 100644
--- a/typo3/sysext/core/Tests/Unit/Imaging/IconFactoryTest.php
+++ b/typo3/sysext/core/Tests/Unit/Imaging/IconFactoryTest.php
@@ -529,8 +529,10 @@ class IconFactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     protected function getTestSubjectFileObject($extension, $mimeType = '')
     {
-        $mockedStorage = $this->getMock(\TYPO3\CMS\Core\Resource\ResourceStorage::class, array(), array(), '', false);
-        $mockedFile = $this->getMock(\TYPO3\CMS\Core\Resource\File::class, array(), array(array(), $mockedStorage));
+        $mockedStorage = $this->createMock(\TYPO3\CMS\Core\Resource\ResourceStorage::class);
+        $mockedFile = $this->getMockBuilder(\TYPO3\CMS\Core\Resource\File::class)
+            ->setConstructorArgs(array(array(), $mockedStorage))
+            ->getMock();
         $mockedFile->expects($this->atMost(1))->method('getExtension')->will($this->returnValue($extension));
         $mockedFile->expects($this->atLeastOnce())->method('getMimeType')->will($this->returnValue($mimeType));
         return $mockedFile;
@@ -544,7 +546,7 @@ class IconFactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     protected function getTestSubjectFolderObject($identifier)
     {
-        $mockedStorage = $this->getMock(\TYPO3\CMS\Core\Resource\ResourceStorage::class, array(), array(), '', false);
+        $mockedStorage = $this->createMock(\TYPO3\CMS\Core\Resource\ResourceStorage::class);
         $mockedStorage->expects($this->any())->method('getRootLevelFolder')->will($this->returnValue(
             new \TYPO3\CMS\Core\Resource\Folder($mockedStorage, '/', '/')
         ));
diff --git a/typo3/sysext/core/Tests/Unit/Localization/LocalizationFactoryTest.php b/typo3/sysext/core/Tests/Unit/Localization/LocalizationFactoryTest.php
index 4587ee126bc25c27b9fffb774c0d3204e0104f08..9766000057a58b1c91d181b2fffe9834a78de8aa 100644
--- a/typo3/sysext/core/Tests/Unit/Localization/LocalizationFactoryTest.php
+++ b/typo3/sysext/core/Tests/Unit/Localization/LocalizationFactoryTest.php
@@ -68,8 +68,13 @@ class LocalizationFactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         /** @var $subject LocalizationFactory */
         $localizationFactory = $this->getAccessibleMock(LocalizationFactory::class, array('localizationOverride'));
-        $languageStore = $this->getMock(\TYPO3\CMS\Core\Localization\LanguageStore::class, array('hasData', 'setConfiguration', 'getData', 'setData'));
-        $cacheInstance = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class, array('get', 'set'), array(), '', false);
+        $languageStore = $this->getMockBuilder(\TYPO3\CMS\Core\Localization\LanguageStore::class)
+            ->setMethods(array('hasData', 'setConfiguration', 'getData', 'setData'))
+            ->getMock();
+        $cacheInstance = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class)
+            ->setMethods(array('get', 'set'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $localizationFactory->_set('store', $languageStore);
         $localizationFactory->_set('cacheInstance', $cacheInstance);
         $languageStore->method('hasData')->willReturn(false);
diff --git a/typo3/sysext/core/Tests/Unit/Log/LoggerTest.php b/typo3/sysext/core/Tests/Unit/Log/LoggerTest.php
index d60e8b73e6fc392af14049c913550722fc1af57b..a498c2d0a7182b693cf996bad8e633a716d6b2ff 100644
--- a/typo3/sysext/core/Tests/Unit/Log/LoggerTest.php
+++ b/typo3/sysext/core/Tests/Unit/Log/LoggerTest.php
@@ -91,7 +91,9 @@ class LoggerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $message = 'test';
         $logger = new Logger($component);
         /** @var $processor \TYPO3\CMS\Core\Log\Processor\ProcessorInterface|\PHPUnit_Framework_MockObject_MockObject */
-        $processor = $this->getMock(NullProcessor::class, array('processLogRecord'));
+        $processor = $this->getMockBuilder(NullProcessor::class)
+            ->setMethods(array('processLogRecord'))
+            ->getMock();
         $processor->expects($this->once())->method('processLogRecord')->will($this->returnValue(new LogRecord($component, $level, $message)));
         $logger->addProcessor($level, $processor);
             // we need a writer, otherwise we will not process log records
@@ -106,7 +108,9 @@ class LoggerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $logger = new Logger('test.core.log');
         /** @var NullWriter|\PHPUnit_Framework_MockObject_MockObject $writer */
-        $writer = $this->getMock(NullWriter::class, array('writeLog'));
+        $writer = $this->getMockBuilder(NullWriter::class)
+            ->setMethods(array('writeLog'))
+            ->getMock();
         $writer->expects($this->once())->method('writeLog');
         $logger->addWriter(LogLevel::DEBUG, $writer);
         $logger->warning('test');
diff --git a/typo3/sysext/core/Tests/Unit/Log/Processor/AbstractProcessorTest.php b/typo3/sysext/core/Tests/Unit/Log/Processor/AbstractProcessorTest.php
index b8473d835fc86bf9d61b01b89be38c798cc57b05..824578cc19e1d76b396215d7485a26d760548eb9 100644
--- a/typo3/sysext/core/Tests/Unit/Log/Processor/AbstractProcessorTest.php
+++ b/typo3/sysext/core/Tests/Unit/Log/Processor/AbstractProcessorTest.php
@@ -45,7 +45,9 @@ class AbstractProcessorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $writer = new \TYPO3\CMS\Core\Log\Writer\NullWriter();
         $level = \TYPO3\CMS\Core\Log\LogLevel::DEBUG;
         $logRecord = new \TYPO3\CMS\Core\Log\LogRecord('dummy', $level, 'message');
-        $processor = $this->getMock(\TYPO3\CMS\Core\Log\Processor\ProcessorInterface::class, array('processLogRecord'));
+        $processor = $this->getMockBuilder(\TYPO3\CMS\Core\Log\Processor\ProcessorInterface::class)
+            ->setMethods(array('processLogRecord'))
+            ->getMock();
         $processor->expects($this->once())->method('processLogRecord')->willReturn($logRecord);
 
         $logger->addWriter($level, $writer);
diff --git a/typo3/sysext/core/Tests/Unit/Log/Writer/DatabaseWriterTest.php b/typo3/sysext/core/Tests/Unit/Log/Writer/DatabaseWriterTest.php
index 47031e278106c7c91929df356129e89e898fa897..653b4c0b95a5eff504e859f53a00ba3941f7f8aa 100644
--- a/typo3/sysext/core/Tests/Unit/Log/Writer/DatabaseWriterTest.php
+++ b/typo3/sysext/core/Tests/Unit/Log/Writer/DatabaseWriterTest.php
@@ -26,7 +26,10 @@ class DatabaseWriterTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $logTable = $this->getUniqueId('logtable_');
         /** @var \TYPO3\CMS\Core\Log\Writer\DatabaseWriter|\PHPUnit_Framework_MockObject_MockObject $subject */
-        $subject = $this->getMock(\TYPO3\CMS\Core\Log\Writer\DatabaseWriter::class, array('dummy'), array(), '', false);
+        $subject = $this->getMockBuilder(\TYPO3\CMS\Core\Log\Writer\DatabaseWriter::class)
+            ->setMethods(array('dummy'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $subject->setLogTable($logTable);
         $this->assertSame($logTable, $subject->getLogTable());
     }
@@ -39,12 +42,15 @@ class DatabaseWriterTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->expectException(\RuntimeException::class);
         $this->expectExceptionCode(1345036334);
 
-        $GLOBALS['TYPO3_DB'] = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array(), array(), '', false);
+        $GLOBALS['TYPO3_DB'] = $this->createMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class);
         $GLOBALS['TYPO3_DB']->expects($this->once())->method('exec_INSERTquery')->will($this->returnValue(false));
         /** @var \TYPO3\CMS\Core\Log\LogRecord|\PHPUnit_Framework_MockObject_MockObject $subject */
-        $logRecordMock = $this->getMock(\TYPO3\CMS\Core\Log\LogRecord::class, array(), array(), '', false);
+        $logRecordMock = $this->createMock(\TYPO3\CMS\Core\Log\LogRecord::class);
         /** @var \TYPO3\CMS\Core\Log\Writer\DatabaseWriter|\PHPUnit_Framework_MockObject_MockObject $subject */
-        $subject = $this->getMock(\TYPO3\CMS\Core\Log\Writer\DatabaseWriter::class, array('dummy'), array(), '', false);
+        $subject = $this->getMockBuilder(\TYPO3\CMS\Core\Log\Writer\DatabaseWriter::class)
+            ->setMethods(array('dummy'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $subject->writeLog($logRecordMock);
     }
 
@@ -54,12 +60,15 @@ class DatabaseWriterTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function writeLogInsertsToSpecifiedTable()
     {
         $logTable = $this->getUniqueId('logtable_');
-        $GLOBALS['TYPO3_DB'] = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array(), array(), '', false);
+        $GLOBALS['TYPO3_DB'] = $this->createMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class);
         $GLOBALS['TYPO3_DB']->expects($this->once())->method('exec_INSERTquery')->with($logTable, $this->anything());
         /** @var \TYPO3\CMS\Core\Log\LogRecord|\PHPUnit_Framework_MockObject_MockObject $subject */
-        $logRecordMock = $this->getMock(\TYPO3\CMS\Core\Log\LogRecord::class, array(), array(), '', false);
+        $logRecordMock = $this->createMock(\TYPO3\CMS\Core\Log\LogRecord::class);
         /** @var \TYPO3\CMS\Core\Log\Writer\DatabaseWriter|\PHPUnit_Framework_MockObject_MockObject $subject */
-        $subject = $this->getMock(\TYPO3\CMS\Core\Log\Writer\DatabaseWriter::class, array('dummy'), array(), '', false);
+        $subject = $this->getMockBuilder(\TYPO3\CMS\Core\Log\Writer\DatabaseWriter::class)
+            ->setMethods(array('dummy'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $subject->setLogTable($logTable);
         $subject->writeLog($logRecordMock);
     }
@@ -78,7 +87,7 @@ class DatabaseWriterTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             'data' => '',
         );
         /** @var \TYPO3\CMS\Core\Log\LogRecord|\PHPUnit_Framework_MockObject_MockObject $subject */
-        $logRecordFixture = $this->getMock(\TYPO3\CMS\Core\Log\LogRecord::class, array(), array(), '', false);
+        $logRecordFixture = $this->createMock(\TYPO3\CMS\Core\Log\LogRecord::class);
         $logRecordFixture->expects($this->any())->method('getRequestId')->will($this->returnValue($logRecordData['request_id']));
         $logRecordFixture->expects($this->any())->method('getCreated')->will($this->returnValue($logRecordData['time_micro']));
         $logRecordFixture->expects($this->any())->method('getComponent')->will($this->returnValue($logRecordData['component']));
@@ -90,7 +99,7 @@ class DatabaseWriterTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         #$subject = $this->getMock(\TYPO3\CMS\Core\Log\Writer\DatabaseWriter::class, array('dummy'), array(), '', FALSE);
         $subject = new \TYPO3\CMS\Core\Log\Writer\DatabaseWriter();
 
-        $GLOBALS['TYPO3_DB'] = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array(), array(), '', false);
+        $GLOBALS['TYPO3_DB'] = $this->createMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class);
         $GLOBALS['TYPO3_DB']->expects($this->once())->method('exec_INSERTquery')->with($this->anything(), $logRecordData);
 
         $subject->writeLog($logRecordFixture);
diff --git a/typo3/sysext/core/Tests/Unit/Log/Writer/FileWriterTest.php b/typo3/sysext/core/Tests/Unit/Log/Writer/FileWriterTest.php
index 456d5536b1ffd03600aab76bcf061eb6a219bde2..ef05555999facdfdea73fdadd032db48be217c79 100644
--- a/typo3/sysext/core/Tests/Unit/Log/Writer/FileWriterTest.php
+++ b/typo3/sysext/core/Tests/Unit/Log/Writer/FileWriterTest.php
@@ -177,8 +177,12 @@ class FileWriterTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $this->setUpVfsStream();
 
-        $firstWriter = $this->getMock(\TYPO3\CMS\Core\Log\Writer\FileWriter::class, array('dummy'));
-        $secondWriter = $this->getMock(\TYPO3\CMS\Core\Log\Writer\FileWriter::class, array('createLogFile'));
+        $firstWriter = $this->getMockBuilder(\TYPO3\CMS\Core\Log\Writer\FileWriter::class)
+            ->setMethods(array('dummy'))
+            ->getMock();
+        $secondWriter = $this->getMockBuilder(\TYPO3\CMS\Core\Log\Writer\FileWriter::class)
+            ->setMethods(array('createLogFile'))
+            ->getMock();
 
         $secondWriter->expects($this->never())->method('createLogFile');
 
diff --git a/typo3/sysext/core/Tests/Unit/Mail/MailerTest.php b/typo3/sysext/core/Tests/Unit/Mail/MailerTest.php
index 8cf4ae6a8f7b7498bd1b206b2e917273cc22494b..62ef98c581f8f995009499d226b8b835ccc346e9 100644
--- a/typo3/sysext/core/Tests/Unit/Mail/MailerTest.php
+++ b/typo3/sysext/core/Tests/Unit/Mail/MailerTest.php
@@ -27,7 +27,10 @@ class MailerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 
     protected function setUp()
     {
-        $this->subject = $this->getMock(\TYPO3\CMS\Core\Mail\Mailer::class, array('emitPostInitializeMailerSignal'), array(), '', false);
+        $this->subject = $this->getMockBuilder(\TYPO3\CMS\Core\Mail\Mailer::class)
+            ->setMethods(array('emitPostInitializeMailerSignal'))
+            ->disableOriginalConstructor()
+            ->getMock();
     }
 
     //////////////////////////
diff --git a/typo3/sysext/core/Tests/Unit/Messaging/FlashMessageQueueTest.php b/typo3/sysext/core/Tests/Unit/Messaging/FlashMessageQueueTest.php
index 2732a5081cad694d18d2e5bd24c2b7ea1129aff5..e4c0aed2e7202f2a69897f485ecdd9dd16b3f6f6 100644
--- a/typo3/sysext/core/Tests/Unit/Messaging/FlashMessageQueueTest.php
+++ b/typo3/sysext/core/Tests/Unit/Messaging/FlashMessageQueueTest.php
@@ -31,7 +31,9 @@ class FlashMessageQueueTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 
     protected function setUp()
     {
-        $this->frontendUser = $this->getMock(\TYPO3\CMS\Frontend\Authentication\FrontendUserAuthentication::class, array('dummy'));
+        $this->frontendUser = $this->getMockBuilder(\TYPO3\CMS\Frontend\Authentication\FrontendUserAuthentication::class)
+            ->setMethods(array('dummy'))
+            ->getMock();
         $this->flashMessageQueue = $this->getAccessibleMock(
             \TYPO3\CMS\Core\Messaging\FlashMessageQueue::class,
             array('getUserByContext'),
diff --git a/typo3/sysext/core/Tests/Unit/Package/PackageManagerTest.php b/typo3/sysext/core/Tests/Unit/Package/PackageManagerTest.php
index 29a48d719e0871a838c67b4a0a1b90ecb0dde457..888a843e948d1b21b68f9d65f96ad4eeb836053a 100644
--- a/typo3/sysext/core/Tests/Unit/Package/PackageManagerTest.php
+++ b/typo3/sysext/core/Tests/Unit/Package/PackageManagerTest.php
@@ -40,8 +40,14 @@ class PackageManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         vfsStream::setup('Test');
 
         /** @var PhpFrontend|\PHPUnit_Framework_MockObject_MockObject $mockCache */
-        $mockCache = $this->getMock(PhpFrontend::class, array('has', 'set', 'getBackend'), array(), '', false);
-        $mockCacheBackend = $this->getMock(SimpleFileBackend::class, array('has', 'set', 'getBackend', 'getCacheDirectory'), array(), '', false);
+        $mockCache = $this->getMockBuilder(PhpFrontend::class)
+            ->setMethods(array('has', 'set', 'getBackend'))
+            ->disableOriginalConstructor()
+            ->getMock();
+        $mockCacheBackend = $this->getMockBuilder(SimpleFileBackend::class)
+            ->setMethods(array('has', 'set', 'getBackend', 'getCacheDirectory'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockCache->expects($this->any())->method('has')->will($this->returnValue(false));
         $mockCache->expects($this->any())->method('set')->will($this->returnValue(true));
         $mockCache->expects($this->any())->method('getBackend')->will($this->returnValue($mockCacheBackend));
@@ -161,7 +167,7 @@ class PackageManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $packageManager->_set('packageStatesPathAndFilename', 'vfs://Test/Configuration/PackageStates.php');
 
         /** @var DependencyResolver|\PHPUnit_Framework_MockObject_MockObject $dependencyResolver */
-        $dependencyResolver = $this->getMock(DependencyResolver::class);
+        $dependencyResolver = $this->createMock(DependencyResolver::class);
         $dependencyResolver
             ->expects($this->any())
             ->method('sortPackageStatesConfigurationByDependency')
@@ -213,7 +219,7 @@ class PackageManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $packageManager->_set('packageStatesPathAndFilename', 'vfs://Test/Configuration/PackageStates.php');
 
         /** @var DependencyResolver|\PHPUnit_Framework_MockObject_MockObject $dependencyResolver */
-        $dependencyResolver = $this->getMock(DependencyResolver::class);
+        $dependencyResolver = $this->createMock(DependencyResolver::class);
         $dependencyResolver
             ->expects($this->any())
             ->method('sortPackageStatesConfigurationByDependency')
diff --git a/typo3/sysext/core/Tests/Unit/Package/PackageTest.php b/typo3/sysext/core/Tests/Unit/Package/PackageTest.php
index 1018b7f800c51d8a3927c013f053bac968126878..117dc2efaeb57742a262f2029651b4e4962eda60 100644
--- a/typo3/sysext/core/Tests/Unit/Package/PackageTest.php
+++ b/typo3/sysext/core/Tests/Unit/Package/PackageTest.php
@@ -38,7 +38,7 @@ class PackageTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->expectException(InvalidPackagePathException::class);
         $this->expectExceptionCode(1166631890);
 
-        $packageManagerMock = $this->getMock(PackageManager::class);
+        $packageManagerMock = $this->createMock(PackageManager::class);
         $packageManagerMock->expects($this->any())->method('isPackageKeyValid')->willReturn(true);
         new Package($packageManagerMock, 'Vendor.TestPackage', './ThisPackageSurelyDoesNotExist');
     }
@@ -67,7 +67,7 @@ class PackageTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         file_put_contents($packagePath . 'composer.json', '{"name": "' . $packageKey . '", "type": "flow-test"}');
         file_put_contents($packagePath . 'ext_emconf.php', '');
 
-        $packageManagerMock = $this->getMock(PackageManager::class);
+        $packageManagerMock = $this->createMock(PackageManager::class);
         $packageManagerMock->expects($this->any())->method('isPackageKeyValid')->willReturn(true);
         $package = new Package($packageManagerMock, $packageKey, $packagePath);
         $this->assertEquals($packageKey, $package->getPackageKey());
@@ -96,7 +96,7 @@ class PackageTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $packagePath = 'vfs://Packages/' . str_replace('\\', '/', $packageKey) . '/';
         mkdir($packagePath, 0777, true);
 
-        $packageManagerMock = $this->getMock(PackageManager::class);
+        $packageManagerMock = $this->createMock(PackageManager::class);
         new Package($packageManagerMock, $packageKey, $packagePath);
     }
 
@@ -110,7 +110,7 @@ class PackageTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         file_put_contents($packagePath . 'composer.json', '{"name": "vendor/dummy", "type": "flow-test"}');
         file_put_contents($packagePath . 'ext_emconf.php', '');
 
-        $packageManagerMock = $this->getMock(PackageManager::class);
+        $packageManagerMock = $this->createMock(PackageManager::class);
         $packageManagerMock->expects($this->any())->method('isPackageKeyValid')->willReturn(true);
         $package = new Package($packageManagerMock, 'Vendor.Dummy', $packagePath);
 
diff --git a/typo3/sysext/core/Tests/Unit/Page/PageRendererTest.php b/typo3/sysext/core/Tests/Unit/Page/PageRendererTest.php
index 1c3283fe67bc118cf364014264f03e87d5831d0d..13c4d5bbb451b7ecd95877bb06362640c9746cb5 100644
--- a/typo3/sysext/core/Tests/Unit/Page/PageRendererTest.php
+++ b/typo3/sysext/core/Tests/Unit/Page/PageRendererTest.php
@@ -28,7 +28,9 @@ class PageRendererTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function renderMethodCallsResetInAnyCase()
     {
-        $pageRenderer = $this->getMock(\TYPO3\CMS\Core\Page\PageRenderer::class, array('reset', 'prepareRendering', 'renderJavaScriptAndCss', 'getPreparedMarkerArray', 'getTemplateForPart'));
+        $pageRenderer = $this->getMockBuilder(\TYPO3\CMS\Core\Page\PageRenderer::class)
+            ->setMethods(array('reset', 'prepareRendering', 'renderJavaScriptAndCss', 'getPreparedMarkerArray', 'getTemplateForPart'))
+            ->getMock();
         $pageRenderer->expects($this->exactly(3))->method('reset');
 
         $pageRenderer->render(PageRenderer::PART_COMPLETE);
diff --git a/typo3/sysext/core/Tests/Unit/RegistryTest.php b/typo3/sysext/core/Tests/Unit/RegistryTest.php
index b77aca2df2cab09e633814f819128036e5c2d26d..b5cc998d8b57f27ed2eb7154a2d04677e82dbf0d 100644
--- a/typo3/sysext/core/Tests/Unit/RegistryTest.php
+++ b/typo3/sysext/core/Tests/Unit/RegistryTest.php
@@ -29,7 +29,7 @@ class RegistryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     protected function setUp()
     {
-        $GLOBALS['TYPO3_DB'] = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array());
+        $GLOBALS['TYPO3_DB'] = $this->createMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class);
         $GLOBALS['TYPO3_DB']->expects($this->any())->method('fullQuoteStr')->will($this->onConsecutiveCalls('\'tx_phpunit\'', '\'someKey\'', '\'tx_phpunit\'', '\'someKey\''));
         $this->registry = new \TYPO3\CMS\Core\Registry();
     }
@@ -125,7 +125,9 @@ class RegistryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function setAllowsValidNamespaces()
     {
-        $registry = $this->getMock(\TYPO3\CMS\Core\Registry::class, array('loadEntriesByNamespace'));
+        $registry = $this->getMockBuilder(\TYPO3\CMS\Core\Registry::class)
+            ->setMethods(array('loadEntriesByNamespace'))
+            ->getMock();
         $registry->set('tx_thisIsValid', 'someKey', 'someValue');
         $registry->set('thisIsValid', 'someKey', 'someValue');
         $registry->set('user_soIsThis', 'someKey', 'someValue');
@@ -142,7 +144,9 @@ class RegistryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             'entry_key' => 'someKey',
             'entry_value' => serialize('someValue')
         ));
-        $registry = $this->getMock(\TYPO3\CMS\Core\Registry::class, array('loadEntriesByNamespace'));
+        $registry = $this->getMockBuilder(\TYPO3\CMS\Core\Registry::class)
+            ->setMethods(array('loadEntriesByNamespace'))
+            ->getMock();
         $registry->set('tx_phpunit', 'someKey', 'someValue');
     }
 
@@ -157,7 +161,9 @@ class RegistryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             'entry_value' => serialize('someValue')
         ));
         $GLOBALS['TYPO3_DB']->expects($this->never())->method('exec_INSERTquery');
-        $registry = $this->getMock(\TYPO3\CMS\Core\Registry::class, array('loadEntriesByNamespace'));
+        $registry = $this->getMockBuilder(\TYPO3\CMS\Core\Registry::class)
+            ->setMethods(array('loadEntriesByNamespace'))
+            ->getMock();
         $registry->set('tx_phpunit', 'someKey', 'someValue');
     }
 
@@ -186,7 +192,9 @@ class RegistryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function removeUnsetsValueFromTheInternalEntriesCache()
     {
-        $registry = $this->getMock(\TYPO3\CMS\Core\Registry::class, array('loadEntriesByNamespace'));
+        $registry = $this->getMockBuilder(\TYPO3\CMS\Core\Registry::class)
+            ->setMethods(array('loadEntriesByNamespace'))
+            ->getMock();
         $registry->set('tx_phpunit', 'someKey', 'someValue');
         $registry->set('tx_phpunit', 'someOtherKey', 'someOtherValue');
         $registry->set('tx_otherNamespace', 'someKey', 'someValueInOtherNamespace');
@@ -221,7 +229,9 @@ class RegistryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function removeAllByNamespaceUnsetsValuesOfTheSpecifiedNamespaceFromTheInternalEntriesCache()
     {
-        $registry = $this->getMock(\TYPO3\CMS\Core\Registry::class, array('loadEntriesByNamespace'));
+        $registry = $this->getMockBuilder(\TYPO3\CMS\Core\Registry::class)
+            ->setMethods(array('loadEntriesByNamespace'))
+            ->getMock();
         $registry->set('tx_phpunit', 'someKey', 'someValue');
         $registry->set('tx_phpunit', 'someOtherKey', 'someOtherValue');
         $registry->set('tx_otherNamespace', 'someKey', 'someValueInOtherNamespace');
diff --git a/typo3/sysext/core/Tests/Unit/Resource/AbstractFileTest.php b/typo3/sysext/core/Tests/Unit/Resource/AbstractFileTest.php
index 2688a1d163df104cebe2c6c2d70efc603eee0c70..540c3127b8aa9e6805d9fb4dd4f94c592df66715 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/AbstractFileTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/AbstractFileTest.php
@@ -32,14 +32,17 @@ class AbstractFileTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $currentIdentifier = '/parent/current/';
 
         /** @var ResourceStorage|\PHPUnit_Framework_MockObject_MockObject $mockedStorageForParent */
-        $mockedStorageForParent = $this->getMock(ResourceStorage::class, array(), array(), '', false);
+        $mockedStorageForParent = $this->createMock(ResourceStorage::class);
 
         /** @var AbstractFile $parentFolderFixture */
         $parentFolderFixture = $this->getMockForAbstractClass(AbstractFile::class);
         $parentFolderFixture->setIdentifier($parentIdentifier)->setStorage($mockedStorageForParent);
 
         /** @var ResourceStorage|\PHPUnit_Framework_MockObject_MockObject $mockedStorage */
-        $mockedStorage = $this->getMock(ResourceStorage::class, array('getFolderIdentifierFromFileIdentifier', 'getFolder'), array(), '', false);
+        $mockedStorage = $this->getMockBuilder(ResourceStorage::class)
+            ->setMethods(array('getFolderIdentifierFromFileIdentifier', 'getFolder'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockedStorage->expects($this->once())->method('getFolderIdentifierFromFileIdentifier')->with($currentIdentifier)->will($this->returnValue($parentIdentifier));
         $mockedStorage->expects($this->once())->method('getFolder')->with($parentIdentifier)->will($this->returnValue($parentFolderFixture));
 
diff --git a/typo3/sysext/core/Tests/Unit/Resource/BaseTestCase.php b/typo3/sysext/core/Tests/Unit/Resource/BaseTestCase.php
index 6e96faed91c4bb3ba0fea9123fc25c99beb111b8..33ea64392f271e12b142154b1dd82c9558f37995 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/BaseTestCase.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/BaseTestCase.php
@@ -119,7 +119,10 @@ abstract class BaseTestCase extends \TYPO3\CMS\Core\Tests\UnitTestCase
                 $mockedMethods[] = 'getName';
             }
         }
-        $mock = $this->getMock($type, $mockedMethods, array(), '', false);
+        $mock = $this->getMockBuilder($type)
+            ->setMethods($mockedMethods)
+            ->disableOriginalConstructor()
+            ->getMock();
         $mock->expects($this->any())->method('getIdentifier')->will($this->returnValue($identifier));
         $mock->expects($this->any())->method('getName')->will($this->returnValue(basename($identifier)));
         return $mock;
diff --git a/typo3/sysext/core/Tests/Unit/Resource/FileTest.php b/typo3/sysext/core/Tests/Unit/Resource/FileTest.php
index 8dd25b471732bcf7446eb12645ebeac090416b9f..0c1e997ea3f2f54ee3b591276baf84a57d9eb989 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/FileTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/FileTest.php
@@ -34,10 +34,10 @@ class FileTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     protected function setUp()
     {
         $this->singletonInstances = \TYPO3\CMS\Core\Utility\GeneralUtility::getSingletonInstances();
-        $this->storageMock = $this->getMock(\TYPO3\CMS\Core\Resource\ResourceStorage::class, array(), array(), '', false);
+        $this->storageMock = $this->createMock(\TYPO3\CMS\Core\Resource\ResourceStorage::class);
         $this->storageMock->expects($this->any())->method('getUid')->will($this->returnValue(5));
 
-        $mockedMetaDataRepository = $this->getMock(\TYPO3\CMS\Core\Resource\Index\MetaDataRepository::class);
+        $mockedMetaDataRepository = $this->createMock(\TYPO3\CMS\Core\Resource\Index\MetaDataRepository::class);
         $mockedMetaDataRepository->expects($this->any())->method('findByFile')->will($this->returnValue(array('file' => 1)));
         \TYPO3\CMS\Core\Utility\GeneralUtility::setSingletonInstance(\TYPO3\CMS\Core\Resource\Index\MetaDataRepository::class, $mockedMetaDataRepository);
     }
@@ -156,13 +156,12 @@ class FileTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             'uid' => 1,
             'storage' => 'first',
         );
-        $subject = $this->getMock(
-            \TYPO3\CMS\Core\Resource\File::class,
-            array('loadStorage'),
-            array($fileProperties, $this->storageMock)
-        );
-        $mockedNewStorage = $this->getMock(\TYPO3\CMS\Core\Resource\ResourceStorage::class, array(), array(), '', false);
-        $mockedResourceFactory = $this->getMock(\TYPO3\CMS\Core\Resource\ResourceFactory::class);
+        $subject = $this->getMockBuilder(\TYPO3\CMS\Core\Resource\File::class)
+            ->setMethods(array('loadStorage'))
+            ->setConstructorArgs(array($fileProperties, $this->storageMock))
+            ->getMock();
+        $mockedNewStorage = $this->createMock(\TYPO3\CMS\Core\Resource\ResourceStorage::class);
+        $mockedResourceFactory = $this->createMock(\TYPO3\CMS\Core\Resource\ResourceFactory::class);
         $mockedResourceFactory
             ->expects($this->once())
             ->method('getStorageObject')
@@ -178,8 +177,8 @@ class FileTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function copyToCallsCopyOperationOnTargetFolderStorage()
     {
-        $targetStorage = $this->getMock(\TYPO3\CMS\Core\Resource\ResourceStorage::class, array(), array(), '', false);
-        $targetFolder = $this->getMock(\TYPO3\CMS\Core\Resource\Folder::class, array(), array(), '', false);
+        $targetStorage = $this->createMock(\TYPO3\CMS\Core\Resource\ResourceStorage::class);
+        $targetFolder = $this->createMock(\TYPO3\CMS\Core\Resource\Folder::class);
         $targetFolder->expects($this->any())->method('getStorage')->will($this->returnValue($targetStorage));
         $fixture = new \TYPO3\CMS\Core\Resource\File(array(), $this->storageMock);
         $targetStorage->expects($this->once())->method('copyFile')->with($this->equalTo($fixture), $this->equalTo($targetFolder));
@@ -191,8 +190,8 @@ class FileTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function moveToCallsMoveOperationOnTargetFolderStorage()
     {
-        $targetStorage = $this->getMock(\TYPO3\CMS\Core\Resource\ResourceStorage::class, array(), array(), '', false);
-        $targetFolder = $this->getMock(\TYPO3\CMS\Core\Resource\Folder::class, array(), array(), '', false);
+        $targetStorage = $this->createMock(\TYPO3\CMS\Core\Resource\ResourceStorage::class);
+        $targetFolder = $this->createMock(\TYPO3\CMS\Core\Resource\Folder::class);
         $targetFolder->expects($this->any())->method('getStorage')->will($this->returnValue($targetStorage));
         $fixture = new \TYPO3\CMS\Core\Resource\File(array(), $this->storageMock);
         $targetStorage->expects($this->once())->method('moveFile')->with($this->equalTo($fixture), $this->equalTo($targetFolder));
diff --git a/typo3/sysext/core/Tests/Unit/Resource/Filter/FileNameFilterTest.php b/typo3/sysext/core/Tests/Unit/Resource/Filter/FileNameFilterTest.php
index 0e91419dbcbe7b74b3c3cb7a01f6277d18b581fe..42a4474194bea032f9ddf836cdf1c30311a4d433 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/Filter/FileNameFilterTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/Filter/FileNameFilterTest.php
@@ -61,7 +61,7 @@ class FileNameFilterTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function filterHiddenFilesAndFoldersFiltersHiddenFilesAndFolders($itemName, $itemIdentifier, $expected)
     {
         /** @var DriverInterface|\PHPUnit_Framework_MockObject_MockObject $driverMock */
-        $driverMock = $this->getMock(DriverInterface::class);
+        $driverMock = $this->createMock(DriverInterface::class);
         $this->assertSame(
             $expected,
             FileNameFilter::filterHiddenFilesAndFolders(
@@ -80,7 +80,7 @@ class FileNameFilterTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function filterHiddenFilesAndFoldersAllowsHiddenFilesAndFolders($itemName, $itemIdentifier, $expected)
     {
         /** @var DriverInterface|\PHPUnit_Framework_MockObject_MockObject $driverMock */
-        $driverMock = $this->getMock(DriverInterface::class);
+        $driverMock = $this->createMock(DriverInterface::class);
         FileNameFilter::setShowHiddenFilesAndFolders(true);
         $this->assertSame(
             FileNameFilter::filterHiddenFilesAndFolders(
diff --git a/typo3/sysext/core/Tests/Unit/Resource/FolderTest.php b/typo3/sysext/core/Tests/Unit/Resource/FolderTest.php
index 321d7e6ac2df3a0d422504adb66c307557da6657..08a3f88a761a0177a6a305e7bff441f6ebc14499 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/FolderTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/FolderTest.php
@@ -43,7 +43,7 @@ class FolderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     protected function createFolderFixture($path, $name, $mockedStorage = null)
     {
         if ($mockedStorage === null) {
-            $mockedStorage = $this->getMock(\TYPO3\CMS\Core\Resource\ResourceStorage::class, array(), array(), '', false);
+            $mockedStorage = $this->createMock(\TYPO3\CMS\Core\Resource\ResourceStorage::class);
         }
         return new \TYPO3\CMS\Core\Resource\Folder($mockedStorage, $path, $name, 0);
     }
@@ -55,7 +55,7 @@ class FolderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $path = $this->getUniqueId();
         $name = $this->getUniqueId();
-        $mockedStorage = $this->getMock(\TYPO3\CMS\Core\Resource\ResourceStorage::class, array(), array(), '', false);
+        $mockedStorage = $this->createMock(\TYPO3\CMS\Core\Resource\ResourceStorage::class);
         $fixture = $this->createFolderFixture($path, $name, $mockedStorage);
         $this->assertSame($mockedStorage, $fixture->getStorage());
         $this->assertStringStartsWith($path, $fixture->getIdentifier());
@@ -88,7 +88,7 @@ class FolderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function getFilesReturnsArrayWithFilenamesAsKeys()
     {
-        $mockedStorage = $this->getMock(\TYPO3\CMS\Core\Resource\ResourceStorage::class, array(), array(), '', false);
+        $mockedStorage = $this->createMock(\TYPO3\CMS\Core\Resource\ResourceStorage::class);
         $mockedStorage->expects($this->once())->method('getFilesInFolder')->will($this->returnValue(array(
                 'somefile.png' => array(
                     'name' => 'somefile.png'
@@ -110,7 +110,7 @@ class FolderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function getFilesHandsOverRecursiveFALSEifNotExplicitlySet()
     {
-        $mockedStorage = $this->getMock(\TYPO3\CMS\Core\Resource\ResourceStorage::class, array(), array(), '', false);
+        $mockedStorage = $this->createMock(\TYPO3\CMS\Core\Resource\ResourceStorage::class);
         $mockedStorage
             ->expects($this->once())
             ->method('getFilesInFolder')
@@ -126,7 +126,7 @@ class FolderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function getFilesHandsOverRecursiveTRUEifSet()
     {
-        $mockedStorage = $this->getMock(\TYPO3\CMS\Core\Resource\ResourceStorage::class, array(), array(), '', false);
+        $mockedStorage = $this->createMock(\TYPO3\CMS\Core\Resource\ResourceStorage::class);
         $mockedStorage
             ->expects($this->once())
             ->method('getFilesInFolder')
@@ -142,10 +142,10 @@ class FolderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function getSubfolderCallsFactoryWithCorrectArguments()
     {
-        $mockedStorage = $this->getMock(\TYPO3\CMS\Core\Resource\ResourceStorage::class, array(), array(), '', false);
+        $mockedStorage = $this->createMock(\TYPO3\CMS\Core\Resource\ResourceStorage::class);
         $mockedStorage->expects($this->once())->method('hasFolderInFolder')->with($this->equalTo('someSubfolder'))->will($this->returnValue(true));
         /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Resource\ResourceFactory $mockedFactory */
-        $mockedFactory = $this->getMock(\TYPO3\CMS\Core\Resource\ResourceFactory::class);
+        $mockedFactory = $this->createMock(\TYPO3\CMS\Core\Resource\ResourceFactory::class);
         $folderFixture = $this->createFolderFixture(
             '/somePath/someFolder/',
             'someFolder',
@@ -173,7 +173,10 @@ class FolderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $currentIdentifier = '/parent/current/';
 
         $parentFolderFixture = $this->createFolderFixture($parentIdentifier, 'parent');
-        $mockedStorage = $this->getMock(\TYPO3\CMS\Core\Resource\ResourceStorage::class, array('getFolderIdentifierFromFileIdentifier', 'getFolder'), array(), '', false);
+        $mockedStorage = $this->getMockBuilder(\TYPO3\CMS\Core\Resource\ResourceStorage::class)
+            ->setMethods(array('getFolderIdentifierFromFileIdentifier', 'getFolder'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockedStorage->expects($this->once())->method('getFolderIdentifierFromFileIdentifier')->with($currentIdentifier)->will($this->returnValue($parentIdentifier));
         $mockedStorage->expects($this->once())->method('getFolder')->with($parentIdentifier)->will($this->returnValue($parentFolderFixture));
 
diff --git a/typo3/sysext/core/Tests/Unit/Resource/Index/ExtractorRegistryTest.php b/typo3/sysext/core/Tests/Unit/Resource/Index/ExtractorRegistryTest.php
index 0cdfdb7ea26bb76f8480cc5247be0d1d117bf6c6..52500c41e40819e34b2d5c52d22b963ba6297a56 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/Index/ExtractorRegistryTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/Index/ExtractorRegistryTest.php
@@ -27,7 +27,9 @@ class ExtractorRegistryTest extends UnitTestCase
     public function registeredExtractorClassCanBeRetrieved()
     {
         $extractorClass = 'a9f4d5e4ebb4b03547a2a6094e1170ac';
-        $extractorObject = $this->getMock(\TYPO3\CMS\Core\Resource\Index\ExtractorInterface::class, array(), array(), $extractorClass);
+        $extractorObject = $this->getMockBuilder(\TYPO3\CMS\Core\Resource\Index\ExtractorInterface::class)
+            ->setMockClassName($extractorClass)
+            ->getMock();
 
         $extractorRegistry = $this->getMockExtractorRegistry(array(array($extractorClass, $extractorObject)));
 
@@ -67,15 +69,21 @@ class ExtractorRegistryTest extends UnitTestCase
     public function registerExtractorClassWithHighestPriorityIsFirstInResult()
     {
         $extractorClass1 = 'db76010e5c24658c35ea1605cce2391d';
-        $extractorObject1 = $this->getMock(\TYPO3\CMS\Core\Resource\Index\ExtractorInterface::class, array(), array(), $extractorClass1);
+        $extractorObject1 = $this->getMockBuilder(\TYPO3\CMS\Core\Resource\Index\ExtractorInterface::class)
+            ->setMockClassName($extractorClass1)
+            ->getMock();
         $extractorObject1->expects($this->any())->method('getPriority')->will($this->returnValue(1));
 
         $extractorClass2 = 'ad9195e2487eea33c8a2abd5cf33cba4';
-        $extractorObject2 = $this->getMock(\TYPO3\CMS\Core\Resource\Index\ExtractorInterface::class, array(), array(), $extractorClass2);
+        $extractorObject2 = $this->getMockBuilder(\TYPO3\CMS\Core\Resource\Index\ExtractorInterface::class)
+            ->setMockClassName($extractorClass2)
+            ->getMock();
         $extractorObject2->expects($this->any())->method('getPriority')->will($this->returnValue(10));
 
         $extractorClass3 = 'cef9aa4e1cd3aa7ff05dcdccb117156a';
-        $extractorObject3 = $this->getMock(\TYPO3\CMS\Core\Resource\Index\ExtractorInterface::class, array(), array(), $extractorClass3);
+        $extractorObject3 = $this->getMockBuilder(\TYPO3\CMS\Core\Resource\Index\ExtractorInterface::class)
+            ->setMockClassName($extractorClass3)
+            ->getMock();
         $extractorObject3->expects($this->any())->method('getPriority')->will($this->returnValue(2));
 
         $createdExtractorInstances = array(
@@ -102,11 +110,15 @@ class ExtractorRegistryTest extends UnitTestCase
     public function registeredExtractorClassWithSamePriorityAreAllReturned()
     {
         $extractorClass1 = 'b70551b2b2db62b6b15a9bbfcbd50614';
-        $extractorObject1 = $this->getMock(\TYPO3\CMS\Core\Resource\Index\ExtractorInterface::class, array(), array(), $extractorClass1);
+        $extractorObject1 = $this->getMockBuilder(\TYPO3\CMS\Core\Resource\Index\ExtractorInterface::class)
+            ->setMockClassName($extractorClass1)
+            ->getMock();
         $extractorObject1->expects($this->any())->method('getPriority')->will($this->returnValue(1));
 
         $extractorClass2 = 'ac318f1659d278b79b38262f23a78d5d';
-        $extractorObject2 = $this->getMock(\TYPO3\CMS\Core\Resource\Index\ExtractorInterface::class, array(), array(), $extractorClass2);
+        $extractorObject2 = $this->getMockBuilder(\TYPO3\CMS\Core\Resource\Index\ExtractorInterface::class)
+            ->setMockClassName($extractorClass2)
+            ->getMock();
         $extractorObject2->expects($this->any())->method('getPriority')->will($this->returnValue(1));
 
         $createdExtractorInstances = array(
diff --git a/typo3/sysext/core/Tests/Unit/Resource/Index/IndexerTest.php b/typo3/sysext/core/Tests/Unit/Resource/Index/IndexerTest.php
index 7e8233d32e535adc6585d0a569cb095f10a746c8..84d389580e11d03531f59c865e09eaad01ff467e 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/Index/IndexerTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/Index/IndexerTest.php
@@ -29,13 +29,13 @@ class IndexerTest extends UnitTestCase
      */
     public function isFileTypeSupportedByExtractorReturnsFalesForFileTypeTextAndExtractorLimitedToFileTypeImage()
     {
-        $mockStorage = $this->getMock(\TYPO3\CMS\Core\Resource\ResourceStorage::class, [], [], '', false);
-        $mockFile = $this->getMock(File::class, [], [], '', false);
+        $mockStorage = $this->createMock(\TYPO3\CMS\Core\Resource\ResourceStorage::class);
+        $mockFile = $this->createMock(File::class);
         $mockFile->expects($this->any())->method('getType')->will($this->returnValue(
             File::FILETYPE_TEXT
         ));
 
-        $mockExtractor = $this->getMock(ExtractorInterface::class, [], [], '', false);
+        $mockExtractor = $this->createMock(ExtractorInterface::class);
         $mockExtractor->expects($this->any())->method('getFileTypeRestrictions')->will($this->returnValue(
             [File::FILETYPE_IMAGE]
         ));
@@ -56,13 +56,13 @@ class IndexerTest extends UnitTestCase
      */
     public function isFileTypeSupportedByExtractorReturnsTrueForFileTypeImageAndExtractorLimitedToFileTypeImage()
     {
-        $mockStorage = $this->getMock(\TYPO3\CMS\Core\Resource\ResourceStorage::class, [], [], '', false);
-        $mockFile = $this->getMock(File::class, [], [], '', false);
+        $mockStorage = $this->createMock(\TYPO3\CMS\Core\Resource\ResourceStorage::class);
+        $mockFile = $this->createMock(File::class);
         $mockFile->expects($this->any())->method('getType')->will($this->returnValue(
             File::FILETYPE_IMAGE
         ));
 
-        $mockExtractor = $this->getMock(ExtractorInterface::class, [], [], '', false);
+        $mockExtractor = $this->createMock(ExtractorInterface::class);
         $mockExtractor->expects($this->any())->method('getFileTypeRestrictions')->will($this->returnValue(
             [File::FILETYPE_IMAGE]
         ));
@@ -83,13 +83,13 @@ class IndexerTest extends UnitTestCase
      */
     public function isFileTypeSupportedByExtractorReturnsTrueForFileTypeTextAndExtractorHasNoFileTypeLimitation()
     {
-        $mockStorage = $this->getMock(\TYPO3\CMS\Core\Resource\ResourceStorage::class, [], [], '', false);
-        $mockFile = $this->getMock(File::class, [], [], '', false);
+        $mockStorage = $this->createMock(\TYPO3\CMS\Core\Resource\ResourceStorage::class);
+        $mockFile = $this->createMock(File::class);
         $mockFile->expects($this->any())->method('getType')->will($this->returnValue(
             File::FILETYPE_TEXT
         ));
 
-        $mockExtractor = $this->getMock(ExtractorInterface::class, [], [], '', false);
+        $mockExtractor = $this->createMock(ExtractorInterface::class);
         $mockExtractor->expects($this->any())->method('getFileTypeRestrictions')->will($this->returnValue(
             []
         ));
diff --git a/typo3/sysext/core/Tests/Unit/Resource/ProcessedFileTest.php b/typo3/sysext/core/Tests/Unit/Resource/ProcessedFileTest.php
index c654fb28e2855686da8502f718617bd719d72bc9..47cebd048d92c97d40d2ec2232fb1fd7012f5d1a 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/ProcessedFileTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/ProcessedFileTest.php
@@ -44,10 +44,10 @@ class ProcessedFileTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     protected function setUp()
     {
-        $this->storageMock = $this->getMock(ResourceStorage::class, array(), array(), '', false);
+        $this->storageMock = $this->createMock(ResourceStorage::class);
         $this->storageMock->expects($this->any())->method('getUid')->will($this->returnValue(5));
 
-        $this->folderMock = $this->getMock(Folder::class, array(), array(), '', false);
+        $this->folderMock = $this->createMock(Folder::class);
         $this->folderMock->expects($this->any())->method('getStorage')->willReturn($this->storageMock);
 
         $this->storageMock->expects($this->any())->method('getProcessingFolder')->willReturn($this->folderMock);
diff --git a/typo3/sysext/core/Tests/Unit/Resource/Processing/LocalPreviewHelperTest.php b/typo3/sysext/core/Tests/Unit/Resource/Processing/LocalPreviewHelperTest.php
index f1b42e5e4466a1cf45b0ddf1e2581ef8810d2f5e..e3acc773576279e3053dbc788707456f38f5b32c 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/Processing/LocalPreviewHelperTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/Processing/LocalPreviewHelperTest.php
@@ -29,16 +29,14 @@ class LocalPreviewHelperTest extends UnitTestCase
      */
     public function processProvidesDefaultSizeIfNotConfigured()
     {
-        $file = $this->getMockBuilder(File::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $file = $this->createMock(File::class);
         // Use size slightly larger than default size to ensure processing
         $file->expects($this->any())->method('getProperty')->will($this->returnValueMap(array(
             array('width', 65),
             array('height', 65),
         )));
 
-        $task = $this->getMock(TaskInterface::class);
+        $task = $this->createMock(TaskInterface::class);
         $task->expects($this->once())->method('getSourceFile')->willReturn($file);
         $task->expects($this->once())->method('getConfiguration')->willReturn(array());
 
@@ -59,9 +57,7 @@ class LocalPreviewHelperTest extends UnitTestCase
      */
     public function processDoesNotScaleUpImages()
     {
-        $file = $this->getMockBuilder(File::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $file = $this->createMock(File::class);
         $file->expects($this->any())->method('getProperty')->will($this->returnValueMap(array(
             array('width', 20),
             array('height', 20),
@@ -72,7 +68,7 @@ class LocalPreviewHelperTest extends UnitTestCase
             ->setMethods(array('dummy'))
             ->getMock();
 
-        $task = $this->getMock(TaskInterface::class);
+        $task = $this->createMock(TaskInterface::class);
         $task->expects($this->once())->method('getSourceFile')->willReturn($file);
         $task->expects($this->once())->method('getConfiguration')->willReturn(array('width' => 30, 'height' => 30));
 
@@ -84,15 +80,13 @@ class LocalPreviewHelperTest extends UnitTestCase
      */
     public function processGeneratesPreviewEvenIfSourceFileHasNoSize()
     {
-        $file = $this->getMockBuilder(File::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $file = $this->createMock(File::class);
         $file->expects($this->any())->method('getProperty')->will($this->returnValueMap(array(
             array('width', 0),
             array('height', 0),
         )));
 
-        $task = $this->getMock(TaskInterface::class);
+        $task = $this->createMock(TaskInterface::class);
         $task->expects($this->once())->method('getSourceFile')->willReturn($file);
         $task->expects($this->once())->method('getConfiguration')->willReturn(array());
 
diff --git a/typo3/sysext/core/Tests/Unit/Resource/Rendering/AudioTagRendererTest.php b/typo3/sysext/core/Tests/Unit/Resource/Rendering/AudioTagRendererTest.php
index c34f4a13521e3ef2a5e4ca5574225c028413fd1a..8e57ed21b82cb6d262ef7f66c5fe71aa0067de69 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/Rendering/AudioTagRendererTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/Rendering/AudioTagRendererTest.php
@@ -36,11 +36,11 @@ class AudioTagRendererTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $audioTagRenderer = new \TYPO3\CMS\Core\Resource\Rendering\AudioTagRenderer();
 
-        $fileResourceMock1 = $this->getMock(\TYPO3\CMS\Core\Resource\File::class, array(), array(), '', false);
+        $fileResourceMock1 = $this->createMock(\TYPO3\CMS\Core\Resource\File::class);
         $fileResourceMock1->expects($this->any())->method('getMimeType')->will($this->returnValue('audio/mpeg'));
-        $fileResourceMock2 = $this->getMock(\TYPO3\CMS\Core\Resource\File::class, array(), array(), '', false);
+        $fileResourceMock2 = $this->createMock(\TYPO3\CMS\Core\Resource\File::class);
         $fileResourceMock2->expects($this->any())->method('getMimeType')->will($this->returnValue('audio/wav'));
-        $fileResourceMock3 = $this->getMock(\TYPO3\CMS\Core\Resource\File::class, array(), array(), '', false);
+        $fileResourceMock3 = $this->createMock(\TYPO3\CMS\Core\Resource\File::class);
         $fileResourceMock3->expects($this->any())->method('getMimeType')->will($this->returnValue('audio/ogg'));
 
         $this->assertTrue($audioTagRenderer->canRender($fileResourceMock1));
@@ -55,7 +55,7 @@ class AudioTagRendererTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $audioTagRenderer = new \TYPO3\CMS\Core\Resource\Rendering\AudioTagRenderer();
 
-        $fileResourceMock = $this->getMock(\TYPO3\CMS\Core\Resource\File::class, array(), array(), '', false);
+        $fileResourceMock = $this->createMock(\TYPO3\CMS\Core\Resource\File::class);
         $fileResourceMock->expects($this->any())->method('getMimeType')->will($this->returnValue('video/mp4'));
 
         $this->assertFalse($audioTagRenderer->canRender($fileResourceMock));
@@ -68,7 +68,7 @@ class AudioTagRendererTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $audioTagRenderer = new \TYPO3\CMS\Core\Resource\Rendering\AudioTagRenderer();
 
-        $fileResourceMock = $this->getMock(\TYPO3\CMS\Core\Resource\File::class, array(), array(), '', false);
+        $fileResourceMock = $this->createMock(\TYPO3\CMS\Core\Resource\File::class);
         $fileResourceMock->expects($this->any())->method('getMimeType')->will($this->returnValue('audio/mpeg'));
         $fileResourceMock->expects($this->any())->method('getPublicUrl')->will($this->returnValue('//:path/myAudioFile?foo=bar&baz=true'));
 
@@ -85,7 +85,7 @@ class AudioTagRendererTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $audioTagRenderer = new \TYPO3\CMS\Core\Resource\Rendering\AudioTagRenderer();
 
-        $fileResourceMock = $this->getMock(\TYPO3\CMS\Core\Resource\File::class, array(), array(), '', false);
+        $fileResourceMock = $this->createMock(\TYPO3\CMS\Core\Resource\File::class);
         $fileResourceMock->expects($this->any())->method('getMimeType')->will($this->returnValue('audio/mpeg'));
         $fileResourceMock->expects($this->any())->method('getPublicUrl')->will($this->returnValue('//:path/myAudioFile'));
 
@@ -102,7 +102,7 @@ class AudioTagRendererTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $audioTagRenderer = new \TYPO3\CMS\Core\Resource\Rendering\AudioTagRenderer();
 
-        $fileResourceMock = $this->getMock(\TYPO3\CMS\Core\Resource\File::class, array(), array(), '', false);
+        $fileResourceMock = $this->createMock(\TYPO3\CMS\Core\Resource\File::class);
         $fileResourceMock->expects($this->any())->method('getMimeType')->will($this->returnValue('audio/mpeg'));
         $fileResourceMock->expects($this->any())->method('getPublicUrl')->will($this->returnValue('//:path/myAudioFile'));
 
@@ -119,7 +119,7 @@ class AudioTagRendererTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $audioTagRenderer = new \TYPO3\CMS\Core\Resource\Rendering\AudioTagRenderer();
 
-        $fileResourceMock = $this->getMock(\TYPO3\CMS\Core\Resource\File::class, array(), array(), '', false);
+        $fileResourceMock = $this->createMock(\TYPO3\CMS\Core\Resource\File::class);
         $fileResourceMock->expects($this->any())->method('getMimeType')->will($this->returnValue('audio/mpeg'));
         $fileResourceMock->expects($this->any())->method('getPublicUrl')->will($this->returnValue('//:path/myAudioFile'));
 
diff --git a/typo3/sysext/core/Tests/Unit/Resource/Rendering/RendererRegistryTest.php b/typo3/sysext/core/Tests/Unit/Resource/Rendering/RendererRegistryTest.php
index 342a714002dcde6739fa44327f739fc579e6e52f..393274b6eba845b2854821df3065c1e1dfde3bcc 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/Rendering/RendererRegistryTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/Rendering/RendererRegistryTest.php
@@ -46,7 +46,9 @@ class RendererRegistryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function registeredFileRenderClassCanBeRetrieved()
     {
         $rendererClass = $this->getUniqueId('myRenderer');
-        $rendererObject = $this->getMock(\TYPO3\CMS\Core\Resource\Rendering\FileRendererInterface::class, array(), array(), $rendererClass);
+        $rendererObject = $this->getMockBuilder(\TYPO3\CMS\Core\Resource\Rendering\FileRendererInterface::class)
+            ->setMockClassName($rendererClass)
+            ->getMock();
 
         $rendererRegistry = $this->getTestRendererRegistry(array(array($rendererClass, $rendererObject)));
 
@@ -85,15 +87,21 @@ class RendererRegistryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function registerRendererClassWithHighestPriorityIsFirstInResult()
     {
         $rendererClass1 = $this->getUniqueId('myRenderer1');
-        $rendererObject1 = $this->getMock(\TYPO3\CMS\Core\Resource\Rendering\FileRendererInterface::class, array(), array(), $rendererClass1);
+        $rendererObject1 = $this->getMockBuilder(\TYPO3\CMS\Core\Resource\Rendering\FileRendererInterface::class)
+            ->setMockClassName($rendererClass1)
+            ->getMock();
         $rendererObject1->expects($this->any())->method('getPriority')->will($this->returnValue(1));
 
         $rendererClass2 = $this->getUniqueId('myRenderer2');
-        $rendererObject2 = $this->getMock(\TYPO3\CMS\Core\Resource\Rendering\FileRendererInterface::class, array(), array(), $rendererClass2);
+        $rendererObject2 = $this->getMockBuilder(\TYPO3\CMS\Core\Resource\Rendering\FileRendererInterface::class)
+            ->setMockClassName($rendererClass2)
+            ->getMock();
         $rendererObject2->expects($this->any())->method('getPriority')->will($this->returnValue(10));
 
         $rendererClass3 = $this->getUniqueId('myRenderer3');
-        $rendererObject3 = $this->getMock(\TYPO3\CMS\Core\Resource\Rendering\FileRendererInterface::class, array(), array(), $rendererClass3);
+        $rendererObject3 = $this->getMockBuilder(\TYPO3\CMS\Core\Resource\Rendering\FileRendererInterface::class)
+            ->setMockClassName($rendererClass3)
+            ->getMock();
         $rendererObject3->expects($this->any())->method('getPriority')->will($this->returnValue(2));
 
         $createdRendererInstances = array(
@@ -119,11 +127,15 @@ class RendererRegistryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function registeredFileRendererClassWithSamePriorityAreAllReturned()
     {
         $rendererClass1 = $this->getUniqueId('myRenderer1');
-        $rendererObject1 = $this->getMock(\TYPO3\CMS\Core\Resource\Rendering\FileRendererInterface::class, array(), array(), $rendererClass1);
+        $rendererObject1 = $this->getMockBuilder(\TYPO3\CMS\Core\Resource\Rendering\FileRendererInterface::class)
+            ->setMockClassName($rendererClass1)
+            ->getMock();
         $rendererObject1->expects($this->any())->method('getPriority')->will($this->returnValue(1));
 
         $rendererClass2 = $this->getUniqueId('myRenderer2');
-        $rendererObject2 = $this->getMock(\TYPO3\CMS\Core\Resource\Rendering\FileRendererInterface::class, array(), array(), $rendererClass2);
+        $rendererObject2 = $this->getMockBuilder(\TYPO3\CMS\Core\Resource\Rendering\FileRendererInterface::class)
+            ->setMockClassName($rendererClass2)
+            ->getMock();
         $rendererObject2->expects($this->any())->method('getPriority')->will($this->returnValue(1));
 
         $createdRendererInstances = array(
@@ -148,16 +160,22 @@ class RendererRegistryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->markTestSkipped('Test triggers an error. This is a known PHP bug (http://stackoverflow.com/questions/3235387/usort-array-was-modified-by-the-user-comparison-function)');
 
         $rendererClass1 = $this->getUniqueId('myVideoRenderer');
-        $rendererObject1 = $this->getMock(\TYPO3\CMS\Core\Resource\Rendering\FileRendererInterface::class, array('getPriority', 'canRender', 'render'), array(), $rendererClass1);
+        $rendererObject1 = $this->getMockBuilder(\TYPO3\CMS\Core\Resource\Rendering\FileRendererInterface::class)
+            ->setMethods(array('getPriority', 'canRender', 'render'))
+            ->setMockClassName($rendererClass1)
+            ->getMock();
         $rendererObject1->expects($this->any())->method('getPriority')->will($this->returnValue(1));
         $rendererObject1->expects($this->once())->method('canRender')->will($this->returnValue(true));
 
         $rendererClass2 = $this->getUniqueId('myAudioRenderer');
-        $rendererObject2 = $this->getMock(\TYPO3\CMS\Core\Resource\Rendering\FileRendererInterface::class, array('getPriority', 'canRender', 'render'), array(), $rendererClass2);
+        $rendererObject2 = $this->getMockBuilder(\TYPO3\CMS\Core\Resource\Rendering\FileRendererInterface::class)
+            ->setMethods(array('getPriority', 'canRender', 'render'))
+            ->setMockClassName($rendererClass2)
+            ->getMock();
         $rendererObject2->expects($this->any())->method('getPriority')->will($this->returnValue(10));
         $rendererObject2->expects($this->once())->method('canRender')->will($this->returnValue(false));
 
-        $fileResourceMock = $this->getMock(\TYPO3\CMS\Core\Resource\File::class, array(), array(), '', false);
+        $fileResourceMock = $this->createMock(\TYPO3\CMS\Core\Resource\File::class);
 
         $createdRendererInstances = array(
             array($rendererClass1, $rendererObject1),
@@ -184,7 +202,7 @@ class RendererRegistryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $rendererRegistry->registerRendererClass(\TYPO3\CMS\Core\Resource\Rendering\AudioTagRenderer::class);
         $rendererRegistry->registerRendererClass(\TYPO3\CMS\Core\Resource\Rendering\VideoTagRenderer::class);
 
-        $fileResourceMock = $this->getMock(\TYPO3\CMS\Core\Resource\File::class, array(), array(), '', false);
+        $fileResourceMock = $this->createMock(\TYPO3\CMS\Core\Resource\File::class);
         $fileResourceMock->expects($this->any())->method('getMimeType')->will($this->returnValue('video/mp4'));
 
         $rendererRegistry->getRendererInstances();
diff --git a/typo3/sysext/core/Tests/Unit/Resource/Rendering/VideoTagRendererTest.php b/typo3/sysext/core/Tests/Unit/Resource/Rendering/VideoTagRendererTest.php
index 906933b06bea07e699b394f7a90a98c0ea72fd4c..e8dabe490788d5c257e3a118a7216c2a466262e7 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/Rendering/VideoTagRendererTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/Rendering/VideoTagRendererTest.php
@@ -36,13 +36,13 @@ class VideoTagRendererTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $VideoTagRenderer = new \TYPO3\CMS\Core\Resource\Rendering\VideoTagRenderer();
 
-        $fileResourceMock1 = $this->getMock(\TYPO3\CMS\Core\Resource\File::class, array(), array(), '', false);
+        $fileResourceMock1 = $this->createMock(\TYPO3\CMS\Core\Resource\File::class);
         $fileResourceMock1->expects($this->any())->method('getMimeType')->will($this->returnValue('video/mp4'));
-        $fileResourceMock2 = $this->getMock(\TYPO3\CMS\Core\Resource\File::class, array(), array(), '', false);
+        $fileResourceMock2 = $this->createMock(\TYPO3\CMS\Core\Resource\File::class);
         $fileResourceMock2->expects($this->any())->method('getMimeType')->will($this->returnValue('video/webm'));
-        $fileResourceMock3 = $this->getMock(\TYPO3\CMS\Core\Resource\File::class, array(), array(), '', false);
+        $fileResourceMock3 = $this->createMock(\TYPO3\CMS\Core\Resource\File::class);
         $fileResourceMock3->expects($this->any())->method('getMimeType')->will($this->returnValue('video/ogg'));
-        $fileResourceMock4 = $this->getMock(\TYPO3\CMS\Core\Resource\File::class, array(), array(), '', false);
+        $fileResourceMock4 = $this->createMock(\TYPO3\CMS\Core\Resource\File::class);
         $fileResourceMock4->expects($this->any())->method('getMimeType')->will($this->returnValue('application/ogg'));
 
         $this->assertTrue($VideoTagRenderer->canRender($fileResourceMock1));
@@ -58,7 +58,7 @@ class VideoTagRendererTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $VideoTagRenderer = new \TYPO3\CMS\Core\Resource\Rendering\VideoTagRenderer();
 
-        $fileResourceMock = $this->getMock(\TYPO3\CMS\Core\Resource\File::class, array(), array(), '', false);
+        $fileResourceMock = $this->createMock(\TYPO3\CMS\Core\Resource\File::class);
         $fileResourceMock->expects($this->any())->method('getMimeType')->will($this->returnValue('audio/mpeg'));
 
         $this->assertFalse($VideoTagRenderer->canRender($fileResourceMock));
@@ -71,7 +71,7 @@ class VideoTagRendererTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $VideoTagRenderer = new \TYPO3\CMS\Core\Resource\Rendering\VideoTagRenderer();
 
-        $fileResourceMock = $this->getMock(\TYPO3\CMS\Core\Resource\File::class, array(), array(), '', false);
+        $fileResourceMock = $this->createMock(\TYPO3\CMS\Core\Resource\File::class);
         $fileResourceMock->expects($this->any())->method('getMimeType')->will($this->returnValue('video/mp4'));
         $fileResourceMock->expects($this->any())->method('getPublicUrl')->will($this->returnValue('//:path/myVideoFile?foo=bar&baz=true'));
 
@@ -88,7 +88,7 @@ class VideoTagRendererTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $VideoTagRenderer = new \TYPO3\CMS\Core\Resource\Rendering\VideoTagRenderer();
 
-        $fileResourceMock = $this->getMock(\TYPO3\CMS\Core\Resource\File::class, array(), array(), '', false);
+        $fileResourceMock = $this->createMock(\TYPO3\CMS\Core\Resource\File::class);
         $fileResourceMock->expects($this->any())->method('getMimeType')->will($this->returnValue('video/mp4'));
         $fileResourceMock->expects($this->any())->method('getPublicUrl')->will($this->returnValue('//:path/myVideoFile'));
 
@@ -105,7 +105,7 @@ class VideoTagRendererTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $VideoTagRenderer = new \TYPO3\CMS\Core\Resource\Rendering\VideoTagRenderer();
 
-        $fileResourceMock = $this->getMock(\TYPO3\CMS\Core\Resource\File::class, array(), array(), '', false);
+        $fileResourceMock = $this->createMock(\TYPO3\CMS\Core\Resource\File::class);
         $fileResourceMock->expects($this->any())->method('getMimeType')->will($this->returnValue('video/mp4'));
         $fileResourceMock->expects($this->any())->method('getPublicUrl')->will($this->returnValue('//:path/myVideoFile'));
 
@@ -122,7 +122,7 @@ class VideoTagRendererTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $VideoTagRenderer = new \TYPO3\CMS\Core\Resource\Rendering\VideoTagRenderer();
 
-        $fileResourceMock = $this->getMock(\TYPO3\CMS\Core\Resource\File::class, array(), array(), '', false);
+        $fileResourceMock = $this->createMock(\TYPO3\CMS\Core\Resource\File::class);
         $fileResourceMock->expects($this->any())->method('getMimeType')->will($this->returnValue('video/mp4'));
         $fileResourceMock->expects($this->any())->method('getPublicUrl')->will($this->returnValue('//:path/myVideoFile'));
 
diff --git a/typo3/sysext/core/Tests/Unit/Resource/Rendering/VimeoRendererTest.php b/typo3/sysext/core/Tests/Unit/Resource/Rendering/VimeoRendererTest.php
index 88210241a2848328221a11b60b7ece319ca0d509..a20060641d14474f0a684b00a23bbec865815f2d 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/Rendering/VimeoRendererTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/Rendering/VimeoRendererTest.php
@@ -59,10 +59,10 @@ class VimeoRendererTest extends UnitTestCase
     public function canRenderReturnsTrueOnCorrectFile()
     {
         /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock1 */
-        $fileResourceMock1 = $this->getMock(File::class, array(), array(), '', false);
+        $fileResourceMock1 = $this->createMock(File::class);
         $fileResourceMock1->expects($this->any())->method('getMimeType')->will($this->returnValue('video/vimeo'));
         /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock2 */
-        $fileResourceMock2 = $this->getMock(File::class, array(), array(), '', false);
+        $fileResourceMock2 = $this->createMock(File::class);
         $fileResourceMock2->expects($this->any())->method('getMimeType')->will($this->returnValue('video/unknown'));
         $fileResourceMock2->expects($this->any())->method('getExtension')->will($this->returnValue('vimeo'));
 
@@ -76,7 +76,7 @@ class VimeoRendererTest extends UnitTestCase
     public function canRenderReturnsFalseOnCorrectFile()
     {
         /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock */
-        $fileResourceMock = $this->getMock(File::class, array(), array(), '', false);
+        $fileResourceMock = $this->createMock(File::class);
         $fileResourceMock->expects($this->any())->method('getMimeType')->will($this->returnValue('video/youtube'));
 
         $this->assertFalse($this->subject->canRender($fileResourceMock));
@@ -88,7 +88,7 @@ class VimeoRendererTest extends UnitTestCase
     public function renderOutputIsCorrect()
     {
         /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock */
-        $fileResourceMock = $this->getMock(File::class, array(), array(), '', false);
+        $fileResourceMock = $this->createMock(File::class);
 
         $this->assertSame(
             '<iframe src="//player.vimeo.com/video/7331?title=0&amp;byline=0&amp;portrait=0" allowfullscreen width="300" height="200"></iframe>',
@@ -102,7 +102,7 @@ class VimeoRendererTest extends UnitTestCase
     public function renderOutputWithLoopIsCorrect()
     {
         /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock */
-        $fileResourceMock = $this->getMock(File::class, array(), array(), '', false);
+        $fileResourceMock = $this->createMock(File::class);
 
         $this->assertSame(
             '<iframe src="//player.vimeo.com/video/7331?loop=1&amp;title=0&amp;byline=0&amp;portrait=0" allowfullscreen width="300" height="200"></iframe>',
@@ -116,7 +116,7 @@ class VimeoRendererTest extends UnitTestCase
     public function renderOutputWithAutoplayIsCorrect()
     {
         /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock */
-        $fileResourceMock = $this->getMock(File::class, array(), array(), '', false);
+        $fileResourceMock = $this->createMock(File::class);
 
         $this->assertSame(
             '<iframe src="//player.vimeo.com/video/7331?autoplay=1&amp;title=0&amp;byline=0&amp;portrait=0" allowfullscreen width="300" height="200"></iframe>',
@@ -130,10 +130,10 @@ class VimeoRendererTest extends UnitTestCase
     public function renderOutputWithAutoplayFromReferenceIsCorrect()
     {
         /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock */
-        $fileResourceMock = $this->getMock(File::class, array(), array(), '', false);
+        $fileResourceMock = $this->createMock(File::class);
 
         /** @var FileReference|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock */
-        $fileReferenceMock = $this->getMock(FileReference::class, array(), array(), '', false);
+        $fileReferenceMock = $this->createMock(FileReference::class);
         $fileReferenceMock->expects($this->any())->method('getProperty')->will($this->returnValue(1));
         $fileReferenceMock->expects($this->any())->method('getOriginalFile')->willReturn($fileResourceMock);
 
@@ -149,7 +149,7 @@ class VimeoRendererTest extends UnitTestCase
     public function renderOutputWithAutoplayAndWithoutControllsIsCorrect()
     {
         /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock */
-        $fileResourceMock = $this->getMock(File::class, array(), array(), '', false);
+        $fileResourceMock = $this->createMock(File::class);
 
         $this->assertSame(
             '<iframe src="//player.vimeo.com/video/7331?autoplay=1&amp;title=0&amp;byline=0&amp;portrait=0" allowfullscreen width="300" height="200"></iframe>',
diff --git a/typo3/sysext/core/Tests/Unit/Resource/Rendering/YouTubeRendererTest.php b/typo3/sysext/core/Tests/Unit/Resource/Rendering/YouTubeRendererTest.php
index a9cd3fad4f7ca668026e0c144349ec9bce752581..82060c76b4a496689b960f32106cbbe9aa2e3157 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/Rendering/YouTubeRendererTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/Rendering/YouTubeRendererTest.php
@@ -62,10 +62,10 @@ class YouTubeRendererTest extends UnitTestCase
     public function canRenderReturnsTrueOnCorrectFile()
     {
         /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock1 */
-        $fileResourceMock1 = $this->getMock(File::class, array(), array(), '', false);
+        $fileResourceMock1 = $this->createMock(File::class);
         $fileResourceMock1->expects($this->any())->method('getMimeType')->will($this->returnValue('video/youtube'));
         /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock2 */
-        $fileResourceMock2 = $this->getMock(File::class, array(), array(), '', false);
+        $fileResourceMock2 = $this->createMock(File::class);
         $fileResourceMock2->expects($this->any())->method('getMimeType')->will($this->returnValue('video/unknown'));
         $fileResourceMock2->expects($this->any())->method('getExtension')->will($this->returnValue('youtube'));
 
@@ -79,7 +79,7 @@ class YouTubeRendererTest extends UnitTestCase
     public function canRenderReturnsFalseOnCorrectFile()
     {
         /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock */
-        $fileResourceMock = $this->getMock(File::class, array(), array(), '', false);
+        $fileResourceMock = $this->createMock(File::class);
         $fileResourceMock->expects($this->any())->method('getMimeType')->will($this->returnValue('video/vimeo'));
 
         $this->assertFalse($this->subject->canRender($fileResourceMock));
@@ -91,7 +91,7 @@ class YouTubeRendererTest extends UnitTestCase
     public function renderOutputIsCorrect()
     {
         /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock */
-        $fileResourceMock = $this->getMock(File::class, array(), array(), '', false);
+        $fileResourceMock = $this->createMock(File::class);
 
         $this->assertSame(
             '<iframe src="//www.youtube.com/embed/7331?autohide=1&amp;controls=2&amp;enablejsapi=1&amp;origin=test.server.org&amp;showinfo=0" allowfullscreen width="300" height="200"></iframe>',
@@ -105,7 +105,7 @@ class YouTubeRendererTest extends UnitTestCase
     public function renderOutputWithLoopIsCorrect()
     {
         /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock */
-        $fileResourceMock = $this->getMock(File::class, array(), array(), '', false);
+        $fileResourceMock = $this->createMock(File::class);
 
         $this->assertSame(
             '<iframe src="//www.youtube.com/embed/7331?autohide=1&amp;controls=2&amp;loop=1&amp;enablejsapi=1&amp;origin=test.server.org&amp;showinfo=0" allowfullscreen width="300" height="200"></iframe>',
@@ -119,7 +119,7 @@ class YouTubeRendererTest extends UnitTestCase
     public function renderOutputWithAutoplayIsCorrect()
     {
         /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock */
-        $fileResourceMock = $this->getMock(File::class, array(), array(), '', false);
+        $fileResourceMock = $this->createMock(File::class);
 
         $this->assertSame(
             '<iframe src="//www.youtube.com/embed/7331?autohide=1&amp;controls=2&amp;autoplay=1&amp;enablejsapi=1&amp;origin=test.server.org&amp;showinfo=0" allowfullscreen width="300" height="200"></iframe>',
@@ -133,10 +133,10 @@ class YouTubeRendererTest extends UnitTestCase
     public function renderOutputWithAutoplayFromFileReferenceIsCorrect()
     {
         /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock */
-        $fileResourceMock = $this->getMock(File::class, array(), array(), '', false);
+        $fileResourceMock = $this->createMock(File::class);
 
         /** @var FileReference|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock */
-        $fileReferenceMock = $this->getMock(FileReference::class, array(), array(), '', false);
+        $fileReferenceMock = $this->createMock(FileReference::class);
         $fileReferenceMock->expects($this->any())->method('getProperty')->will($this->returnValue(1));
         $fileReferenceMock->expects($this->any())->method('getOriginalFile')->willReturn($fileResourceMock);
 
@@ -152,7 +152,7 @@ class YouTubeRendererTest extends UnitTestCase
     public function renderOutputWithAutoplayAndWithoutControllsIsCorrect()
     {
         /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock */
-        $fileResourceMock = $this->getMock(File::class, array(), array(), '', false);
+        $fileResourceMock = $this->createMock(File::class);
 
         $this->assertSame(
             '<iframe src="//www.youtube.com/embed/7331?autohide=1&amp;autoplay=1&amp;enablejsapi=1&amp;origin=test.server.org&amp;showinfo=0" allowfullscreen width="300" height="200"></iframe>',
diff --git a/typo3/sysext/core/Tests/Unit/Resource/Repository/AbstractRepositoryTest.php b/typo3/sysext/core/Tests/Unit/Resource/Repository/AbstractRepositoryTest.php
index e39f78a1798dfd392ad42d0606679a5178da897c..c2cb1a48be21a5da6aa3af792d4a3302617073f6 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/Repository/AbstractRepositoryTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/Repository/AbstractRepositoryTest.php
@@ -28,7 +28,7 @@ class AbstractRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 
     protected function createDatabaseMock()
     {
-        $this->mockedDb = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class);
+        $this->mockedDb = $this->createMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class);
         $GLOBALS['TYPO3_DB'] = $this->mockedDb;
     }
 
@@ -93,7 +93,7 @@ class AbstractRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function getWhereClauseForEnabledFieldsCallsSysPageForDeletedFlagInFrontend()
     {
         $GLOBALS['TSFE'] = new \stdClass();
-        $sysPageMock = $this->getMock(\TYPO3\CMS\Frontend\Page\PageRepository::class);
+        $sysPageMock = $this->createMock(\TYPO3\CMS\Frontend\Page\PageRepository::class);
         $GLOBALS['TSFE']->sys_page = $sysPageMock;
         $sysPageMock
             ->expects($this->once())
diff --git a/typo3/sysext/core/Tests/Unit/Resource/ResourceFactoryTest.php b/typo3/sysext/core/Tests/Unit/Resource/ResourceFactoryTest.php
index 72280f03c422b24f34c17bf0454e921961ccd95b..aee41f1db1e2f7b7dd5f59d88e58f396f6b1004e 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/ResourceFactoryTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/ResourceFactoryTest.php
@@ -57,7 +57,7 @@ class ResourceFactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function createStorageCollectionObjectCreatesCollectionWithCorrectArguments()
     {
-        $mockedMount = $this->getMock(\TYPO3\CMS\Core\Resource\ResourceStorage::class, array(), array(), '', false);
+        $mockedMount = $this->createMock(\TYPO3\CMS\Core\Resource\ResourceStorage::class);
         $path = $this->getUniqueId();
         $name = $this->getUniqueId();
         $storageCollection = $this->subject->createFolderObject($mockedMount, $path, $name, 0);
@@ -77,8 +77,8 @@ class ResourceFactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $mockedDriver = $this->getMockForAbstractClass(\TYPO3\CMS\Core\Resource\Driver\AbstractDriver::class);
         $driverFixtureClass = get_class($mockedDriver);
         \TYPO3\CMS\Core\Utility\GeneralUtility::addInstance($driverFixtureClass, $mockedDriver);
-        $mockedMount = $this->getMock(\TYPO3\CMS\Core\Resource\ResourceStorage::class, array(), array(), '', false);
-        $mockedRegistry = $this->getMock(\TYPO3\CMS\Core\Resource\Driver\DriverRegistry::class);
+        $mockedMount = $this->createMock(\TYPO3\CMS\Core\Resource\ResourceStorage::class);
+        $mockedRegistry = $this->createMock(\TYPO3\CMS\Core\Resource\Driver\DriverRegistry::class);
         $mockedRegistry->expects($this->once())->method('getDriverClass')->with($this->equalTo($driverFixtureClass))->will($this->returnValue($driverFixtureClass));
         \TYPO3\CMS\Core\Utility\GeneralUtility::setSingletonInstance(\TYPO3\CMS\Core\Resource\Driver\DriverRegistry::class, $mockedRegistry);
         $obj = $this->subject->getDriverObject($driverFixtureClass, array());
diff --git a/typo3/sysext/core/Tests/Unit/Resource/ResourceStorageTest.php b/typo3/sysext/core/Tests/Unit/Resource/ResourceStorageTest.php
index a74b06d2bef60ab2c3f6c39b831d67c67c527b00..32d1742b17479464e66aa4b30039859101b060ce 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/ResourceStorageTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/ResourceStorageTest.php
@@ -47,12 +47,12 @@ class ResourceStorageTest extends BaseTestCase
         parent::setUp();
         $this->singletonInstances = GeneralUtility::getSingletonInstances();
         /** @var FileRepository|\PHPUnit_Framework_MockObject_MockObject $fileRepositoryMock */
-        $fileRepositoryMock = $this->getMock(FileRepository::class);
+        $fileRepositoryMock = $this->createMock(FileRepository::class);
         GeneralUtility::setSingletonInstance(
             FileRepository::class,
             $fileRepositoryMock
         );
-        $databaseMock = $this->getMock(DatabaseConnection::class);
+        $databaseMock = $this->createMock(DatabaseConnection::class);
         $databaseMock->expects($this->any())->method('exec_SELECTgetRows')->with('*', 'sys_file_storage', '1=1', '', 'name', '', 'uid')->willReturn(array());
         $GLOBALS['TYPO3_DB'] = $databaseMock;
     }
@@ -86,8 +86,11 @@ class ResourceStorageTest extends BaseTestCase
         }
         $mockedMethods[] = 'getIndexer';
 
-        $this->subject = $this->getMock(ResourceStorage::class, $mockedMethods, array($driverObject, $storageRecord));
-        $this->subject->expects($this->any())->method('getIndexer')->will($this->returnValue($this->getMock(\TYPO3\CMS\Core\Resource\Index\Indexer::class, array(), array(), '', false)));
+        $this->subject = $this->getMockBuilder(ResourceStorage::class)
+            ->setMethods($mockedMethods)
+            ->setConstructorArgs(array($driverObject, $storageRecord))
+            ->getMock();
+        $this->subject->expects($this->any())->method('getIndexer')->will($this->returnValue($this->createMock(\TYPO3\CMS\Core\Resource\Index\Indexer::class)));
         if ($mockPermissionChecks) {
             foreach ($permissionMethods as $method) {
                 $this->subject->expects($this->any())->method($method)->will($this->returnValue(true));
@@ -135,7 +138,10 @@ class ResourceStorageTest extends BaseTestCase
         } else {
             // We are using the LocalDriver here because PHPUnit can't mock concrete methods in abstract classes, so
                 // when using the AbstractDriver we would be in trouble when wanting to mock away some concrete method
-            $driver = $this->getMock(LocalDriver::class, $mockedDriverMethods, array($driverConfiguration));
+            $driver = $this->getMockBuilder(LocalDriver::class)
+                ->setMethods($mockedDriverMethods)
+                ->setConstructorArgs(array($driverConfiguration))
+                ->getMock();
         }
         if ($storageObject !== null) {
             $storageObject->setDriver($driver);
@@ -377,7 +383,7 @@ class ResourceStorageTest extends BaseTestCase
     public function addFileFailsIfFileDoesNotExist()
     {
         /** @var Folder|\PHPUnit_Framework_MockObject_MockObject $mockedFolder */
-        $mockedFolder = $this->getMock(Folder::class, array(), array(), '', false);
+        $mockedFolder = $this->createMock(Folder::class);
         $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionCode(1319552745);
         $this->prepareSubject(array());
@@ -390,9 +396,14 @@ class ResourceStorageTest extends BaseTestCase
     public function getPublicUrlReturnsNullIfStorageIsNotOnline()
     {
         /** @var $driver LocalDriver|\PHPUnit_Framework_MockObject_MockObject */
-        $driver = $this->getMock(LocalDriver::class, array(), array(array('basePath' => $this->getMountRootUrl())));
+        $driver = $this->getMockBuilder(LocalDriver::class)
+            ->setConstructorArgs(array(array('basePath' => $this->getMountRootUrl())))
+            ->getMock();
         /** @var $subject ResourceStorage|\PHPUnit_Framework_MockObject_MockObject */
-        $subject = $this->getMock(ResourceStorage::class, array('isOnline'), array($driver, array('configuration' => array())));
+        $subject = $this->getMockBuilder(ResourceStorage::class)
+            ->setMethods(array('isOnline'))
+            ->setConstructorArgs(array($driver, array('configuration' => array())))
+            ->getMock();
         $subject->expects($this->once())->method('isOnline')->will($this->returnValue(false));
 
         $sourceFileIdentifier = '/sourceFile.ext';
@@ -437,13 +448,16 @@ class ResourceStorageTest extends BaseTestCase
     public function checkFolderPermissionsRespectsFilesystemPermissions($action, $permissionsFromDriver, $expectedResult)
     {
         /** @var $mockedDriver LocalDriver|\PHPUnit_Framework_MockObject_MockObject */
-        $mockedDriver = $this->getMock(LocalDriver::class);
+        $mockedDriver = $this->createMock(LocalDriver::class);
         $mockedDriver->expects($this->any())->method('getPermissions')->will($this->returnValue($permissionsFromDriver));
         /** @var $mockedFolder Folder|\PHPUnit_Framework_MockObject_MockObject  */
-        $mockedFolder = $this->getMock(Folder::class, array(), array(), '', false);
+        $mockedFolder = $this->createMock(Folder::class);
             // Let all other checks pass
         /** @var $subject ResourceStorage|\PHPUnit_Framework_MockObject_MockObject */
-        $subject = $this->getMock(ResourceStorage::class, array('isWritable', 'isBrowsable', 'checkUserActionPermission'), array($mockedDriver, array()), '', false);
+        $subject = $this->getMockBuilder(ResourceStorage::class)
+            ->setMethods(array('isWritable', 'isBrowsable', 'checkUserActionPermission'))
+            ->setConstructorArgs(array($mockedDriver, array()))
+            ->getMock();
         $subject->expects($this->any())->method('isWritable')->will($this->returnValue(true));
         $subject->expects($this->any())->method('isBrowsable')->will($this->returnValue(true));
         $subject->expects($this->any())->method('checkUserActionPermission')->will($this->returnValue(true));
@@ -558,7 +572,10 @@ class ResourceStorageTest extends BaseTestCase
         $this->markTestSkipped('This test does way to much and is mocked incomplete. Skipped for now.');
         $this->initializeVfs();
         $driverObject = $this->getMockForAbstractClass(AbstractDriver::class, array(), '', false);
-        $this->subject = $this->getMock(ResourceStorage::class, array('getFileIndexRepository', 'checkFileActionPermission'), array($driverObject, array()));
+        $this->subject = $this->getMockBuilder(ResourceStorage::class)
+            ->setMethods(array('getFileIndexRepository', 'checkFileActionPermission'))
+            ->setConstructorArgs(array($driverObject, array()))
+            ->getMock();
         $this->subject->expects($this->any())->method('checkFileActionPermission')->will($this->returnValue(true));
         $fileInfo = array(
             'storage' => 'A',
@@ -580,14 +597,16 @@ class ResourceStorageTest extends BaseTestCase
         );
         $hash = 'asdfg';
         /** @var $mockedDriver LocalDriver|\PHPUnit_Framework_MockObject_MockObject */
-        $mockedDriver = $this->getMock(LocalDriver::class, array(), array(array('basePath' => $this->getMountRootUrl())));
+        $mockedDriver = $this->getMockBuilder(LocalDriver::class)
+            ->setConstructorArgs(array(array('basePath' => $this->getMountRootUrl())))
+            ->getMock();
         $mockedDriver->expects($this->once())->method('getFileInfoByIdentifier')->will($this->returnValue($fileInfo));
         $mockedDriver->expects($this->once())->method('hash')->will($this->returnValue($hash));
         $this->subject->setDriver($mockedDriver);
-        $indexFileRepositoryMock = $this->getMock(FileIndexRepository::class);
+        $indexFileRepositoryMock = $this->createMock(FileIndexRepository::class);
         $this->subject->expects($this->any())->method('getFileIndexRepository')->will($this->returnValue($indexFileRepositoryMock));
         /** @var $mockedFile File|\PHPUnit_Framework_MockObject_MockObject */
-        $mockedFile = $this->getMock(File::class, array(), array(), '', false);
+        $mockedFile = $this->createMock(File::class);
         $mockedFile->expects($this->any())->method('getIdentifier')->will($this->returnValue($fileInfo['identifier']));
         // called by indexer because the properties are updated
         $this->subject->expects($this->any())->method('getFileInfoByIdentifier')->will($this->returnValue($newProperties));
@@ -624,7 +643,7 @@ class ResourceStorageTest extends BaseTestCase
         $this->initializeVfs();
         $targetFolder = $this->getSimpleFolderMock('/targetFolder/');
         /** @var $sourceDriver LocalDriver|\PHPUnit_Framework_MockObject_MockObject */
-        $sourceDriver = $this->getMock(LocalDriver::class);
+        $sourceDriver = $this->createMock(LocalDriver::class);
         $sourceDriver->expects($this->once())->method('deleteFile')->with($this->equalTo($sourceFileIdentifier));
         $configuration = $this->convertConfigurationArrayToFlexformXml(array());
         $sourceStorage = new ResourceStorage($sourceDriver, array('configuration' => $configuration));
@@ -634,11 +653,16 @@ class ResourceStorageTest extends BaseTestCase
         $sourceFile->expects($this->once())->method('getUpdatedProperties')->will($this->returnValue(array_keys($fileInfoDummy)));
         $sourceFile->expects($this->once())->method('getProperties')->will($this->returnValue($fileInfoDummy));
         /** @var $mockedDriver \TYPO3\CMS\Core\Resource\Driver\LocalDriver|\PHPUnit_Framework_MockObject_MockObject */
-        $mockedDriver = $this->getMock(LocalDriver::class, array(), array(array('basePath' => $this->getMountRootUrl())));
+        $mockedDriver = $this->getMockBuilder(LocalDriver::class)
+            ->setConstructorArgs(array(array('basePath' => $this->getMountRootUrl())))
+            ->getMock();
         $mockedDriver->expects($this->once())->method('getFileInfoByIdentifier')->will($this->returnValue($fileInfoDummy));
         $mockedDriver->expects($this->once())->method('addFile')->with($localFilePath, '/targetFolder/', $this->equalTo('file.ext'))->will($this->returnValue('/targetFolder/file.ext'));
         /** @var $subject ResourceStorage */
-        $subject = $this->getMock(ResourceStorage::class, array('assureFileMovePermissions'), array($mockedDriver, array('configuration' => $configuration)));
+        $subject = $this->getMockBuilder(ResourceStorage::class)
+            ->setMethods(array('assureFileMovePermissions'))
+            ->setConstructorArgs(array($mockedDriver, array('configuration' => $configuration)))
+            ->getMock();
         $subject->moveFile($sourceFile, $targetFolder, 'file.ext');
     }
 
@@ -689,7 +713,7 @@ class ResourceStorageTest extends BaseTestCase
         $this->expectExceptionCode(1325952534);
 
         /** @var \TYPO3\CMS\Core\Resource\Folder|\PHPUnit_Framework_MockObject_MockObject $folderMock */
-        $folderMock = $this->getMock(Folder::class, array(), array(), '', false);
+        $folderMock = $this->createMock(Folder::class);
         /** @var $mockedDriver \TYPO3\CMS\Core\Resource\Driver\AbstractDriver|\PHPUnit_Framework_MockObject_MockObject */
         $mockedDriver = $this->getMockForAbstractClass(AbstractDriver::class);
         $mockedDriver->expects($this->once())->method('isFolderEmpty')->will($this->returnValue(false));
diff --git a/typo3/sysext/core/Tests/Unit/Resource/TextExtraction/PlainTextExtractorTest.php b/typo3/sysext/core/Tests/Unit/Resource/TextExtraction/PlainTextExtractorTest.php
index c3ea733862ac546acd870d421d79aab4a57ecf6d..1c6783bd7a91be42fa8ceb04d98288a8a95df042 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/TextExtraction/PlainTextExtractorTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/TextExtraction/PlainTextExtractorTest.php
@@ -29,7 +29,7 @@ class PlainTextExtractorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $plainTextExtractor = new PlainTextExtractor();
 
-        $fileResourceMock = $this->getMock(File::class, array(), array(), '', false);
+        $fileResourceMock = $this->createMock(File::class);
         $fileResourceMock->expects($this->any())->method('getMimeType')->will($this->returnValue('text/plain'));
 
         $this->assertTrue($plainTextExtractor->canExtractText($fileResourceMock));
@@ -42,7 +42,7 @@ class PlainTextExtractorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $plainTextExtractor = new PlainTextExtractor();
 
-        $fileResourceMock = $this->getMock(File::class, array(), array(), '', false);
+        $fileResourceMock = $this->createMock(File::class);
         $fileResourceMock->expects($this->any())->method('getMimeType')->will($this->returnValue('video/mp4'));
 
         $this->assertFalse($plainTextExtractor->canExtractText($fileResourceMock));
diff --git a/typo3/sysext/core/Tests/Unit/Resource/TextExtraction/TextExtractorRegistryTest.php b/typo3/sysext/core/Tests/Unit/Resource/TextExtraction/TextExtractorRegistryTest.php
index 2c1be5ffb52f55884222283605c2f56a694eb0dc..e9f5f0b991293565f8d2b384deb55538d283f8b9 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/TextExtraction/TextExtractorRegistryTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/TextExtraction/TextExtractorRegistryTest.php
@@ -49,7 +49,9 @@ class TextExtractorRegistryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function registeredTextExtractorClassCanBeRetrieved()
     {
         $textExtractorClass = $this->getUniqueId('myTextExtractor');
-        $textExtractorInstance = $this->getMock(TextExtractorInterface::class, array(), array(), $textExtractorClass);
+        $textExtractorInstance = $this->getMockBuilder(TextExtractorInterface::class)
+            ->setMockClassName($textExtractorClass)
+            ->getMock();
 
         $textExtractorRegistry = $this->getTextExtractorRegistry(array(array($textExtractorClass, $textExtractorInstance)));
 
diff --git a/typo3/sysext/core/Tests/Unit/Resource/Utility/FileExtensionFilterTest.php b/typo3/sysext/core/Tests/Unit/Resource/Utility/FileExtensionFilterTest.php
index 8a2dca9f0b03f3bfccd43255bfd01e6bfb8b25d9..6c0437c23e8957fa94b5290254569b4581a8c973 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/Utility/FileExtensionFilterTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/Utility/FileExtensionFilterTest.php
@@ -51,8 +51,12 @@ class FileExtensionFilterTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $this->singletonInstances = \TYPO3\CMS\Core\Utility\GeneralUtility::getSingletonInstances();
         $this->filter = new \TYPO3\CMS\Core\Resource\Filter\FileExtensionFilter();
-        $this->tceMainMock = $this->getMock(\TYPO3\CMS\Core\DataHandling\DataHandler::class, array('deleteAction'), array());
-        $this->fileFactoryMock = $this->getMock(\TYPO3\CMS\Core\Resource\ResourceFactory::class, array('getFileReferenceObject'), array());
+        $this->tceMainMock = $this->getMockBuilder(\TYPO3\CMS\Core\DataHandling\DataHandler::class)
+            ->setMethods(array('deleteAction'))
+            ->getMock();
+        $this->fileFactoryMock = $this->getMockBuilder(\TYPO3\CMS\Core\Resource\ResourceFactory::class)
+            ->setMethods(array('getFileReferenceObject'))
+            ->getMock();
         \TYPO3\CMS\Core\Utility\GeneralUtility::setSingletonInstance(\TYPO3\CMS\Core\Resource\ResourceFactory::class, $this->fileFactoryMock);
     }
 
diff --git a/typo3/sysext/core/Tests/Unit/Tree/TableConfiguration/DatabaseTreeDataProviderTest.php b/typo3/sysext/core/Tests/Unit/Tree/TableConfiguration/DatabaseTreeDataProviderTest.php
index 33494b590d9d67f7bb423bb3d7144dff1a346ead..112466d5b229cba0900f8618a2f4298631e7ab63 100644
--- a/typo3/sysext/core/Tests/Unit/Tree/TableConfiguration/DatabaseTreeDataProviderTest.php
+++ b/typo3/sysext/core/Tests/Unit/Tree/TableConfiguration/DatabaseTreeDataProviderTest.php
@@ -47,7 +47,9 @@ class DatabaseTreeDataProviderTest extends UnitTestCase
      */
     protected function setUp()
     {
-        $this->database = $this->getMock(DatabaseConnection::class, array('exec_SELECTgetSingleRow'));
+        $this->database = $this->getMockBuilder(DatabaseConnection::class)
+            ->setMethods(array('exec_SELECTgetSingleRow'))
+            ->getMock();
         $this->database->expects($this->any())->method('exec_SELECTgetSingleRow')->will($this->returnValue(array('uid' => 0, 'parent' => '')));
         $this->treeData = new TreeNode();
         $GLOBALS['TYPO3_DB'] = $this->database;
diff --git a/typo3/sysext/core/Tests/Unit/TypoScript/TemplateServiceTest.php b/typo3/sysext/core/Tests/Unit/TypoScript/TemplateServiceTest.php
index 72e921b85114a4a65d3a806ce644762c6a352183..1dd4fe44018dc2a1304dc53a4a5eee4f83dd0ddb 100644
--- a/typo3/sysext/core/Tests/Unit/TypoScript/TemplateServiceTest.php
+++ b/typo3/sysext/core/Tests/Unit/TypoScript/TemplateServiceTest.php
@@ -67,7 +67,7 @@ class TemplateServiceTest extends UnitTestCase
     {
         $row = array('foo');
         $GLOBALS['TSFE'] = new \stdClass();
-        $sysPageMock = $this->getMock(\TYPO3\CMS\Frontend\Page\PageRepository::class);
+        $sysPageMock = $this->createMock(\TYPO3\CMS\Frontend\Page\PageRepository::class);
         $sysPageMock->expects($this->once())->method('versionOL')->with('sys_template', $row);
         $GLOBALS['TSFE']->sys_page = $sysPageMock;
         $this->templateService->versionOL($row);
@@ -108,10 +108,15 @@ class TemplateServiceTest extends UnitTestCase
             ),
         );
 
-        $mockPackage = $this->getMock(\TYPO3\CMS\Core\Package\Package::class, array('getPackagePath'), array(), '', false);
+        $mockPackage = $this->getMockBuilder(\TYPO3\CMS\Core\Package\Package::class)
+            ->setMethods(array('getPackagePath'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockPackage->expects($this->any())->method('getPackagePath')->will($this->returnValue(''));
 
-        $mockPackageManager = $this->getMock(\TYPO3\CMS\Core\Package\PackageManager::class, array('isPackageActive', 'getPackage'));
+        $mockPackageManager = $this->getMockBuilder(\TYPO3\CMS\Core\Package\PackageManager::class)
+            ->setMethods(array('isPackageActive', 'getPackage'))
+            ->getMock();
         $mockPackageManager->expects($this->any())->method('isPackageActive')->will($this->returnValue(true));
         $mockPackageManager->expects($this->any())->method('getPackage')->will($this->returnValue($mockPackage));
         ExtensionManagementUtility::setPackageManager($mockPackageManager);
diff --git a/typo3/sysext/core/Tests/Unit/Utility/ExtensionManagementUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/ExtensionManagementUtilityTest.php
index cb1084737ec624cd4c3c6aecf80f756fe945dd42..ead82b80429fa32835707ae5d4920ec4950ca059 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/ExtensionManagementUtilityTest.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/ExtensionManagementUtilityTest.php
@@ -72,10 +72,9 @@ class ExtensionManagementUtilityTest extends UnitTestCase
                 ->disableOriginalConstructor()
                 ->setMethods($packageMethods)
                 ->getMock();
-        $packageManager = $this->getMock(
-            PackageManager::class,
-            array('isPackageActive', 'getPackage', 'getActivePackages')
-        );
+        $packageManager = $this->getMockBuilder(PackageManager::class)
+            ->setMethods(array('isPackageActive', 'getPackage', 'getActivePackages'))
+            ->getMock();
         $package->expects($this->any())
                 ->method('getPackagePath')
                 ->will($this->returnValue($packagePath));
@@ -133,7 +132,9 @@ class ExtensionManagementUtilityTest extends UnitTestCase
 
         $packageName = $this->getUniqueId('foo');
         /** @var PackageManager|\PHPUnit_Framework_MockObject_MockObject $packageManager */
-        $packageManager = $this->getMock(PackageManager::class, array('isPackageActive'));
+        $packageManager = $this->getMockBuilder(PackageManager::class)
+            ->setMethods(array('isPackageActive'))
+            ->getMock();
         $packageManager->expects($this->once())
                 ->method('isPackageActive')
                 ->with($this->equalTo($packageName))
@@ -152,7 +153,9 @@ class ExtensionManagementUtilityTest extends UnitTestCase
                 ->setMethods(array('getPackagePath'))
                 ->getMock();
         /** @var PackageManager|\PHPUnit_Framework_MockObject_MockObject $packageManager */
-        $packageManager = $this->getMock(PackageManager::class, array('isPackageActive', 'getPackage'));
+        $packageManager = $this->getMockBuilder(PackageManager::class)
+            ->setMethods(array('isPackageActive', 'getPackage'))
+            ->getMock();
         $package->expects($this->once())
                 ->method('getPackagePath')
                 ->will($this->returnValue(PATH_site . 'foo/'));
@@ -258,7 +261,9 @@ class ExtensionManagementUtilityTest extends UnitTestCase
                 ->method('getPackageKey')
                 ->will($this->returnValue($extensionKey));
         /** @var PackageManager|\PHPUnit_Framework_MockObject_MockObject $packageManager */
-        $packageManager = $this->getMock(PackageManager::class, array('getActivePackages'));
+        $packageManager = $this->getMockBuilder(PackageManager::class)
+            ->setMethods(array('getActivePackages'))
+            ->getMock();
         $packageManager->expects($this->once())
                 ->method('getActivePackages')
                 ->will($this->returnValue(array($extensionKey => $package)));
@@ -284,7 +289,9 @@ class ExtensionManagementUtilityTest extends UnitTestCase
                 ->method('getPackageKey')
                 ->will($this->returnValue($extensionKey));
         /** @var PackageManager|\PHPUnit_Framework_MockObject_MockObject $packageManager */
-        $packageManager = $this->getMock(PackageManager::class, array('getActivePackages'));
+        $packageManager = $this->getMockBuilder(PackageManager::class)
+            ->setMethods(array('getActivePackages'))
+            ->getMock();
         $packageManager->expects($this->once())
                 ->method('getActivePackages')
                 ->will($this->returnValue(array($extensionKey => $package)));
@@ -1252,7 +1259,9 @@ class ExtensionManagementUtilityTest extends UnitTestCase
     public function loadExtLocalconfDoesNotReadFromCacheIfCachingIsDenied()
     {
         /** @var CacheManager|\PHPUnit_Framework_MockObject_MockObject $mockCacheManager */
-        $mockCacheManager = $this->getMock(CacheManager::class, array('getCache'));
+        $mockCacheManager = $this->getMockBuilder(CacheManager::class)
+            ->setMethods(array('getCache'))
+            ->getMock();
         $mockCacheManager->expects($this->never())->method('getCache');
         ExtensionManagementUtilityAccessibleProxy::setCacheManager($mockCacheManager);
         $GLOBALS['TYPO3_LOADED_EXT'] = new LoadedExtensionsArray($this->createMockPackageManagerWithMockPackage($this->getUniqueId()));
@@ -1264,15 +1273,15 @@ class ExtensionManagementUtilityTest extends UnitTestCase
      */
     public function loadExtLocalconfRequiresCacheFileIfExistsAndCachingIsAllowed()
     {
-        $mockCache = $this->getMock(
-            AbstractFrontend::class,
-            array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag', 'requireOnce'),
-            array(),
-            '',
-            false
-        );
+        $mockCache = $this->getMockBuilder(AbstractFrontend::class)
+            ->setMethods(array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag', 'requireOnce'))
+            ->disableOriginalConstructor()
+            ->getMock();
+
         /** @var CacheManager|\PHPUnit_Framework_MockObject_MockObject $mockCacheManager */
-        $mockCacheManager = $this->getMock(CacheManager::class, array('getCache'));
+        $mockCacheManager = $this->getMockBuilder(CacheManager::class)
+            ->setMethods(array('getCache'))
+            ->getMock();
         $mockCacheManager->expects($this->any())->method('getCache')->will($this->returnValue($mockCache));
         ExtensionManagementUtilityAccessibleProxy::setCacheManager($mockCacheManager);
         $mockCache->expects($this->any())->method('has')->will($this->returnValue(true));
@@ -1388,15 +1397,15 @@ class ExtensionManagementUtilityTest extends UnitTestCase
         $uniqueStringInLocalconf = $this->getUniqueId('foo');
         file_put_contents($extLocalconfLocation, "<?php\n\n" . $uniqueStringInLocalconf . "\n\n?>");
         $GLOBALS['TYPO3_LOADED_EXT'] = new LoadedExtensionsArray($packageManager);
-        $mockCache = $this->getMock(
-            AbstractFrontend::class,
-            array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag', 'requireOnce'),
-            array(),
-            '',
-            false
-        );
+        $mockCache = $this->getMockBuilder(AbstractFrontend::class)
+            ->setMethods(array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag', 'requireOnce'))
+            ->disableOriginalConstructor()
+            ->getMock();
+
         /** @var CacheManager|\PHPUnit_Framework_MockObject_MockObject $mockCacheManager */
-        $mockCacheManager = $this->getMock(CacheManager::class, array('getCache'));
+        $mockCacheManager = $this->getMockBuilder(CacheManager::class)
+            ->setMethods(array('getCache'))
+            ->getMock();
         $mockCacheManager->expects($this->any())->method('getCache')->will($this->returnValue($mockCache));
         ExtensionManagementUtilityAccessibleProxy::setCacheManager($mockCacheManager);
         $mockCache->expects($this->once())->method('set')->with($this->anything(), $this->stringContains($uniqueStringInLocalconf), $this->anything());
@@ -1411,15 +1420,15 @@ class ExtensionManagementUtilityTest extends UnitTestCase
         $extensionName = $this->getUniqueId('foo');
         $packageManager = $this->createMockPackageManagerWithMockPackage($extensionName);
         $GLOBALS['TYPO3_LOADED_EXT'] = new LoadedExtensionsArray($packageManager);
-        $mockCache = $this->getMock(
-            AbstractFrontend::class,
-            array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag', 'requireOnce'),
-            array(),
-            '',
-            false
-        );
+        $mockCache = $this->getMockBuilder(AbstractFrontend::class)
+            ->setMethods(array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag', 'requireOnce'))
+            ->disableOriginalConstructor()
+            ->getMock();
+
         /** @var CacheManager|\PHPUnit_Framework_MockObject_MockObject $mockCacheManager */
-        $mockCacheManager = $this->getMock(CacheManager::class, array('getCache'));
+        $mockCacheManager = $this->getMockBuilder(CacheManager::class)
+            ->setMethods(array('getCache'))
+            ->getMock();
         $mockCacheManager->expects($this->any())->method('getCache')->will($this->returnValue($mockCache));
         ExtensionManagementUtilityAccessibleProxy::setCacheManager($mockCacheManager);
         $mockCache->expects($this->once())
@@ -1433,15 +1442,15 @@ class ExtensionManagementUtilityTest extends UnitTestCase
      */
     public function createExtLocalconfCacheEntryWritesCacheEntryWithNoTags()
     {
-        $mockCache = $this->getMock(
-            AbstractFrontend::class,
-            array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag', 'requireOnce'),
-            array(),
-            '',
-            false
-        );
+        $mockCache = $this->getMockBuilder(AbstractFrontend::class)
+            ->setMethods(array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag', 'requireOnce'))
+            ->disableOriginalConstructor()
+            ->getMock();
+
         /** @var CacheManager|\PHPUnit_Framework_MockObject_MockObject $mockCacheManager */
-        $mockCacheManager = $this->getMock(CacheManager::class, array('getCache'));
+        $mockCacheManager = $this->getMockBuilder(CacheManager::class)
+            ->setMethods(array('getCache'))
+            ->getMock();
         $mockCacheManager->expects($this->any())->method('getCache')->will($this->returnValue($mockCache));
         ExtensionManagementUtilityAccessibleProxy::setCacheManager($mockCacheManager);
         $mockCache->expects($this->once())->method('set')->with($this->anything(), $this->anything(), $this->equalTo(array()));
@@ -1474,7 +1483,9 @@ class ExtensionManagementUtilityTest extends UnitTestCase
     public function loadBaseTcaDoesNotReadFromCacheIfCachingIsDenied()
     {
         /** @var CacheManager|\PHPUnit_Framework_MockObject_MockObject $mockCacheManager */
-        $mockCacheManager = $this->getMock(CacheManager::class, array('getCache'));
+        $mockCacheManager = $this->getMockBuilder(CacheManager::class)
+            ->setMethods(array('getCache'))
+            ->getMock();
         $mockCacheManager->expects($this->never())->method('getCache');
         ExtensionManagementUtilityAccessibleProxy::setCacheManager($mockCacheManager);
         ExtensionManagementUtilityAccessibleProxy::loadBaseTca(false);
@@ -1485,15 +1496,15 @@ class ExtensionManagementUtilityTest extends UnitTestCase
      */
     public function loadBaseTcaRequiresCacheFileIfExistsAndCachingIsAllowed()
     {
-        $mockCache = $this->getMock(
-            AbstractFrontend::class,
-            array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag', 'requireOnce'),
-            array(),
-            '',
-            false
-        );
+        $mockCache = $this->getMockBuilder(AbstractFrontend::class)
+            ->setMethods(array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag', 'requireOnce'))
+            ->disableOriginalConstructor()
+            ->getMock();
+
         /** @var CacheManager|\PHPUnit_Framework_MockObject_MockObject $mockCacheManager */
-        $mockCacheManager = $this->getMock(CacheManager::class, array('getCache'));
+        $mockCacheManager = $this->getMockBuilder(CacheManager::class)
+            ->setMethods(array('getCache'))
+            ->getMock();
         $mockCacheManager->expects($this->any())->method('getCache')->will($this->returnValue($mockCache));
         ExtensionManagementUtilityAccessibleProxy::setCacheManager($mockCacheManager);
         $mockCache->expects($this->any())->method('has')->will($this->returnValue(true));
@@ -1518,15 +1529,15 @@ class ExtensionManagementUtilityTest extends UnitTestCase
         $uniqueStringInTableConfiguration = $this->getUniqueId('table_configuration_');
         $tableConfiguration = '<?php return array(\'foo\' => \'' . $uniqueStringInTableConfiguration . '\'); ?>';
         file_put_contents($packagePath . 'Configuration/TCA/' . $uniqueTableName . '.php', $tableConfiguration);
-        $mockCache = $this->getMock(
-            AbstractFrontend::class,
-            array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag', 'requireOnce'),
-            array(),
-            '',
-            false
-        );
+        $mockCache = $this->getMockBuilder(AbstractFrontend::class)
+            ->setMethods(array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag', 'requireOnce'))
+            ->disableOriginalConstructor()
+            ->getMock();
+
         /** @var CacheManager|\PHPUnit_Framework_MockObject_MockObject $mockCacheManager */
-        $mockCacheManager = $this->getMock(CacheManager::class, array('getCache'));
+        $mockCacheManager = $this->getMockBuilder(CacheManager::class)
+            ->setMethods(array('getCache'))
+            ->getMock();
         $mockCacheManager->expects($this->any())->method('getCache')->will($this->returnValue($mockCache));
         ExtensionManagementUtilityAccessibleProxy::setCacheManager($mockCacheManager);
         $mockCache->expects($this->once())->method('has')->will($this->returnValue(false));
@@ -1539,15 +1550,15 @@ class ExtensionManagementUtilityTest extends UnitTestCase
      */
     public function loadBaseTcaWritesCacheEntryWithNoTags()
     {
-        $mockCache = $this->getMock(
-            AbstractFrontend::class,
-            array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag', 'requireOnce'),
-            array(),
-            '',
-            false
-        );
+        $mockCache = $this->getMockBuilder(AbstractFrontend::class)
+            ->setMethods(array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag', 'requireOnce'))
+            ->disableOriginalConstructor()
+            ->getMock();
+
         /** @var CacheManager|\PHPUnit_Framework_MockObject_MockObject $mockCacheManager */
-        $mockCacheManager = $this->getMock(CacheManager::class, array('getCache'));
+        $mockCacheManager = $this->getMockBuilder(CacheManager::class)
+            ->setMethods(array('getCache'))
+            ->getMock();
         $mockCacheManager->expects($this->any())->method('getCache')->will($this->returnValue($mockCache));
         ExtensionManagementUtilityAccessibleProxy::setCacheManager($mockCacheManager);
         $mockCache->expects($this->once())->method('has')->will($this->returnValue(false));
@@ -1580,7 +1591,9 @@ class ExtensionManagementUtilityTest extends UnitTestCase
     public function loadExtTablesDoesNotReadFromCacheIfCachingIsDenied()
     {
         /** @var CacheManager|\PHPUnit_Framework_MockObject_MockObject $mockCacheManager */
-        $mockCacheManager = $this->getMock(CacheManager::class, array('getCache'));
+        $mockCacheManager = $this->getMockBuilder(CacheManager::class)
+            ->setMethods(array('getCache'))
+            ->getMock();
         $mockCacheManager->expects($this->never())->method('getCache');
         ExtensionManagementUtilityAccessibleProxy::setCacheManager($mockCacheManager);
         $GLOBALS['TYPO3_LOADED_EXT'] = new LoadedExtensionsArray($this->createMockPackageManagerWithMockPackage($this->getUniqueId()));
@@ -1592,15 +1605,15 @@ class ExtensionManagementUtilityTest extends UnitTestCase
      */
     public function loadExtTablesRequiresCacheFileIfExistsAndCachingIsAllowed()
     {
-        $mockCache = $this->getMock(
-            AbstractFrontend::class,
-            array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag', 'requireOnce'),
-            array(),
-            '',
-            false
-        );
+        $mockCache = $this->getMockBuilder(AbstractFrontend::class)
+            ->setMethods(array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag', 'requireOnce'))
+            ->disableOriginalConstructor()
+            ->getMock();
+
         /** @var CacheManager|\PHPUnit_Framework_MockObject_MockObject $mockCacheManager */
-        $mockCacheManager = $this->getMock(CacheManager::class, array('getCache'));
+        $mockCacheManager = $this->getMockBuilder(CacheManager::class)
+            ->setMethods(array('getCache'))
+            ->getMock();
         $mockCacheManager->expects($this->any())->method('getCache')->will($this->returnValue($mockCache));
         ExtensionManagementUtilityAccessibleProxy::setCacheManager($mockCacheManager);
         $mockCache->expects($this->any())->method('has')->will($this->returnValue(true));
@@ -1629,15 +1642,15 @@ class ExtensionManagementUtilityTest extends UnitTestCase
                 'ext_tables.php' => $extTablesLocation
             )
         );
-        $mockCache = $this->getMock(
-            AbstractFrontend::class,
-            array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag', 'requireOnce'),
-            array(),
-            '',
-            false
-        );
+        $mockCache = $this->getMockBuilder(AbstractFrontend::class)
+            ->setMethods(array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag', 'requireOnce'))
+            ->disableOriginalConstructor()
+            ->getMock();
+
         /** @var CacheManager|\PHPUnit_Framework_MockObject_MockObject $mockCacheManager */
-        $mockCacheManager = $this->getMock(CacheManager::class, array('getCache'));
+        $mockCacheManager = $this->getMockBuilder(CacheManager::class)
+            ->setMethods(array('getCache'))
+            ->getMock();
         $mockCacheManager->expects($this->any())->method('getCache')->will($this->returnValue($mockCache));
         ExtensionManagementUtilityAccessibleProxy::setCacheManager($mockCacheManager);
         $mockCache->expects($this->once())->method('set')->with($this->anything(), $this->stringContains($uniqueStringInTables), $this->anything());
@@ -1653,15 +1666,15 @@ class ExtensionManagementUtilityTest extends UnitTestCase
         $GLOBALS['TYPO3_LOADED_EXT'] = array(
             $extensionName => array(),
         );
-        $mockCache = $this->getMock(
-            AbstractFrontend::class,
-            array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag', 'requireOnce'),
-            array(),
-            '',
-            false
-        );
+        $mockCache = $this->getMockBuilder(AbstractFrontend::class)
+            ->setMethods(array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag', 'requireOnce'))
+            ->disableOriginalConstructor()
+            ->getMock();
+
         /** @var CacheManager|\PHPUnit_Framework_MockObject_MockObject $mockCacheManager */
-        $mockCacheManager = $this->getMock(CacheManager::class, array('getCache'));
+        $mockCacheManager = $this->getMockBuilder(CacheManager::class)
+            ->setMethods(array('getCache'))
+            ->getMock();
         $mockCacheManager->expects($this->any())->method('getCache')->will($this->returnValue($mockCache));
         ExtensionManagementUtilityAccessibleProxy::setCacheManager($mockCacheManager);
         $mockCache->expects($this->once())
@@ -1675,15 +1688,15 @@ class ExtensionManagementUtilityTest extends UnitTestCase
      */
     public function createExtTablesCacheEntryWritesCacheEntryWithNoTags()
     {
-        $mockCache = $this->getMock(
-            AbstractFrontend::class,
-            array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag', 'requireOnce'),
-            array(),
-            '',
-            false
-        );
+        $mockCache = $this->getMockBuilder(AbstractFrontend::class)
+            ->setMethods(array('getIdentifier', 'set', 'get', 'getByTag', 'has', 'remove', 'flush', 'flushByTag', 'requireOnce'))
+            ->disableOriginalConstructor()
+            ->getMock();
+
         /** @var CacheManager|\PHPUnit_Framework_MockObject_MockObject $mockCacheManager */
-        $mockCacheManager = $this->getMock(CacheManager::class, array('getCache'));
+        $mockCacheManager = $this->getMockBuilder(CacheManager::class)
+            ->setMethods(array('getCache'))
+            ->getMock();
         $mockCacheManager->expects($this->any())->method('getCache')->will($this->returnValue($mockCache));
         ExtensionManagementUtilityAccessibleProxy::setCacheManager($mockCacheManager);
         $mockCache->expects($this->once())->method('set')->with($this->anything(), $this->anything(), $this->equalTo(array()));
@@ -1715,7 +1728,9 @@ class ExtensionManagementUtilityTest extends UnitTestCase
     public function removeCacheFilesFlushesSystemCaches()
     {
         /** @var CacheManager|\PHPUnit_Framework_MockObject_MockObject $mockCacheManager */
-        $mockCacheManager = $this->getMock(CacheManager::class, array('flushCachesInGroup'));
+        $mockCacheManager = $this->getMockBuilder(CacheManager::class)
+            ->setMethods(array('flushCachesInGroup'))
+            ->getMock();
         $mockCacheManager->expects($this->once())->method('flushCachesInGroup')->with('system');
         ExtensionManagementUtilityAccessibleProxy::setCacheManager($mockCacheManager);
         ExtensionManagementUtility::removeCacheFiles();
@@ -1772,7 +1787,10 @@ class ExtensionManagementUtilityTest extends UnitTestCase
         ExtensionManagementUtility::clearExtensionKeyMap();
         $uniqueSuffix = $this->getUniqueId('test');
         $extensionKey = 'unloadedextension' . $uniqueSuffix;
-        $packageMetaData = $this->getMock(MetaData::class, array('getVersion'), array($extensionKey));
+        $packageMetaData = $this->getMockBuilder(MetaData::class)
+            ->setMethods(array('getVersion'))
+            ->setConstructorArgs(array($extensionKey))
+            ->getMock();
         $packageMetaData->expects($this->any())->method('getVersion')->will($this->returnValue('1.2.3'));
         $packageManager = $this->createMockPackageManagerWithMockPackage($extensionKey, array('getPackagePath', 'getPackageKey', 'getPackageMetaData'));
         /** @var \PHPUnit_Framework_MockObject_MockObject $package */
@@ -1814,7 +1832,9 @@ class ExtensionManagementUtilityTest extends UnitTestCase
 
         $packageName = $this->getUniqueId('foo');
         /** @var PackageManager|\PHPUnit_Framework_MockObject_MockObject $packageManager */
-        $packageManager = $this->getMock(PackageManager::class, array('isPackageActive'));
+        $packageManager = $this->getMockBuilder(PackageManager::class)
+            ->setMethods(array('isPackageActive'))
+            ->getMock();
         $packageManager->expects($this->once())
             ->method('isPackageActive')
             ->with($this->equalTo($packageName))
@@ -1830,10 +1850,9 @@ class ExtensionManagementUtilityTest extends UnitTestCase
     {
         $packageName = $this->getUniqueId('foo');
         /** @var PackageManager|\PHPUnit_Framework_MockObject_MockObject $packageManager */
-        $packageManager = $this->getMock(
-            PackageManager::class,
-            array('isPackageActive', 'deactivatePackage')
-        );
+        $packageManager = $this->getMockBuilder(PackageManager::class)
+            ->setMethods(array('isPackageActive', 'deactivatePackage'))
+            ->getMock();
         $packageManager->expects($this->any())
             ->method('isPackageActive')
             ->will($this->returnValue(true));
@@ -1856,7 +1875,7 @@ class ExtensionManagementUtilityTest extends UnitTestCase
         $tableName = $this->getUniqueId('table');
 
         /** @var CategoryRegistry|\PHPUnit_Framework_MockObject_MockObject $registryMock */
-        $registryMock = $this->getMock(CategoryRegistry::class);
+        $registryMock = $this->getMockBuilder(CategoryRegistry::class)->getMock();
         $registryMock->expects($this->once())->method('add')->with($extensionKey, $tableName, 'categories', array());
         GeneralUtility::setSingletonInstance(CategoryRegistry::class, $registryMock);
         ExtensionManagementUtility::makeCategorizable($extensionKey, $tableName);
@@ -1872,7 +1891,7 @@ class ExtensionManagementUtilityTest extends UnitTestCase
         $fieldName = $this->getUniqueId('field');
 
         /** @var CategoryRegistry|\PHPUnit_Framework_MockObject_MockObject $registryMock */
-        $registryMock = $this->getMock(CategoryRegistry::class);
+        $registryMock = $this->getMockBuilder(CategoryRegistry::class)->getMock();
         $registryMock->expects($this->once())->method('add')->with($extensionKey, $tableName, $fieldName, array());
         GeneralUtility::setSingletonInstance(CategoryRegistry::class, $registryMock);
         ExtensionManagementUtility::makeCategorizable($extensionKey, $tableName, $fieldName);
diff --git a/typo3/sysext/core/Tests/Unit/Utility/File/ExtendedFileUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/File/ExtendedFileUtilityTest.php
index ab640c29b13995a82d82f1fe10a53bdaf3ca152b..31ca233653db5592289fcb6fa2395d099595778a 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/File/ExtendedFileUtilityTest.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/File/ExtendedFileUtilityTest.php
@@ -26,8 +26,10 @@ class ExtendedFileUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     protected function setUp()
     {
-        $GLOBALS['LANG'] = $this->getMock(\TYPO3\CMS\Lang\LanguageService::class, array('sL'));
-        $GLOBALS['TYPO3_DB'] = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array());
+        $GLOBALS['LANG'] = $this->getMockBuilder(\TYPO3\CMS\Lang\LanguageService::class)
+            ->setMethods(array('sL'))
+            ->getMock();
+        $GLOBALS['TYPO3_DB'] = $this->createMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class);
     }
 
     /**
@@ -36,17 +38,25 @@ class ExtendedFileUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function folderHasFilesInUseReturnsTrueIfItHasFiles()
     {
         $fileUid = 1;
-        $file = $this->getMock(File::class, array('getUid'), array(), '', false);
+        $file = $this->getMockBuilder(File::class)
+            ->setMethods(array('getUid'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $file->expects($this->once())->method('getUid')->will($this->returnValue($fileUid));
 
-        $folder = $this->getMock(Folder::class, array('getFiles'), array(), '', false);
+        $folder = $this->getMockBuilder(Folder::class)
+            ->setMethods(array('getFiles'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $folder->expects($this->once())
             ->method('getFiles')->with(0, 0, Folder::FILTER_MODE_USE_OWN_AND_STORAGE_FILTERS, true)
             ->will($this->returnValue(array($file))
         );
 
         /** @var \TYPO3\CMS\Core\Utility\File\ExtendedFileUtility $subject */
-        $subject = $this->getMock(\TYPO3\CMS\Core\Utility\File\ExtendedFileUtility::class, array('addFlashMessage'), array(), '');
+        $subject = $this->getMockBuilder(\TYPO3\CMS\Core\Utility\File\ExtendedFileUtility::class)
+            ->setMethods(array('addFlashMessage'))
+            ->getMock();
         $GLOBALS['TYPO3_DB']->expects($this->once())
             ->method('exec_SELECTcountRows')->with('*', 'sys_refindex', 'deleted=0 AND ref_table="sys_file" AND ref_uid IN (' . $fileUid . ') AND tablename<>"sys_file_metadata"')
             ->will($this->returnValue(1));
@@ -67,13 +77,18 @@ class ExtendedFileUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function folderHasFilesInUseReturnsFalseIfItHasNoFiles()
     {
-        $folder = $this->getMock(Folder::class, array('getFiles'), array(), '', false);
+        $folder = $this->getMockBuilder(Folder::class)
+            ->setMethods(array('getFiles'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $folder->expects($this->once())->method('getFiles')->with(0, 0, Folder::FILTER_MODE_USE_OWN_AND_STORAGE_FILTERS, true)->will(
             $this->returnValue(array())
         );
 
         /** @var \TYPO3\CMS\Core\Utility\File\ExtendedFileUtility $subject */
-        $subject = $this->getMock(\TYPO3\CMS\Core\Utility\File\ExtendedFileUtility::class, array('addFlashMessage'), array(), '');
+        $subject = $this->getMockBuilder(\TYPO3\CMS\Core\Utility\File\ExtendedFileUtility::class)
+            ->setMethods(array('addFlashMessage'))
+            ->getMock();
         $this->assertFalse($subject->folderHasFilesInUse($folder));
     }
 }
diff --git a/typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php
index 0858e51ec54e84f94b673f35cf894f3675288427..190224df261fd2937c1d1592b6a31bd627bba297 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php
@@ -2647,7 +2647,10 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function minifyJavaScriptCallsRegisteredHookWithInputString()
     {
         $hookClassName = $this->getUniqueId('tx_coretest');
-        $minifyHookMock = $this->getMock('stdClass', array('minify'), array(), $hookClassName);
+        $minifyHookMock = $this->getMockBuilder('stdClass')
+            ->setMethods(array('minify'))
+            ->setMockClassName($hookClassName)
+            ->getMock();
         $functionName = $hookClassName . '->minify';
         $GLOBALS['T3_VAR']['callUserFunction'][$functionName] = array();
         $GLOBALS['T3_VAR']['callUserFunction'][$functionName]['obj'] = $minifyHookMock;
@@ -2681,7 +2684,10 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function minifyJavaScriptReturnsErrorStringOfHookException()
     {
         $hookClassName = $this->getUniqueId('tx_coretest');
-        $minifyHookMock = $this->getMock('stdClass', array('minify'), array(), $hookClassName);
+        $minifyHookMock = $this->getMockBuilder('stdClass')
+            ->setMethods(array('minify'))
+            ->setMockClassName($hookClassName)
+            ->getMock();
         $functionName = '&' . $hookClassName . '->minify';
         $GLOBALS['T3_VAR']['callUserFunction'][$functionName] = array();
         $GLOBALS['T3_VAR']['callUserFunction'][$functionName]['obj'] = $minifyHookMock;
@@ -2702,7 +2708,10 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function minifyJavaScriptWritesExceptionMessageToDevLog()
     {
         $hookClassName = $this->getUniqueId('tx_coretest');
-        $minifyHookMock = $this->getMock('stdClass', array('minify'), array(), $hookClassName);
+        $minifyHookMock = $this->getMockBuilder('stdClass')
+            ->setMethods(array('minify'))
+            ->setMockClassName($hookClassName)
+            ->getMock();
         $functionName = '&' . $hookClassName . '->minify';
         $GLOBALS['T3_VAR']['callUserFunction'][$functionName] = array();
         $GLOBALS['T3_VAR']['callUserFunction'][$functionName]['obj'] = $minifyHookMock;
@@ -3980,7 +3989,7 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function makeInstanceReturnsClassInstance()
     {
-        $className = get_class($this->getMock('foo'));
+        $className = get_class($this->getMockBuilder('foo')->getMock());
         $this->assertTrue(GeneralUtility::makeInstance($className) instanceof $className);
     }
 
@@ -4020,7 +4029,7 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function makeInstanceCalledTwoTimesForNonSingletonClassReturnsDifferentInstances()
     {
-        $className = get_class($this->getMock('foo'));
+        $className = get_class($this->getMockBuilder('foo')->getMock());
         $this->assertNotSame(GeneralUtility::makeInstance($className), GeneralUtility::makeInstance($className));
     }
 
@@ -4029,7 +4038,7 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function makeInstanceCalledTwoTimesForSingletonClassReturnsSameInstance()
     {
-        $className = get_class($this->getMock(\TYPO3\CMS\Core\SingletonInterface::class));
+        $className = get_class($this->createMock(\TYPO3\CMS\Core\SingletonInterface::class));
         $this->assertSame(GeneralUtility::makeInstance($className), GeneralUtility::makeInstance($className));
     }
 
@@ -4038,7 +4047,7 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function makeInstanceCalledTwoTimesForSingletonClassWithPurgeInstancesInbetweenReturnsDifferentInstances()
     {
-        $className = get_class($this->getMock(\TYPO3\CMS\Core\SingletonInterface::class));
+        $className = get_class($this->createMock(\TYPO3\CMS\Core\SingletonInterface::class));
         $instance = GeneralUtility::makeInstance($className);
         GeneralUtility::purgeInstances();
         $this->assertNotSame($instance, GeneralUtility::makeInstance($className));
@@ -4052,7 +4061,7 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionCode(1288967479);
 
-        $instance = $this->getMock(\TYPO3\CMS\Core\SingletonInterface::class);
+        $instance = $this->createMock(\TYPO3\CMS\Core\SingletonInterface::class);
         GeneralUtility::setSingletonInstance('', $instance);
     }
 
@@ -4064,8 +4073,10 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionCode(1288967686);
 
-        $instance = $this->getMock(\TYPO3\CMS\Core\SingletonInterface::class, array('foo'));
-        $singletonClassName = get_class($this->getMock(\TYPO3\CMS\Core\SingletonInterface::class));
+        $instance = $this->getMockBuilder(\TYPO3\CMS\Core\SingletonInterface::class)
+            ->setMethods(array('foo'))
+            ->getMock();
+        $singletonClassName = get_class($this->createMock(\TYPO3\CMS\Core\SingletonInterface::class));
         GeneralUtility::setSingletonInstance($singletonClassName, $instance);
     }
 
@@ -4074,7 +4085,7 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function setSingletonInstanceMakesMakeInstanceReturnThatInstance()
     {
-        $instance = $this->getMock(\TYPO3\CMS\Core\SingletonInterface::class);
+        $instance = $this->createMock(\TYPO3\CMS\Core\SingletonInterface::class);
         $singletonClassName = get_class($instance);
         GeneralUtility::setSingletonInstance($singletonClassName, $instance);
         $this->assertSame($instance, GeneralUtility::makeInstance($singletonClassName));
@@ -4085,7 +4096,7 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function setSingletonInstanceCalledTwoTimesMakesMakeInstanceReturnLastSetInstance()
     {
-        $instance1 = $this->getMock(\TYPO3\CMS\Core\SingletonInterface::class);
+        $instance1 = $this->createMock(\TYPO3\CMS\Core\SingletonInterface::class);
         $singletonClassName = get_class($instance1);
         $instance2 = new $singletonClassName();
         GeneralUtility::setSingletonInstance($singletonClassName, $instance1);
@@ -4098,7 +4109,7 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function getSingletonInstancesContainsPreviouslySetSingletonInstance()
     {
-        $instance = $this->getMock(\TYPO3\CMS\Core\SingletonInterface::class);
+        $instance = $this->createMock(\TYPO3\CMS\Core\SingletonInterface::class);
         $instanceClassName = get_class($instance);
         GeneralUtility::setSingletonInstance($instanceClassName, $instance);
         $registeredSingletonInstances = GeneralUtility::getSingletonInstances();
@@ -4111,7 +4122,7 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function resetSingletonInstancesResetsPreviouslySetInstance()
     {
-        $instance = $this->getMock(\TYPO3\CMS\Core\SingletonInterface::class);
+        $instance = $this->createMock(\TYPO3\CMS\Core\SingletonInterface::class);
         $instanceClassName = get_class($instance);
         GeneralUtility::setSingletonInstance($instanceClassName, $instance);
         GeneralUtility::resetSingletonInstances(array());
@@ -4124,7 +4135,7 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function resetSingletonInstancesSetsGivenInstance()
     {
-        $instance = $this->getMock(\TYPO3\CMS\Core\SingletonInterface::class);
+        $instance = $this->createMock(\TYPO3\CMS\Core\SingletonInterface::class);
         $instanceClassName = get_class($instance);
         GeneralUtility::resetSingletonInstances(
             array($instanceClassName => $instance)
@@ -4142,7 +4153,7 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionCode(1288967479);
 
-        $instance = $this->getMock('foo');
+        $instance = $this->getMockBuilder('foo')->getMock();
         GeneralUtility::addInstance('', $instance);
     }
 
@@ -4154,8 +4165,10 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionCode(1288967686);
 
-        $instance = $this->getMock('foo', array('bar'));
-        $singletonClassName = get_class($this->getMock('foo'));
+        $instance = $this->getMockBuilder('foo')
+            ->setMethods(array('bar'))
+            ->getMock();
+        $singletonClassName = get_class($this->createMock('foo'));
         GeneralUtility::addInstance($singletonClassName, $instance);
     }
 
@@ -4167,7 +4180,7 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionCode(1288969325);
 
-        $instance = $this->getMock(\TYPO3\CMS\Core\SingletonInterface::class);
+        $instance = $this->createMock(\TYPO3\CMS\Core\SingletonInterface::class);
         GeneralUtility::addInstance(get_class($instance), $instance);
     }
 
@@ -4176,7 +4189,7 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function addInstanceMakesMakeInstanceReturnThatInstance()
     {
-        $instance = $this->getMock('foo');
+        $instance = $this->createMock('foo');
         $className = get_class($instance);
         GeneralUtility::addInstance($className, $instance);
         $this->assertSame($instance, GeneralUtility::makeInstance($className));
@@ -4187,7 +4200,7 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function makeInstanceCalledTwoTimesAfterAddInstanceReturnTwoDifferentInstances()
     {
-        $instance = $this->getMock('foo');
+        $instance = $this->createMock('foo');
         $className = get_class($instance);
         GeneralUtility::addInstance($className, $instance);
         $this->assertNotSame(GeneralUtility::makeInstance($className), GeneralUtility::makeInstance($className));
@@ -4198,7 +4211,7 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function addInstanceCalledTwoTimesMakesMakeInstanceReturnBothInstancesInAddingOrder()
     {
-        $instance1 = $this->getMock('foo');
+        $instance1 = $this->createMock('foo');
         $className = get_class($instance1);
         GeneralUtility::addInstance($className, $instance1);
         $instance2 = new $className();
@@ -4212,7 +4225,7 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function purgeInstancesDropsAddedInstance()
     {
-        $instance = $this->getMock('foo');
+        $instance = $this->createMock('foo');
         $className = get_class($instance);
         GeneralUtility::addInstance($className, $instance);
         GeneralUtility::purgeInstances();
@@ -4254,7 +4267,9 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             ->setMethods(array('getPackagePath'))
             ->getMock();
         /** @var PackageManager|\PHPUnit_Framework_MockObject_MockObject $packageManager */
-        $packageManager = $this->getMock(PackageManager::class, array('isPackageActive', 'getPackage'));
+        $packageManager = $this->getMockBuilder(PackageManager::class)
+            ->setMethods(array('isPackageActive', 'getPackage'))
+            ->getMock();
         $package->expects($this->any())
             ->method('getPackagePath')
             ->will($this->returnValue(PATH_site . 'typo3/sysext/foo/'));
diff --git a/typo3/sysext/core/Tests/Unit/Utility/RootlineUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/RootlineUtilityTest.php
index 5c5051e5d684622fbdcd8e4502c0d00c18f10398..c015b173a7c800ad1e1031fe2eb419544dcea73e 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/RootlineUtilityTest.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/RootlineUtilityTest.php
@@ -33,7 +33,7 @@ class RootlineUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 
     protected function setUp()
     {
-        $this->pageContextMock = $this->getMock(\TYPO3\CMS\Frontend\Page\PageRepository::class);
+        $this->pageContextMock = $this->createMock(\TYPO3\CMS\Frontend\Page\PageRepository::class);
         $this->subject = $this->getAccessibleMock(\TYPO3\CMS\Core\Utility\RootlineUtility::class, array('enrichWithRelationFields'), array(1, '', $this->pageContextMock));
     }
 
@@ -308,7 +308,7 @@ class RootlineUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             ->with(2, $pageDataTranslated)
             ->will($this->returnArgument(1));
 
-        $databaseConnectionMock = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class);
+        $databaseConnectionMock = $this->createMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class);
         $databaseConnectionMock
             ->expects($this->once())
             ->method('exec_SELECTgetSingleRow')
@@ -333,7 +333,10 @@ class RootlineUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function enrichWithRelationFieldsCreatesWhereClauseForDisabledField()
     {
-        $mockDatabaseConnection = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array('exec_SELECTgetRows'), array(), '', false);
+        $mockDatabaseConnection = $this->getMockBuilder(\TYPO3\CMS\Core\Database\DatabaseConnection::class)
+            ->setMethods(array('exec_SELECTgetRows'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $subject = $this->getAccessibleMock(\TYPO3\CMS\Core\Utility\RootlineUtility::class, array('columnHasRelationToResolve'), array(1, '', $this->pageContextMock));
         $subject->_set('databaseConnection', $mockDatabaseConnection);
         $GLOBALS['TYPO3_CONF_VARS']['FE']['pageOverlayFields'] = '';
diff --git a/typo3/sysext/dbal/Tests/Unit/Database/AbstractTestCase.php b/typo3/sysext/dbal/Tests/Unit/Database/AbstractTestCase.php
index 2d5eae3eb639890ccd6f2755f501034ee5a00b43..a103445d50a2666cedc9e38daed2bee1457fe931 100644
--- a/typo3/sysext/dbal/Tests/Unit/Database/AbstractTestCase.php
+++ b/typo3/sysext/dbal/Tests/Unit/Database/AbstractTestCase.php
@@ -42,7 +42,7 @@ abstract class AbstractTestCase extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $subject->conf = $configuration;
 
         // Disable caching
-        $mockCacheFrontend = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\PhpFrontend::class, array(), array(), '', false);
+        $mockCacheFrontend = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\PhpFrontend::class);
         $subject->expects($this->any())->method('getFieldInfoCache')->will($this->returnValue($mockCacheFrontend));
 
         // Inject SqlParser - Its logic is tested with the tests, too.
@@ -53,7 +53,10 @@ abstract class AbstractTestCase extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $subject->SQLparser = $sqlParser;
 
         // Mock away schema migration service from install tool
-        $installerSqlMock = $this->getMock(\TYPO3\CMS\Install\Service\SqlSchemaMigrationService::class, array('getFieldDefinitions_fileContent'), array(), '', false);
+        $installerSqlMock = $this->getMockBuilder(\TYPO3\CMS\Install\Service\SqlSchemaMigrationService::class)
+            ->setMethods(array('getFieldDefinitions_fileContent'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $installerSqlMock->expects($this->any())->method('getFieldDefinitions_fileContent')->will($this->returnValue(array()));
         $subject->_set('installerSql', $installerSqlMock);
 
diff --git a/typo3/sysext/dbal/Tests/Unit/Database/DatabaseConnectionOracleTest.php b/typo3/sysext/dbal/Tests/Unit/Database/DatabaseConnectionOracleTest.php
index 54dcdb2bf9b0af8d4c40fcc98f6ad01b40a66773..978e9873802c12aec3fadc109d036927d8f6b390 100644
--- a/typo3/sysext/dbal/Tests/Unit/Database/DatabaseConnectionOracleTest.php
+++ b/typo3/sysext/dbal/Tests/Unit/Database/DatabaseConnectionOracleTest.php
@@ -340,7 +340,10 @@ class DatabaseConnectionOracleTest extends AbstractTestCase
      */
     public function tablesAreUnmappedInAdminGetTables()
     {
-        $handlerMock = $this->getMock('\ADODB_mock', array('MetaTables'), array(), '', false);
+        $handlerMock = $this->getMockBuilder('\ADODB_mock')
+            ->setMethods(array('MetaTables'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $handlerMock->expects($this->any())->method('MetaTables')->will($this->returnValue(array('cf_cache_hash')));
         $this->subject->handlerInstance['_DEFAULT'] = $handlerMock;
 
diff --git a/typo3/sysext/dbal/Tests/Unit/Database/DatabaseConnectionTest.php b/typo3/sysext/dbal/Tests/Unit/Database/DatabaseConnectionTest.php
index c9c50794ebc6a45ac1195875ca727405e51e4ca0..d8df0bfc3604eafa4e478feedf96bd1090829152 100644
--- a/typo3/sysext/dbal/Tests/Unit/Database/DatabaseConnectionTest.php
+++ b/typo3/sysext/dbal/Tests/Unit/Database/DatabaseConnectionTest.php
@@ -37,7 +37,7 @@ class DatabaseConnectionTest extends AbstractTestCase
         $subject = $this->getAccessibleMock(\TYPO3\CMS\Dbal\Database\DatabaseConnection::class, array('getFieldInfoCache'), array(), '', false);
 
         // Disable caching
-        $mockCacheFrontend = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\PhpFrontend::class, array(), array(), '', false);
+        $mockCacheFrontend = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\PhpFrontend::class);
         $subject->expects($this->any())->method('getFieldInfoCache')->will($this->returnValue($mockCacheFrontend));
 
         // Inject SqlParser - Its logic is tested with the tests, too.
@@ -46,7 +46,10 @@ class DatabaseConnectionTest extends AbstractTestCase
         $subject->SQLparser = $sqlParser;
 
         // Mock away schema migration service from install tool
-        $installerSqlMock = $this->getMock(\TYPO3\CMS\Install\Service\SqlSchemaMigrationService::class, array('getFieldDefinitions_fileContent'), array(), '', false);
+        $installerSqlMock = $this->getMockBuilder(\TYPO3\CMS\Install\Service\SqlSchemaMigrationService::class)
+            ->setMethods(array('getFieldDefinitions_fileContent'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $installerSqlMock->expects($this->any())->method('getFieldDefinitions_fileContent')->will($this->returnValue(array()));
         $subject->_set('installerSql', $installerSqlMock);
 
@@ -97,14 +100,14 @@ class DatabaseConnectionTest extends AbstractTestCase
         /** @var \TYPO3\CMS\Dbal\Database\DatabaseConnection|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface $subject */
         $subject = $this->getAccessibleMock(\TYPO3\CMS\Dbal\Database\DatabaseConnection::class, array('getFieldInfoCache'), array(), '', false);
 
-        $mockCacheFrontend = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\PhpFrontend::class, array(), array(), '', false);
+        $mockCacheFrontend = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\PhpFrontend::class);
         $subject->expects($this->any())->method('getFieldInfoCache')->will($this->returnValue($mockCacheFrontend));
 
         $sqlParser = $this->getAccessibleMock(\TYPO3\CMS\Dbal\Database\SqlParser::class, array('dummy'), array(), '', false);
         $sqlParser->_set('databaseConnection', $subject);
         $subject->SQLparser = $sqlParser;
 
-        $installerSqlMock = $this->getMock(\TYPO3\CMS\Install\Service\SqlSchemaMigrationService::class, array(), array(), '', false);
+        $installerSqlMock = $this->createMock(\TYPO3\CMS\Install\Service\SqlSchemaMigrationService::class);
         $subject->_set('installerSql', $installerSqlMock);
         $schemaMigrationResult = array(
             'cf_cache_pages' => array(),
@@ -126,7 +129,10 @@ class DatabaseConnectionTest extends AbstractTestCase
      */
     public function adminGetTablesReturnsArrayWithNameKey()
     {
-        $handlerMock = $this->getMock('\ADODB_mock', array('MetaTables'), array(), '', false);
+        $handlerMock = $this->getMockBuilder('\ADODB_mock')
+            ->setMethods(array('MetaTables'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $handlerMock->expects($this->any())->method('MetaTables')->will($this->returnValue(array('cf_cache_hash')));
         $this->subject->handlerCfg['_DEFAULT']['type'] = 'adodb';
         $this->subject->handlerInstance['_DEFAULT'] = $handlerMock;
diff --git a/typo3/sysext/dbal/Tests/Unit/Database/SqlParserTest.php b/typo3/sysext/dbal/Tests/Unit/Database/SqlParserTest.php
index 5a4f3468e286e63d350d941368e7e40c4bf582b2..0addf64c4d117b79ce673cb70a46d59c3f9f199c 100644
--- a/typo3/sysext/dbal/Tests/Unit/Database/SqlParserTest.php
+++ b/typo3/sysext/dbal/Tests/Unit/Database/SqlParserTest.php
@@ -33,7 +33,7 @@ class SqlParserTest extends AbstractTestCase
     {
         $subject = $this->getAccessibleMock(\TYPO3\CMS\Dbal\Database\SqlParser::class, array('dummy'), array(), '', false);
 
-        $mockDatabaseConnection = $this->getMock(\TYPO3\CMS\Dbal\Database\DatabaseConnection::class, array(), array(), '', false);
+        $mockDatabaseConnection = $this->createMock(\TYPO3\CMS\Dbal\Database\DatabaseConnection::class);
         $mockDatabaseConnection->lastHandlerKey = '_DEFAULT';
         $subject->_set('databaseConnection', $mockDatabaseConnection);
         $subject->_set('sqlCompiler', GeneralUtility::makeInstance(\TYPO3\CMS\Dbal\Database\SqlCompilers\Adodb::class, $mockDatabaseConnection));
diff --git a/typo3/sysext/extbase/Tests/Functional/Persistence/TranslationTest.php b/typo3/sysext/extbase/Tests/Functional/Persistence/TranslationTest.php
index deefa436bd7cd02a102198823aefa55840c2b35e..978fdd761a991b47d3c1cde23317d22392e401da 100644
--- a/typo3/sysext/extbase/Tests/Functional/Persistence/TranslationTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Persistence/TranslationTest.php
@@ -72,7 +72,7 @@ class TranslationTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase
      */
     protected function setUpBasicFrontendEnvironment()
     {
-        $environmentServiceMock = $this->getMock(\TYPO3\CMS\Extbase\Service\EnvironmentService::class);
+        $environmentServiceMock = $this->createMock(\TYPO3\CMS\Extbase\Service\EnvironmentService::class);
         $environmentServiceMock
             ->expects($this->any())
             ->method('isEnvironmentInFrontendMode')
@@ -80,7 +80,7 @@ class TranslationTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase
         GeneralUtility::setSingletonInstance(\TYPO3\CMS\Extbase\Service\EnvironmentService::class, $environmentServiceMock);
 
         $pageRepositoryFixture = new PageRepository();
-        $frontendControllerMock = $this->getMock(\TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController::class, array(), array(), '', false);
+        $frontendControllerMock = $this->createMock(\TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController::class);
         $frontendControllerMock->sys_page = $pageRepositoryFixture;
         $GLOBALS['TSFE'] = $frontendControllerMock;
     }
diff --git a/typo3/sysext/extbase/Tests/Unit/Configuration/AbstractConfigurationManagerTest.php b/typo3/sysext/extbase/Tests/Unit/Configuration/AbstractConfigurationManagerTest.php
index 2472fc10ce04a561538554fb07205c47a58034ca..9f2c2444719d8e8c773d2e69a98e650f92141acf 100644
--- a/typo3/sysext/extbase/Tests/Unit/Configuration/AbstractConfigurationManagerTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Configuration/AbstractConfigurationManagerTest.php
@@ -514,7 +514,7 @@ class AbstractConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
      */
     public function getContentObjectTheCurrentContentObject()
     {
-        $mockContentObject = $this->getMock(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class);
+        $mockContentObject = $this->createMock(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class);
         $this->abstractConfigurationManager->setContentObject($mockContentObject);
         $this->assertSame($this->abstractConfigurationManager->getContentObject(), $mockContentObject);
     }
diff --git a/typo3/sysext/extbase/Tests/Unit/Configuration/BackendConfigurationManagerTest.php b/typo3/sysext/extbase/Tests/Unit/Configuration/BackendConfigurationManagerTest.php
index 638e82a32227238aff480fd6b9837f752c5b9eef..141f8b69eb0b4877bac56083d610c2ab53f91d95 100644
--- a/typo3/sysext/extbase/Tests/Unit/Configuration/BackendConfigurationManagerTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Configuration/BackendConfigurationManagerTest.php
@@ -35,7 +35,7 @@ class BackendConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     protected function setUp()
     {
-        $GLOBALS['TYPO3_DB'] = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array());
+        $GLOBALS['TYPO3_DB'] = $this->createMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class);
         $this->backendConfigurationManager = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Configuration\BackendConfigurationManager::class, array('getTypoScriptSetup'));
         $this->mockTypoScriptService = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Service\TypoScriptService::class);
         $this->backendConfigurationManager->_set('typoScriptService', $this->mockTypoScriptService);
@@ -346,7 +346,7 @@ class BackendConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 
         /** @var $abstractConfigurationManager \TYPO3\CMS\Extbase\Configuration\BackendConfigurationManager */
         $abstractConfigurationManager = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Configuration\BackendConfigurationManager::class, array('overrideSwitchableControllerActions', 'getContextSpecificFrameworkConfiguration', 'getTypoScriptSetup', 'getPluginConfiguration', 'getSwitchableControllerActions'));
-        $queryGenerator = $this->getMock(\TYPO3\CMS\Core\Database\QueryGenerator::class);
+        $queryGenerator = $this->createMock(\TYPO3\CMS\Core\Database\QueryGenerator::class);
         $queryGenerator->expects($this->any())
             ->method('getTreeList')
             ->will($this->onConsecutiveCalls('4', '', '5,6'));
@@ -372,7 +372,7 @@ class BackendConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 
         /** @var $abstractConfigurationManager \TYPO3\CMS\Extbase\Configuration\BackendConfigurationManager */
         $abstractConfigurationManager = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Configuration\BackendConfigurationManager::class, array('overrideSwitchableControllerActions', 'getContextSpecificFrameworkConfiguration', 'getTypoScriptSetup', 'getPluginConfiguration', 'getSwitchableControllerActions'));
-        $queryGenerator = $this->getMock(\TYPO3\CMS\Core\Database\QueryGenerator::class);
+        $queryGenerator = $this->createMock(\TYPO3\CMS\Core\Database\QueryGenerator::class);
         $queryGenerator->expects($this->any())
             ->method('getTreeList')
             ->will($this->onConsecutiveCalls('4', '', '3,5,6'));
@@ -392,7 +392,7 @@ class BackendConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 
         $abstractConfigurationManager = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Configuration\BackendConfigurationManager::class, array('overrideSwitchableControllerActions', 'getContextSpecificFrameworkConfiguration', 'getTypoScriptSetup', 'getPluginConfiguration', 'getSwitchableControllerActions'));
 
-        $queryGenerator = $this->getMock(\TYPO3\CMS\Core\Database\QueryGenerator::class);
+        $queryGenerator = $this->createMock(\TYPO3\CMS\Core\Database\QueryGenerator::class);
         $queryGenerator->expects($this->never())->method('getTreeList');
         $abstractConfigurationManager->_set('queryGenerator', $queryGenerator);
 
@@ -411,7 +411,7 @@ class BackendConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 
         $abstractConfigurationManager = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Configuration\BackendConfigurationManager::class, array('overrideSwitchableControllerActions', 'getContextSpecificFrameworkConfiguration', 'getTypoScriptSetup', 'getPluginConfiguration', 'getSwitchableControllerActions'));
 
-        $queryGenerator = $this->getMock(\TYPO3\CMS\Core\Database\QueryGenerator::class);
+        $queryGenerator = $this->createMock(\TYPO3\CMS\Core\Database\QueryGenerator::class);
         $queryGenerator->expects($this->never())->method('getTreeList');
         $abstractConfigurationManager->_set('queryGenerator', $queryGenerator);
 
diff --git a/typo3/sysext/extbase/Tests/Unit/Configuration/FrontendConfigurationManagerTest.php b/typo3/sysext/extbase/Tests/Unit/Configuration/FrontendConfigurationManagerTest.php
index 7cfe795635a48aeeecfc494aaec7cd120aade15e..7690385429b6202d230db64643c6bec112785c24 100644
--- a/typo3/sysext/extbase/Tests/Unit/Configuration/FrontendConfigurationManagerTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Configuration/FrontendConfigurationManagerTest.php
@@ -42,7 +42,9 @@ class FrontendConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
     {
         $GLOBALS['TSFE'] = new \stdClass();
         $GLOBALS['TSFE']->tmpl = new \stdClass();
-        $this->mockContentObject = $this->getMock(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class, array('getTreeList'));
+        $this->mockContentObject = $this->getMockBuilder(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class)
+            ->setMethods(array('getTreeList'))
+            ->getMock();
         $this->frontendConfigurationManager = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Configuration\FrontendConfigurationManager::class, array('dummy'));
         $this->frontendConfigurationManager->_set('contentObject', $this->mockContentObject);
         $this->mockTypoScriptService = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Service\TypoScriptService::class);
@@ -348,7 +350,7 @@ class FrontendConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
         /** @var $abstractConfigurationManager \TYPO3\CMS\Extbase\Configuration\FrontendConfigurationManager */
         $abstractConfigurationManager = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Configuration\FrontendConfigurationManager::class, array('overrideSwitchableControllerActions', 'getContextSpecificFrameworkConfiguration', 'getTypoScriptSetup', 'getPluginConfiguration', 'getSwitchableControllerActions'));
         /** @var $cObjectMock \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer */
-        $cObjectMock = $this->getMock(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class);
+        $cObjectMock = $this->createMock(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class);
         $cObjectMock->expects($this->any())
             ->method('getTreeList')
             ->will($this->onConsecutiveCalls('4', '', '898,12'));
@@ -369,7 +371,7 @@ class FrontendConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
         /** @var $abstractConfigurationManager \TYPO3\CMS\Extbase\Configuration\FrontendConfigurationManager */
         $abstractConfigurationManager = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Configuration\FrontendConfigurationManager::class, array('overrideSwitchableControllerActions', 'getContextSpecificFrameworkConfiguration', 'getTypoScriptSetup', 'getPluginConfiguration', 'getSwitchableControllerActions'));
         /** @var $cObjectMock \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer */
-        $cObjectMock = $this->getMock(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class);
+        $cObjectMock = $this->createMock(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class);
         $cObjectMock->expects($this->any())
             ->method('getTreeList')
             ->will($this->onConsecutiveCalls('3,4', '', '898,12'));
@@ -390,7 +392,7 @@ class FrontendConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
         /** @var $abstractConfigurationManager \TYPO3\CMS\Extbase\Configuration\FrontendConfigurationManager */
         $abstractConfigurationManager = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Configuration\FrontendConfigurationManager::class, array('overrideSwitchableControllerActions', 'getContextSpecificFrameworkConfiguration', 'getTypoScriptSetup', 'getPluginConfiguration', 'getSwitchableControllerActions'));
         /** @var $cObjectMock \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer */
-        $cObjectMock = $this->getMock(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class);
+        $cObjectMock = $this->createMock(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class);
         $cObjectMock->expects($this->never())->method('getTreeList');
         $abstractConfigurationManager->setContentObject($cObjectMock);
 
@@ -410,7 +412,7 @@ class FrontendConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
         $abstractConfigurationManager = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Configuration\FrontendConfigurationManager::class, array('overrideSwitchableControllerActions', 'getContextSpecificFrameworkConfiguration', 'getTypoScriptSetup', 'getPluginConfiguration', 'getSwitchableControllerActions'));
 
         /** @var $cObjectMock \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer */
-        $cObjectMock = $this->getMock(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class);
+        $cObjectMock = $this->createMock(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class);
         $cObjectMock->expects($this->never())->method('getTreeList');
         $abstractConfigurationManager->setContentObject($cObjectMock);
 
@@ -473,7 +475,9 @@ class FrontendConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
     public function overrideConfigurationFromFlexFormChecksForDataIsString()
     {
         /** @var $flexFormService \TYPO3\CMS\Extbase\Service\FlexFormService|\PHPUnit_Framework_MockObject_MockObject */
-        $flexFormService = $this->getMock(\TYPO3\CMS\Extbase\Service\FlexFormService::class, array('convertFlexFormContentToArray'));
+        $flexFormService = $this->getMockBuilder(\TYPO3\CMS\Extbase\Service\FlexFormService::class)
+            ->setMethods(array('convertFlexFormContentToArray'))
+            ->getMock();
         $flexFormService->expects($this->once())->method('convertFlexFormContentToArray')->will($this->returnValue(array(
             'persistence' => array(
                 'storagePid' => '0,1,2,3'
@@ -496,7 +500,9 @@ class FrontendConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
     public function overrideConfigurationFromFlexFormChecksForDataIsStringAndEmpty()
     {
         /** @var $flexFormService \TYPO3\CMS\Extbase\Service\FlexFormService|\PHPUnit_Framework_MockObject_MockObject */
-        $flexFormService = $this->getMock(\TYPO3\CMS\Extbase\Service\FlexFormService::class, array('convertFlexFormContentToArray'));
+        $flexFormService = $this->getMockBuilder(\TYPO3\CMS\Extbase\Service\FlexFormService::class)
+            ->setMethods(array('convertFlexFormContentToArray'))
+            ->getMock();
         $flexFormService->expects($this->never())->method('convertFlexFormContentToArray');
 
         $this->frontendConfigurationManager->_set('flexFormService', $flexFormService);
@@ -515,7 +521,9 @@ class FrontendConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
     public function overrideConfigurationFromFlexFormChecksForDataIsArray()
     {
         /** @var $flexFormService \TYPO3\CMS\Extbase\Service\FlexFormService|\PHPUnit_Framework_MockObject_MockObject */
-        $flexFormService = $this->getMock(\TYPO3\CMS\Extbase\Service\FlexFormService::class, array('convertFlexFormContentToArray'));
+        $flexFormService = $this->getMockBuilder(\TYPO3\CMS\Extbase\Service\FlexFormService::class)
+            ->setMethods(array('convertFlexFormContentToArray'))
+            ->getMock();
         $flexFormService->expects($this->never())->method('convertFlexFormContentToArray');
 
         $this->frontendConfigurationManager->_set('flexFormService', $flexFormService);
@@ -534,7 +542,9 @@ class FrontendConfigurationManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
     public function overrideConfigurationFromFlexFormChecksForDataIsArrayAndEmpty()
     {
         /** @var $flexFormService \TYPO3\CMS\Extbase\Service\FlexFormService|\PHPUnit_Framework_MockObject_MockObject */
-        $flexFormService = $this->getMock(\TYPO3\CMS\Extbase\Service\FlexFormService::class, array('convertFlexFormContentToArray'));
+        $flexFormService = $this->getMockBuilder(\TYPO3\CMS\Extbase\Service\FlexFormService::class)
+            ->setMethods(array('convertFlexFormContentToArray'))
+            ->getMock();
         $flexFormService->expects($this->never())->method('convertFlexFormContentToArray');
 
         $this->frontendConfigurationManager->_set('flexFormService', $flexFormService);
diff --git a/typo3/sysext/extbase/Tests/Unit/Core/BootstrapTest.php b/typo3/sysext/extbase/Tests/Unit/Core/BootstrapTest.php
index f18c3ba20e2c119397b8f76fe7faf1148f3f335c..84419e374447e309b1e81c32a88dcf90f2cdf7a2 100644
--- a/typo3/sysext/extbase/Tests/Unit/Core/BootstrapTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Core/BootstrapTest.php
@@ -45,7 +45,9 @@ class BootstrapTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function configureObjectManagerRespectsOverridingOfAlternativeObjectRegistrationViaPluginConfiguration()
     {
         /** @var $objectContainer \TYPO3\CMS\Extbase\Object\Container\Container|\PHPUnit_Framework_MockObject_MockObject */
-        $objectContainer = $this->getMock(\TYPO3\CMS\Extbase\Object\Container\Container::class, array('registerImplementation'));
+        $objectContainer = $this->getMockBuilder(\TYPO3\CMS\Extbase\Object\Container\Container::class)
+            ->setMethods(array('registerImplementation'))
+            ->getMock();
         $objectContainer->expects($this->once())->method('registerImplementation')->with(\TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface::class, 'TYPO3\CMS\Extbase\Persistence\Reddis\PersistenceManager');
         \TYPO3\CMS\Core\Utility\GeneralUtility::setSingletonInstance(\TYPO3\CMS\Extbase\Object\Container\Container::class, $objectContainer);
 
@@ -60,7 +62,7 @@ class BootstrapTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $configurationManagerMock->expects($this->any())->method('getConfiguration')->with('Framework')->will($this->returnValue($frameworkSettings));
 
         /** @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject  $objectManager */
-        $objectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
+        $objectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
 
         /** @var $bootstrapMock \TYPO3\CMS\Extbase\Core\Bootstrap|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
         $bootstrapMock = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Core\Bootstrap::class, array('inject'));
diff --git a/typo3/sysext/extbase/Tests/Unit/Domain/Repository/BackendUserGroupRepositoryTest.php b/typo3/sysext/extbase/Tests/Unit/Domain/Repository/BackendUserGroupRepositoryTest.php
index 2f1c304a41df2ffcf07e5657ba118763a187ef53..34227a2fecc9eaa2d2f1a81842eb8e06a642d9bd 100644
--- a/typo3/sysext/extbase/Tests/Unit/Domain/Repository/BackendUserGroupRepositoryTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Domain/Repository/BackendUserGroupRepositoryTest.php
@@ -24,9 +24,9 @@ class BackendUserGroupRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function initializeObjectSetsRespectStoragePidToFalse()
     {
-        $objectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
+        $objectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
         $fixture = new \TYPO3\CMS\Extbase\Domain\Repository\BackendUserGroupRepository($objectManager);
-        $querySettings = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings::class);
+        $querySettings = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings::class);
         $querySettings->expects($this->once())->method('setRespectStoragePage')->with(false);
         $objectManager->expects($this->once())->method('get')->with(\TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings::class)->will($this->returnValue($querySettings));
         $fixture->initializeObject();
@@ -37,10 +37,13 @@ class BackendUserGroupRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function initializeObjectSetsDefaultQuerySettings()
     {
-        $objectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
+        $objectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
         /** @var $fixture \TYPO3\CMS\Extbase\Domain\Repository\BackendUserGroupRepository */
-        $fixture = $this->getMock(\TYPO3\CMS\Extbase\Domain\Repository\BackendUserGroupRepository::class, array('setDefaultQuerySettings'), array($objectManager));
-        $querySettings = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings::class);
+        $fixture = $this->getMockBuilder(\TYPO3\CMS\Extbase\Domain\Repository\BackendUserGroupRepository::class)
+            ->setMethods(array('setDefaultQuerySettings'))
+            ->setConstructorArgs(array($objectManager))
+            ->getMock();
+        $querySettings = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings::class);
         $objectManager->expects($this->once())->method('get')->with(\TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings::class)->will($this->returnValue($querySettings));
         $fixture->expects($this->once())->method('setDefaultQuerySettings')->with($querySettings);
         $fixture->initializeObject();
diff --git a/typo3/sysext/extbase/Tests/Unit/Domain/Repository/BackendUserRepositoryTest.php b/typo3/sysext/extbase/Tests/Unit/Domain/Repository/BackendUserRepositoryTest.php
index a230facbbc5e049f1f71e8eebc9a7555eb3ab61d..7e619f1c9f81a60ea4d09951247492c7002c72a1 100644
--- a/typo3/sysext/extbase/Tests/Unit/Domain/Repository/BackendUserRepositoryTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Domain/Repository/BackendUserRepositoryTest.php
@@ -24,9 +24,9 @@ class BackendUserRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function initializeObjectSetsRespectStoragePidToFalse()
     {
-        $objectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
+        $objectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
         $fixture = new \TYPO3\CMS\Extbase\Domain\Repository\BackendUserGroupRepository($objectManager);
-        $querySettings = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings::class);
+        $querySettings = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings::class);
         $querySettings->expects($this->once())->method('setRespectStoragePage')->with(false);
         $objectManager->expects($this->once())->method('get')->with(\TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings::class)->will($this->returnValue($querySettings));
         $fixture->initializeObject();
@@ -37,10 +37,13 @@ class BackendUserRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function initializeObjectSetsDefaultQuerySettings()
     {
-        $objectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
+        $objectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
         /** @var $fixture \TYPO3\CMS\Extbase\Domain\Repository\BackendUserGroupRepository */
-        $fixture = $this->getMock(\TYPO3\CMS\Extbase\Domain\Repository\BackendUserGroupRepository::class, array('setDefaultQuerySettings'), array($objectManager));
-        $querySettings = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings::class);
+        $fixture = $this->getMockBuilder(\TYPO3\CMS\Extbase\Domain\Repository\BackendUserGroupRepository::class)
+            ->setMethods(array('setDefaultQuerySettings'))
+            ->setConstructorArgs(array($objectManager))
+            ->getMock();
+        $querySettings = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings::class);
         $objectManager->expects($this->once())->method('get')->with(\TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings::class)->will($this->returnValue($querySettings));
         $fixture->expects($this->once())->method('setDefaultQuerySettings')->with($querySettings);
         $fixture->initializeObject();
diff --git a/typo3/sysext/extbase/Tests/Unit/Domain/Repository/CategoryRepositoryTest.php b/typo3/sysext/extbase/Tests/Unit/Domain/Repository/CategoryRepositoryTest.php
index 11d7c4fae8941671ef02af197e468f8de904225c..51763c1000a578a2617b1510ab0839920cca797b 100644
--- a/typo3/sysext/extbase/Tests/Unit/Domain/Repository/CategoryRepositoryTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Domain/Repository/CategoryRepositoryTest.php
@@ -25,9 +25,9 @@ class CategoryRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function initializeObjectSetsRespectStoragePidToFalse()
     {
         /** @var $objectManager \TYPO3\CMS\Extbase\Object\ObjectManagerInterface */
-        $objectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
+        $objectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
         $fixture = new \TYPO3\CMS\Extbase\Domain\Repository\CategoryRepository($objectManager);
-        $querySettings = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings::class);
+        $querySettings = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings::class);
         $querySettings->expects($this->once())->method('setRespectStoragePage')->with(false);
         $objectManager->expects($this->once())->method('get')->with(\TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings::class)->will($this->returnValue($querySettings));
         $fixture->initializeObject();
diff --git a/typo3/sysext/extbase/Tests/Unit/Domain/Repository/FileMountRepositoryTest.php b/typo3/sysext/extbase/Tests/Unit/Domain/Repository/FileMountRepositoryTest.php
index a4601a34881a526c246ee42bbb485e810f3e56fc..46c2818885883ed0ba5d8fd35c9c93a1351e56f0 100644
--- a/typo3/sysext/extbase/Tests/Unit/Domain/Repository/FileMountRepositoryTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Domain/Repository/FileMountRepositoryTest.php
@@ -25,9 +25,9 @@ class FileMountRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function initializeObjectSetsRespectStoragePidToFalse()
     {
         /** @var $objectManager \TYPO3\CMS\Extbase\Object\ObjectManagerInterface */
-        $objectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
+        $objectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
         $fixture = new \TYPO3\CMS\Extbase\Domain\Repository\FileMountRepository($objectManager);
-        $querySettings = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings::class);
+        $querySettings = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings::class);
         $querySettings->expects($this->once())->method('setRespectStoragePage')->with(false);
         $objectManager->expects($this->once())->method('get')->with(\TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings::class)->will($this->returnValue($querySettings));
         $fixture->initializeObject();
diff --git a/typo3/sysext/extbase/Tests/Unit/Error/ResultTest.php b/typo3/sysext/extbase/Tests/Unit/Error/ResultTest.php
index e6b80a4c880f30d95857da1dff6f9cb0b5864fc6..46ef237bc901d437e5fb40ea7469d461ba9f718e 100644
--- a/typo3/sysext/extbase/Tests/Unit/Error/ResultTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Error/ResultTest.php
@@ -54,7 +54,7 @@ class ResultTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     protected function getMockMessage($type)
     {
-        return $this->getMock('TYPO3\\CMS\\Extbase\\Error\\' . $type, array(), array(), '', false);
+        return $this->createMock('TYPO3\\CMS\\Extbase\\Error\\' . $type);
     }
 
     /**
diff --git a/typo3/sysext/extbase/Tests/Unit/Hook/DataHandler/CheckFlexFormValueTest.php b/typo3/sysext/extbase/Tests/Unit/Hook/DataHandler/CheckFlexFormValueTest.php
index d2dec370832b73b0d8b38b42a424d73eb9227efa..b5723c0c11ef3a57bcd97b954132e5a49ffc633c 100644
--- a/typo3/sysext/extbase/Tests/Unit/Hook/DataHandler/CheckFlexFormValueTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Hook/DataHandler/CheckFlexFormValueTest.php
@@ -46,11 +46,13 @@ class CheckFlexFormValueTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         );
 
         /** @var \TYPO3\CMS\Core\DataHandling\DataHandler $dataHandler */
-        $dataHandler = $this->getMock(\TYPO3\CMS\Core\DataHandling\DataHandler::class);
+        $dataHandler = $this->createMock(\TYPO3\CMS\Core\DataHandling\DataHandler::class);
 
         $newFlexFormDataArray = array();
         /** @var \TYPO3\CMS\Extbase\Hook\DataHandler\CheckFlexFormValue $checkFlexFormValue */
-        $checkFlexFormValue = $this->getMock(\TYPO3\CMS\Extbase\Hook\DataHandler\CheckFlexFormValue::class, array('dummy'));
+        $checkFlexFormValue = $this->getMockBuilder(\TYPO3\CMS\Extbase\Hook\DataHandler\CheckFlexFormValue::class)
+            ->setMethods(array('dummy'))
+            ->getMock();
         $checkFlexFormValue->checkFlexFormValue_beforeMerge($dataHandler, $currentFlexFormDataArray, $newFlexFormDataArray);
 
         $this->assertSame($expectedFlexFormDataArray, $currentFlexFormDataArray);
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/CommandManagerTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/CommandManagerTest.php
index 38575bf8dccf5af43a583dd801df50e2de284e21..728ac6d11cd4d89132b3d5fca2b1655251a055b8 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/CommandManagerTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/CommandManagerTest.php
@@ -41,7 +41,7 @@ class CommandManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     protected function setUp()
     {
         $this->commandManager = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Mvc\Cli\CommandManager::class, array('getAvailableCommands'));
-        $this->mockObjectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
+        $this->mockObjectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
         $this->commandManager->_set('objectManager', $this->mockObjectManager);
     }
 
@@ -57,9 +57,9 @@ class CommandManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             \TYPO3\CMS\Extbase\Tests\Unit\Mvc\Cli\Fixture\Command\MockACommandController::class,
             \TYPO3\CMS\Extbase\Tests\Unit\Mvc\Cli\Fixture\Command\MockBCommandController::class
         );
-        $mockCommand1 = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Cli\Command::class, array(), array(), '', false);
-        $mockCommand2 = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Cli\Command::class, array(), array(), '', false);
-        $mockCommand3 = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Cli\Command::class, array(), array(), '', false);
+        $mockCommand1 = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Cli\Command::class);
+        $mockCommand2 = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Cli\Command::class);
+        $mockCommand3 = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Cli\Command::class);
         $this->mockObjectManager->expects($this->at(0))->method('get')->with(\TYPO3\CMS\Extbase\Mvc\Cli\Command::class, \TYPO3\CMS\Extbase\Tests\Unit\Mvc\Cli\Fixture\Command\MockACommandController::class, 'foo')->will($this->returnValue($mockCommand1));
         $this->mockObjectManager->expects($this->at(1))->method('get')->with(\TYPO3\CMS\Extbase\Mvc\Cli\Command::class, \TYPO3\CMS\Extbase\Tests\Unit\Mvc\Cli\Fixture\Command\MockACommandController::class, 'bar')->will($this->returnValue($mockCommand2));
         $this->mockObjectManager->expects($this->at(2))->method('get')->with(\TYPO3\CMS\Extbase\Mvc\Cli\Command::class, \TYPO3\CMS\Extbase\Tests\Unit\Mvc\Cli\Fixture\Command\MockBCommandController::class, 'baz')->will($this->returnValue($mockCommand3));
@@ -75,7 +75,7 @@ class CommandManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function getCommandByIdentifierReturnsCommandIfIdentifierIsEqual()
     {
-        $mockCommand = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Cli\Command::class, array(), array(), '', false);
+        $mockCommand = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Cli\Command::class);
         $mockCommand->expects($this->once())->method('getCommandIdentifier')->will($this->returnValue('extensionkey:controller:command'));
         $mockCommands = array($mockCommand);
         $this->commandManager->expects($this->once())->method('getAvailableCommands')->will($this->returnValue($mockCommands));
@@ -87,7 +87,7 @@ class CommandManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function getCommandByIdentifierWorksCaseInsensitive()
     {
-        $mockCommand = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Cli\Command::class, array(), array(), '', false);
+        $mockCommand = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Cli\Command::class);
         $mockCommand->expects($this->once())->method('getCommandIdentifier')->will($this->returnValue('extensionkey:controller:command'));
         $mockCommands = array($mockCommand);
         $this->commandManager->expects($this->once())->method('getAvailableCommands')->will($this->returnValue($mockCommands));
@@ -101,7 +101,7 @@ class CommandManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $this->expectException(NoSuchCommandException::class);
         $this->expectExceptionCode(1310556663);
-        $mockCommand = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Cli\Command::class, array(), array(), '', false);
+        $mockCommand = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Cli\Command::class);
         $mockCommand->expects($this->once())->method('getCommandIdentifier')->will($this->returnValue('extensionkey:controller:command'));
         $mockCommands = array($mockCommand);
         $this->commandManager->expects($this->once())->method('getAvailableCommands')->will($this->returnValue($mockCommands));
@@ -115,9 +115,9 @@ class CommandManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $this->expectException(AmbiguousCommandIdentifierException::class);
         $this->expectExceptionCode(1310557169);
-        $mockCommand1 = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Cli\Command::class, array(), array(), '', false);
+        $mockCommand1 = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Cli\Command::class);
         $mockCommand1->expects($this->once())->method('getCommandIdentifier')->will($this->returnValue('extensionkey:controller:command'));
-        $mockCommand2 = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Cli\Command::class, array(), array(), '', false);
+        $mockCommand2 = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Cli\Command::class);
         $mockCommand2->expects($this->once())->method('getCommandIdentifier')->will($this->returnValue('otherextensionkey:controller:command'));
         $mockCommands = array($mockCommand1, $mockCommand2);
         $this->commandManager->expects($this->once())->method('getAvailableCommands')->will($this->returnValue($mockCommands));
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/CommandTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/CommandTest.php
index a5d0d83c17eb6ed1344f53c125e75f45f18774e1..436ae09005ac5766d13d3f5e69fa1b441d9f89cd 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/CommandTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/CommandTest.php
@@ -47,9 +47,9 @@ class CommandTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     protected function setUp()
     {
         $this->command = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Mvc\Cli\Command::class, array('getCommandMethodReflection'), array(), '', false);
-        $this->mockMethodReflection = $this->getMock(\TYPO3\CMS\Extbase\Reflection\MethodReflection::class, array(), array(), '', false);
+        $this->mockMethodReflection = $this->createMock(\TYPO3\CMS\Extbase\Reflection\MethodReflection::class);
         $this->command->expects($this->any())->method('getCommandMethodReflection')->will($this->returnValue($this->mockMethodReflection));
-        $this->mockObjectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
+        $this->mockObjectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
         $this->command->_set('objectManager', $this->mockObjectManager);
     }
 
@@ -116,7 +116,7 @@ class CommandTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function hasArgumentsReturnsTrueIfCommandExpectsArguments()
     {
-        $mockParameterReflection = $this->getMock(\TYPO3\CMS\Extbase\Reflection\ParameterReflection::class, array(), array(), '', false);
+        $mockParameterReflection = $this->createMock(\TYPO3\CMS\Extbase\Reflection\ParameterReflection::class);
         $this->mockMethodReflection->expects($this->atLeastOnce())->method('getParameters')->will($this->returnValue(array($mockParameterReflection)));
         $this->assertTrue($this->command->hasArguments());
     }
@@ -135,15 +135,15 @@ class CommandTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function getArgumentDefinitionsReturnsArrayOfArgumentDefinitionIfCommandExpectsArguments()
     {
-        $mockParameterReflection = $this->getMock(\TYPO3\CMS\Extbase\Reflection\ParameterReflection::class, array(), array(), '', false);
-        $mockReflectionService = $this->getMock(\TYPO3\CMS\Extbase\Reflection\ReflectionService::class);
+        $mockParameterReflection = $this->createMock(\TYPO3\CMS\Extbase\Reflection\ParameterReflection::class);
+        $mockReflectionService = $this->createMock(\TYPO3\CMS\Extbase\Reflection\ReflectionService::class);
         $mockMethodParameters = array('argument1' => array('optional' => false), 'argument2' => array('optional' => true));
         $mockReflectionService->expects($this->atLeastOnce())->method('getMethodParameters')->will($this->returnValue($mockMethodParameters));
         $this->command->_set('reflectionService', $mockReflectionService);
         $this->mockMethodReflection->expects($this->atLeastOnce())->method('getParameters')->will($this->returnValue(array($mockParameterReflection)));
         $this->mockMethodReflection->expects($this->atLeastOnce())->method('getTagsValues')->will($this->returnValue(array('param' => array('@param $argument1 argument1 description', '@param $argument2 argument2 description'))));
-        $mockCommandArgumentDefinition1 = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Cli\CommandArgumentDefinition::class, array(), array(), '', false);
-        $mockCommandArgumentDefinition2 = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Cli\CommandArgumentDefinition::class, array(), array(), '', false);
+        $mockCommandArgumentDefinition1 = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Cli\CommandArgumentDefinition::class);
+        $mockCommandArgumentDefinition2 = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Cli\CommandArgumentDefinition::class);
         $this->mockObjectManager->expects($this->at(0))->method('get')->with(\TYPO3\CMS\Extbase\Mvc\Cli\CommandArgumentDefinition::class, 'argument1', true, 'argument1 description')->will($this->returnValue($mockCommandArgumentDefinition1));
         $this->mockObjectManager->expects($this->at(1))->method('get')->with(\TYPO3\CMS\Extbase\Mvc\Cli\CommandArgumentDefinition::class, 'argument2', false, 'argument2 description')->will($this->returnValue($mockCommandArgumentDefinition2));
         $expectedResult = array($mockCommandArgumentDefinition1, $mockCommandArgumentDefinition2);
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/RequestBuilderTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/RequestBuilderTest.php
index 401afb660444b2b4abec4fbb86a9a247cc6f0d6b..85fe9344bb2cf2aa216357ddbbc2536e51088902 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/RequestBuilderTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/RequestBuilderTest.php
@@ -68,15 +68,15 @@ class RequestBuilderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     protected function setUp()
     {
         $this->request = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Mvc\Cli\Request::class, array('dummy'));
-        $this->mockObjectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
+        $this->mockObjectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
         $this->mockObjectManager->expects($this->any())->method('get')->with(\TYPO3\CMS\Extbase\Mvc\Cli\Request::class)->will($this->returnValue($this->request));
-        $this->mockCommand = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Cli\Command::class, array(), array(), '', false);
+        $this->mockCommand = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Cli\Command::class);
         $this->mockCommand->expects($this->any())->method('getControllerClassName')->will($this->returnValue('Tx_SomeExtensionName_Command_DefaultCommandController'));
         $this->mockCommand->expects($this->any())->method('getControllerCommandName')->will($this->returnValue('list'));
-        $this->mockCommandManager = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Cli\CommandManager::class);
+        $this->mockCommandManager = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Cli\CommandManager::class);
         $this->mockCommandManager->expects($this->any())->method('getCommandByIdentifier')->with('some_extension_name:default:list')->will($this->returnValue($this->mockCommand));
-        $this->mockReflectionService = $this->getMock(\TYPO3\CMS\Extbase\Reflection\ReflectionService::class);
-        $this->mockConfigurationManager = $this->getMock(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::class);
+        $this->mockReflectionService = $this->createMock(\TYPO3\CMS\Extbase\Reflection\ReflectionService::class);
+        $this->mockConfigurationManager = $this->createMock(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::class);
         $this->requestBuilder = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Mvc\Cli\RequestBuilder::class, array('dummy'));
         $this->requestBuilder->_set('objectManager', $this->mockObjectManager);
         $this->requestBuilder->_set('reflectionService', $this->mockReflectionService);
@@ -105,7 +105,7 @@ class RequestBuilderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         // The following call is only made to satisfy PHPUnit. For some weird reason PHPUnit complains that the
         // mocked method ("getObjectNameByClassName") does not exist _if the mock object is not used_.
         $this->mockCommandManager->getCommandByIdentifier('some_extension_name:default:list');
-        $mockCommandManager = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Cli\CommandManager::class);
+        $mockCommandManager = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Cli\CommandManager::class);
         $mockCommandManager->expects($this->any())->method('getCommandByIdentifier')->with('test:default:list')->will($this->throwException(new \TYPO3\CMS\Extbase\Mvc\Exception\NoSuchCommandException()));
         $this->requestBuilder->_set('commandManager', $mockCommandManager);
         $request = $this->requestBuilder->build('test:default:list');
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/RequestTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/RequestTest.php
index 0e318f4fdfb196a95c3bb0b53b746517ced4cfb3..2e680df748be0f8ef93c0eeb89955216a7deaff9 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/RequestTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/Cli/RequestTest.php
@@ -42,7 +42,7 @@ class RequestTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     protected function setUp()
     {
         $this->request = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Mvc\Cli\Request::class, array('dummy'));
-        $this->mockObjectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
+        $this->mockObjectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
         $this->request->_set('objectManager', $this->mockObjectManager);
     }
 
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/AbstractControllerTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/AbstractControllerTest.php
index 94a5d8e91f456f1c1bb32c8c3848aa41e08b0a1c..dff0d202814afea991ffc5a0f776feb7f755a93d 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/AbstractControllerTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/AbstractControllerTest.php
@@ -104,17 +104,16 @@ class AbstractControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function addFlashMessageAddsFlashMessageObjectToFlashMessageQueue($expectedMessage, $messageBody, $messageTitle = '', $severity = \TYPO3\CMS\Core\Messaging\FlashMessage::OK, $storeInSession = true)
     {
-        $flashMessageQueue = $this->getMock(
-            \TYPO3\CMS\Core\Messaging\FlashMessageQueue::class,
-            array('enqueue'),
-            array($this->getUniqueId('identifier_'))
-        );
+        $flashMessageQueue = $this->getMockBuilder(\TYPO3\CMS\Core\Messaging\FlashMessageQueue::class)
+            ->setMethods(array('enqueue'))
+            ->setConstructorArgs(array($this->getUniqueId('identifier_')))
+            ->getMock();
+
         $flashMessageQueue->expects($this->once())->method('enqueue')->with($this->equalTo($expectedMessage));
 
-        $controllerContext = $this->getMock(
-            \TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext::class,
-            array('getFlashMessageQueue')
-        );
+        $controllerContext = $this->getMockBuilder(\TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext::class)
+            ->setMethods(array('getFlashMessageQueue'))
+            ->getMock();
         $controllerContext->expects($this->once())->method('getFlashMessageQueue')->will($this->returnValue($flashMessageQueue));
 
         $controller = $this->getMockForAbstractClass(\TYPO3\CMS\Extbase\Mvc\Controller\AbstractController::class,
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ActionControllerTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ActionControllerTest.php
index 8986367899d0e284a522b4ff6fc428330ddbb4b6..91deef23a65391aba50d49688f4e41ebe81c77d6 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ActionControllerTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ActionControllerTest.php
@@ -54,14 +54,14 @@ class ActionControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function processRequestSticksToSpecifiedSequence()
     {
-        $mockRequest = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Web\Request::class, array(), array(), '', false);
+        $mockRequest = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Web\Request::class);
         $mockRequest->expects($this->once())->method('setDispatched')->with(true);
-        $mockUriBuilder = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder::class);
+        $mockUriBuilder = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder::class);
         $mockUriBuilder->expects($this->once())->method('setRequest')->with($mockRequest);
-        $mockObjectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
+        $mockObjectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
         $mockObjectManager->expects($this->once())->method('get')->with(\TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder::class)->will($this->returnValue($mockUriBuilder));
-        $mockResponse = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Web\Response::class, array(), array(), '', false);
-        $configurationService = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Controller\MvcPropertyMappingConfigurationService::class);
+        $mockResponse = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Web\Response::class);
+        $configurationService = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Controller\MvcPropertyMappingConfigurationService::class);
         /** @var \TYPO3\CMS\Extbase\Mvc\Controller\ActionController|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
         $mockController = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Mvc\Controller\ActionController::class, array(
             'initializeFooAction',
@@ -101,16 +101,14 @@ class ActionControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function resolveViewUsesFluidTemplateViewIfTemplateIsAvailable()
     {
-        $mockSession = $this->getMock('Tx_Extbase_Session_SessionInterface');
-        $mockControllerContext = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext::class, array(), array(), '', false);
-        $mockFluidTemplateView = $this->getMock(\TYPO3\CMS\Extbase\Mvc\View\ViewInterface::class);
+        $mockControllerContext = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext::class);
+        $mockFluidTemplateView = $this->createMock(\TYPO3\CMS\Extbase\Mvc\View\ViewInterface::class);
         $mockFluidTemplateView->expects($this->once())->method('setControllerContext')->with($mockControllerContext);
         $mockFluidTemplateView->expects($this->once())->method('canRender')->with($mockControllerContext)->will($this->returnValue(true));
-        $mockObjectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class, array(), array(), '', false);
+        $mockObjectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
         $mockObjectManager->expects($this->at(0))->method('get')->with(\TYPO3\CMS\Fluid\View\TemplateView::class)->will($this->returnValue($mockFluidTemplateView));
         $mockController = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Mvc\Controller\ActionController::class, array('buildControllerContext', 'resolveViewObjectName', 'setViewConfiguration'), array(), '', false);
         $mockController->expects($this->once())->method('resolveViewObjectName')->will($this->returnValue(false));
-        $mockController->_set('session', $mockSession);
         $mockController->_set('objectManager', $mockObjectManager);
         $mockController->_set('controllerContext', $mockControllerContext);
         $this->assertSame($mockFluidTemplateView, $mockController->_call('resolveView'));
@@ -121,13 +119,13 @@ class ActionControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function resolveViewObjectNameUsesViewObjectNamePatternToResolveViewObjectName()
     {
-        $mockRequest = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Request::class, array(), array(), '', false);
+        $mockRequest = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Request::class);
         $mockRequest->expects($this->once())->method('getControllerVendorName')->will($this->returnValue('MyVendor'));
         $mockRequest->expects($this->once())->method('getControllerExtensionName')->will($this->returnValue('MyPackage'));
         $mockRequest->expects($this->once())->method('getControllerName')->will($this->returnValue('MyController'));
         $mockRequest->expects($this->once())->method('getControllerActionName')->will($this->returnValue('MyAction'));
         $mockRequest->expects($this->atLeastOnce())->method('getFormat')->will($this->returnValue('MyFormat'));
-        $mockObjectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class, array(), array(), '', false);
+        $mockObjectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
         $mockController = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Mvc\Controller\ActionController::class, array('dummy'), array(), '', false);
         $mockController->_set('request', $mockRequest);
         $mockController->_set('objectManager', $mockObjectManager);
@@ -142,13 +140,13 @@ class ActionControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         eval('namespace MyVendor\MyPackage\View\MyController; class MyActionMyFormat {}');
 
-        $mockRequest = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Request::class, array(), array(), '', false);
+        $mockRequest = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Request::class);
         $mockRequest->expects($this->once())->method('getControllerExtensionName')->will($this->returnValue('MyPackage'));
         $mockRequest->expects($this->once())->method('getControllerName')->will($this->returnValue('MyController'));
         $mockRequest->expects($this->once())->method('getControllerActionName')->will($this->returnValue('MyAction'));
         $mockRequest->expects($this->once())->method('getControllerVendorName')->will($this->returnValue('MyVendor'));
         $mockRequest->expects($this->atLeastOnce())->method('getFormat')->will($this->returnValue('MyFormat'));
-        $mockObjectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class, array(), array(), '', false);
+        $mockObjectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
         $mockController = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Mvc\Controller\ActionController::class, array('dummy'), array(), '', false);
         $mockController->_set('request', $mockRequest);
         $mockController->_set('objectManager', $mockObjectManager);
@@ -164,7 +162,7 @@ class ActionControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function resolveActionMethodNameReturnsTheCurrentActionMethodNameFromTheRequest()
     {
-        $mockRequest = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Request::class, array(), array(), '', false);
+        $mockRequest = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Request::class);
         $mockRequest->expects($this->once())->method('getControllerActionName')->will($this->returnValue('fooBar'));
         /** @var \TYPO3\CMS\Extbase\Mvc\Controller\ActionController|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
         $mockController = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Mvc\Controller\ActionController::class, array('fooBarAction'), array(), '', false);
@@ -179,7 +177,7 @@ class ActionControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $this->expectException(NoSuchActionException::class);
         $this->expectExceptionCode(1186669086);
-        $mockRequest = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Request::class, array(), array(), '', false);
+        $mockRequest = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Request::class);
         $mockRequest->expects($this->once())->method('getControllerActionName')->will($this->returnValue('fooBar'));
         /** @var \TYPO3\CMS\Extbase\Mvc\Controller\ActionController|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
         $mockController = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Mvc\Controller\ActionController::class, array('otherBarAction'), array(), '', false);
@@ -192,8 +190,10 @@ class ActionControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function initializeActionMethodArgumentsRegistersArgumentsFoundInTheSignatureOfTheCurrentActionMethod()
     {
-        $mockRequest = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Request::class, array(), array(), '', false);
-        $mockArguments = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Controller\Arguments::class, array('addNewArgument', 'removeAll'));
+        $mockRequest = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Request::class);
+        $mockArguments = $this->getMockBuilder(\TYPO3\CMS\Extbase\Mvc\Controller\Arguments::class)
+            ->setMethods(array('addNewArgument', 'removeAll'))
+            ->getMock();
         $mockArguments->expects($this->at(0))->method('addNewArgument')->with('stringArgument', 'string', true);
         $mockArguments->expects($this->at(1))->method('addNewArgument')->with('integerArgument', 'integer', true);
         $mockArguments->expects($this->at(2))->method('addNewArgument')->with('objectArgument', 'F3_Foo_Bar', true);
@@ -224,7 +224,7 @@ class ActionControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                 'type' => 'F3_Foo_Bar'
             )
         );
-        $mockReflectionService = $this->getMock(\TYPO3\CMS\Extbase\Reflection\ReflectionService::class, array(), array(), '', false);
+        $mockReflectionService = $this->createMock(\TYPO3\CMS\Extbase\Reflection\ReflectionService::class);
         $mockReflectionService->expects($this->once())->method('getMethodParameters')->with(get_class($mockController), 'fooAction')->will($this->returnValue($methodParameters));
         $mockController->_set('reflectionService', $mockReflectionService);
         $mockController->_set('request', $mockRequest);
@@ -238,8 +238,8 @@ class ActionControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function initializeActionMethodArgumentsRegistersOptionalArgumentsAsSuch()
     {
-        $mockRequest = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Request::class, array(), array(), '', false);
-        $mockArguments = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Controller\Arguments::class, array(), array(), '', false);
+        $mockRequest = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Request::class);
+        $mockArguments = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Controller\Arguments::class);
         $mockArguments->expects($this->at(0))->method('addNewArgument')->with('arg1', 'string', true);
         $mockArguments->expects($this->at(1))->method('addNewArgument')->with('arg2', 'array', false, array(21));
         $mockArguments->expects($this->at(2))->method('addNewArgument')->with('arg3', 'string', false, 42);
@@ -271,7 +271,7 @@ class ActionControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                 'type' => 'string'
             )
         );
-        $mockReflectionService = $this->getMock(\TYPO3\CMS\Extbase\Reflection\ReflectionService::class, array(), array(), '', false);
+        $mockReflectionService = $this->createMock(\TYPO3\CMS\Extbase\Reflection\ReflectionService::class);
         $mockReflectionService->expects($this->once())->method('getMethodParameters')->with(get_class($mockController), 'fooAction')->will($this->returnValue($methodParameters));
         $mockController->_set('reflectionService', $mockReflectionService);
         $mockController->_set('request', $mockRequest);
@@ -287,8 +287,8 @@ class ActionControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $this->expectException(InvalidArgumentTypeException::class);
         $this->expectExceptionCode(1253175643);
-        $mockRequest = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Request::class, array(), array(), '', false);
-        $mockArguments = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Controller\Arguments::class, array(), array(), '', false);
+        $mockRequest = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Request::class);
+        $mockArguments = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Controller\Arguments::class);
         $mockController = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Mvc\Controller\ActionController::class, array('fooAction'), array(), '', false);
         $methodParameters = array(
             'arg1' => array(
@@ -299,7 +299,7 @@ class ActionControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                 'allowsNull' => false
             )
         );
-        $mockReflectionService = $this->getMock(\TYPO3\CMS\Extbase\Reflection\ReflectionService::class, array(), array(), '', false);
+        $mockReflectionService = $this->createMock(\TYPO3\CMS\Extbase\Reflection\ReflectionService::class);
         $mockReflectionService->expects($this->once())->method('getMethodParameters')->with(get_class($mockController), 'fooAction')->will($this->returnValue($methodParameters));
         $mockController->_set('reflectionService', $mockReflectionService);
         $mockController->_set('request', $mockRequest);
@@ -319,11 +319,13 @@ class ActionControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         /** @var ActionController|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface $mockController */
         $mockController = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Mvc\Controller\ActionController::class, array('dummy'), array(), '', false);
         /** @var ConfigurationManagerInterface|\PHPUnit_Framework_MockObject_MockObject $mockConfigurationManager */
-        $mockConfigurationManager = $this->getMock(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::class);
+        $mockConfigurationManager = $this->createMock(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::class);
         $mockConfigurationManager->expects($this->any())->method('getConfiguration')->will($this->returnValue($configuration));
         $mockController->injectConfigurationManager($mockConfigurationManager);
-        $mockController->_set('request', $this->getMock(\TYPO3\CMS\Extbase\Mvc\Request::class), array('getControllerExtensionKey'));
-        $view = $this->getMock(\TYPO3\CMS\Extbase\Mvc\View\ViewInterface::class, array('setControllerContext', 'assign', 'assignMultiple', 'canRender', 'render', 'initializeView', 'setTemplateRootPaths'));
+        $mockController->_set('request', $this->createMock(\TYPO3\CMS\Extbase\Mvc\Request::class), array('getControllerExtensionKey'));
+        $view = $this->getMockBuilder(\TYPO3\CMS\Extbase\Mvc\View\ViewInterface::class)
+            ->setMethods(array('setControllerContext', 'assign', 'assignMultiple', 'canRender', 'render', 'initializeView', 'setTemplateRootPaths'))
+            ->getMock();
         $view->expects($this->once())->method('setTemplateRootPaths')->with($expected);
         $mockController->_call('setViewConfiguration', $view);
     }
@@ -395,11 +397,13 @@ class ActionControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         /** @var ActionController|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface $mockController */
         $mockController = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Mvc\Controller\ActionController::class, array('dummy'), array(), '', false);
         /** @var ConfigurationManagerInterface|\PHPUnit_Framework_MockObject_MockObject $mockConfigurationManager */
-        $mockConfigurationManager = $this->getMock(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::class);
+        $mockConfigurationManager = $this->createMock(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::class);
         $mockConfigurationManager->expects($this->any())->method('getConfiguration')->will($this->returnValue($configuration));
         $mockController->injectConfigurationManager($mockConfigurationManager);
-        $mockController->_set('request', $this->getMock(\TYPO3\CMS\Extbase\Mvc\Request::class), array('getControllerExtensionKey'));
-        $view = $this->getMock(\TYPO3\CMS\Extbase\Mvc\View\ViewInterface::class, array('setControllerContext', 'assign', 'assignMultiple', 'canRender', 'render', 'initializeView', 'setlayoutRootPaths'));
+        $mockController->_set('request', $this->createMock(\TYPO3\CMS\Extbase\Mvc\Request::class), array('getControllerExtensionKey'));
+        $view = $this->getMockBuilder(\TYPO3\CMS\Extbase\Mvc\View\ViewInterface::class)
+            ->setMethods(array('setControllerContext', 'assign', 'assignMultiple', 'canRender', 'render', 'initializeView', 'setlayoutRootPaths'))
+            ->getMock();
         $view->expects($this->once())->method('setlayoutRootPaths')->with($expected);
         $mockController->_call('setViewConfiguration', $view);
     }
@@ -471,11 +475,13 @@ class ActionControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         /** @var ActionController|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface $mockController */
         $mockController = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Mvc\Controller\ActionController::class, array('dummy'), array(), '', false);
         /** @var ConfigurationManagerInterface|\PHPUnit_Framework_MockObject_MockObject $mockConfigurationManager */
-        $mockConfigurationManager = $this->getMock(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::class);
+        $mockConfigurationManager = $this->createMock(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::class);
         $mockConfigurationManager->expects($this->any())->method('getConfiguration')->will($this->returnValue($configuration));
         $mockController->injectConfigurationManager($mockConfigurationManager);
-        $mockController->_set('request', $this->getMock(\TYPO3\CMS\Extbase\Mvc\Request::class), array('getControllerExtensionKey'));
-        $view = $this->getMock(\TYPO3\CMS\Extbase\Mvc\View\ViewInterface::class, array('setControllerContext', 'assign', 'assignMultiple', 'canRender', 'render', 'initializeView', 'setpartialRootPaths'));
+        $mockController->_set('request', $this->createMock(\TYPO3\CMS\Extbase\Mvc\Request::class), array('getControllerExtensionKey'));
+        $view = $this->getMockBuilder(\TYPO3\CMS\Extbase\Mvc\View\ViewInterface::class)
+            ->setMethods(array('setControllerContext', 'assign', 'assignMultiple', 'canRender', 'render', 'initializeView', 'setpartialRootPaths'))
+            ->getMock();
         $view->expects($this->once())->method('setpartialRootPaths')->with($expected);
         $mockController->_call('setViewConfiguration', $view);
     }
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ArgumentTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ArgumentTest.php
index 93f533fefdc4bac789110e7f625108e3ce94300f..1df75805a36fd0c1e885c5f30a0db2c6eea61f2e 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ArgumentTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ArgumentTest.php
@@ -48,7 +48,7 @@ class ArgumentTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $this->simpleValueArgument = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Mvc\Controller\Argument::class, array('dummy'), array('someName', 'string'));
         $this->objectArgument = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Mvc\Controller\Argument::class, array('dummy'), array('someName', 'DateTime'));
-        $this->mockPropertyMapper = $this->getMock(\TYPO3\CMS\Extbase\Property\PropertyMapper::class);
+        $this->mockPropertyMapper = $this->createMock(\TYPO3\CMS\Extbase\Property\PropertyMapper::class);
         $this->simpleValueArgument->_set('propertyMapper', $this->mockPropertyMapper);
         $this->objectArgument->_set('propertyMapper', $this->mockPropertyMapper);
         $this->mockConfiguration = new \TYPO3\CMS\Extbase\Mvc\Controller\MvcPropertyMappingConfiguration();
@@ -153,7 +153,7 @@ class ArgumentTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function setValidatorShouldProvideFluentInterfaceAndReallySetValidator()
     {
-        $mockValidator = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class);
+        $mockValidator = $this->createMock(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class);
         $returnedArgument = $this->simpleValueArgument->setValidator($mockValidator);
         $this->assertSame($this->simpleValueArgument, $returnedArgument, 'The returned argument is not the original argument.');
         $this->assertSame($mockValidator, $this->simpleValueArgument->getValidator());
@@ -222,7 +222,9 @@ class ArgumentTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function setValueShouldSetValidationErrorsIfValidatorIsSetAndValidationFailed()
     {
         $error = new \TYPO3\CMS\Extbase\Error\Error('Some Error', 1234);
-        $mockValidator = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class, array('validate', 'getOptions'));
+        $mockValidator = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class)
+            ->setMethods(array('validate', 'getOptions'))
+            ->getMock();
         $validationMessages = new \TYPO3\CMS\Extbase\Error\Result();
         $validationMessages->addError($error);
         $mockValidator->expects($this->once())->method('validate')->with('convertedValue')->will($this->returnValue($validationMessages));
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ArgumentsTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ArgumentsTest.php
index a699d8825566887463be489bfa83286262d8e337..681e8e7780c0aa084988db0ba4ff283d78e6363c 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ArgumentsTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ArgumentsTest.php
@@ -46,10 +46,16 @@ class ArgumentsTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function addingAnArgumentReplacesArgumentWithSameName()
     {
         $arguments = new \TYPO3\CMS\Extbase\Mvc\Controller\Arguments();
-        $mockFirstArgument = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Controller\Argument::class, array('getName'), array(), '', false);
+        $mockFirstArgument = $this->getMockBuilder(\TYPO3\CMS\Extbase\Mvc\Controller\Argument::class)
+            ->setMethods(array('getName'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockFirstArgument->expects($this->any())->method('getName')->will($this->returnValue('argumentName1234'));
         $arguments->addArgument($mockFirstArgument);
-        $mockSecondArgument = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Controller\Argument::class, array('getName'), array(), '', false);
+        $mockSecondArgument = $this->getMockBuilder(\TYPO3\CMS\Extbase\Mvc\Controller\Argument::class)
+            ->setMethods(array('getName'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockSecondArgument->expects($this->any())->method('getName')->will($this->returnValue('argumentName1234'));
         $arguments->addArgument($mockSecondArgument);
         $this->assertSame($mockSecondArgument, $arguments->getArgument('argumentName1234'), 'The added and retrieved argument is not the same.');
@@ -60,8 +66,8 @@ class ArgumentsTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function addNewArgumentProvidesFluentInterface()
     {
-        $mockArgument = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Controller\Argument::class, array(), array(), '', false);
-        $mockObjectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
+        $mockArgument = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Controller\Argument::class);
+        $mockObjectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
         $mockObjectManager->expects($this->once())->method('get')->with(\TYPO3\CMS\Extbase\Mvc\Controller\Argument::class)->will($this->returnValue($mockArgument));
         $arguments = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Mvc\Controller\Arguments::class, array('dummy'));
         $arguments->_set('objectManager', $mockObjectManager);
@@ -74,7 +80,10 @@ class ArgumentsTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function addingArgumentThroughArrayAccessWorks()
     {
-        $mockArgument = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Controller\Argument::class, array('getName'), array(), '', false);
+        $mockArgument = $this->getMockBuilder(\TYPO3\CMS\Extbase\Mvc\Controller\Argument::class)
+            ->setMethods(array('getName'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockArgument->expects($this->any())->method('getName')->will($this->returnValue('argumentName1234'));
         $arguments = new \TYPO3\CMS\Extbase\Mvc\Controller\Arguments();
         $arguments[] = $mockArgument;
@@ -87,7 +96,10 @@ class ArgumentsTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function retrievingArgumentThroughArrayAccessWorks()
     {
-        $mockArgument = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Controller\Argument::class, array('getName'), array(), '', false);
+        $mockArgument = $this->getMockBuilder(\TYPO3\CMS\Extbase\Mvc\Controller\Argument::class)
+            ->setMethods(array('getName'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockArgument->expects($this->any())->method('getName')->will($this->returnValue('argumentName1234'));
         $arguments = new \TYPO3\CMS\Extbase\Mvc\Controller\Arguments();
         $arguments[] = $mockArgument;
@@ -112,7 +124,10 @@ class ArgumentsTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function issetReturnsCorrectResult()
     {
-        $mockArgument = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Controller\Argument::class, array('getName'), array(), '', false);
+        $mockArgument = $this->getMockBuilder(\TYPO3\CMS\Extbase\Mvc\Controller\Argument::class)
+            ->setMethods(array('getName'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockArgument->expects($this->any())->method('getName')->will($this->returnValue('argumentName1234'));
         $arguments = new \TYPO3\CMS\Extbase\Mvc\Controller\Arguments();
         $this->assertFalse(isset($arguments['argumentName1234']), 'isset() did not return FALSE.');
@@ -125,11 +140,20 @@ class ArgumentsTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function getArgumentNamesReturnsNamesOfAddedArguments()
     {
-        $mockArgument1 = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Controller\Argument::class, array('getName'), array(), '', false);
+        $mockArgument1 = $this->getMockBuilder(\TYPO3\CMS\Extbase\Mvc\Controller\Argument::class)
+            ->setMethods(array('getName'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockArgument1->expects($this->any())->method('getName')->will($this->returnValue('argumentName1'));
-        $mockArgument2 = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Controller\Argument::class, array('getName'), array(), '', false);
+        $mockArgument2 = $this->getMockBuilder(\TYPO3\CMS\Extbase\Mvc\Controller\Argument::class)
+            ->setMethods(array('getName'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockArgument2->expects($this->any())->method('getName')->will($this->returnValue('argumentName2'));
-        $mockArgument3 = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Controller\Argument::class, array('getName'), array(), '', false);
+        $mockArgument3 = $this->getMockBuilder(\TYPO3\CMS\Extbase\Mvc\Controller\Argument::class)
+            ->setMethods(array('getName'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockArgument3->expects($this->any())->method('getName')->will($this->returnValue('argumentName3'));
         $arguments = new \TYPO3\CMS\Extbase\Mvc\Controller\Arguments();
         $arguments[] = $mockArgument1;
@@ -144,13 +168,22 @@ class ArgumentsTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function getArgumentShortNamesReturnsShortNamesOfAddedArguments()
     {
-        $mockArgument1 = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Controller\Argument::class, array('getName', 'getShortName'), array(), '', false);
+        $mockArgument1 = $this->getMockBuilder(\TYPO3\CMS\Extbase\Mvc\Controller\Argument::class)
+            ->setMethods(array('getName', 'getShortName'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockArgument1->expects($this->any())->method('getName')->will($this->returnValue('argumentName1'));
         $mockArgument1->expects($this->any())->method('getShortName')->will($this->returnValue('a'));
-        $mockArgument2 = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Controller\Argument::class, array('getName', 'getShortName'), array(), '', false);
+        $mockArgument2 = $this->getMockBuilder(\TYPO3\CMS\Extbase\Mvc\Controller\Argument::class)
+            ->setMethods(array('getName', 'getShortName'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockArgument2->expects($this->any())->method('getName')->will($this->returnValue('argumentName2'));
         $mockArgument2->expects($this->any())->method('getShortName')->will($this->returnValue('b'));
-        $mockArgument3 = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Controller\Argument::class, array('getName', 'getShortName'), array(), '', false);
+        $mockArgument3 = $this->getMockBuilder(\TYPO3\CMS\Extbase\Mvc\Controller\Argument::class)
+            ->setMethods(array('getName', 'getShortName'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockArgument3->expects($this->any())->method('getName')->will($this->returnValue('argumentName3'));
         $mockArgument3->expects($this->any())->method('getShortName')->will($this->returnValue('c'));
         $arguments = new \TYPO3\CMS\Extbase\Mvc\Controller\Arguments();
@@ -166,9 +199,12 @@ class ArgumentsTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function addNewArgumentCreatesAndAddsNewArgument()
     {
-        $mockArgument = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Controller\Argument::class, array('getName'), array(), '', false);
+        $mockArgument = $this->getMockBuilder(\TYPO3\CMS\Extbase\Mvc\Controller\Argument::class)
+            ->setMethods(array('getName'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockArgument->expects($this->any())->method('getName')->will($this->returnValue('dummyName'));
-        $mockObjectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
+        $mockObjectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
         $mockObjectManager->expects($this->once())->method('get')->with(\TYPO3\CMS\Extbase\Mvc\Controller\Argument::class)->will($this->returnValue($mockArgument));
         $arguments = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Mvc\Controller\Arguments::class, array('dummy'));
         $arguments->_set('objectManager', $mockObjectManager);
@@ -183,9 +219,12 @@ class ArgumentsTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function addNewArgumentAssumesTextDataTypeByDefault()
     {
-        $mockArgument = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Controller\Argument::class, array('getName'), array(), '', false);
+        $mockArgument = $this->getMockBuilder(\TYPO3\CMS\Extbase\Mvc\Controller\Argument::class)
+            ->setMethods(array('getName'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockArgument->expects($this->any())->method('getName')->will($this->returnValue('dummyName'));
-        $mockObjectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
+        $mockObjectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
         $mockObjectManager->expects($this->once())->method('get')->with(\TYPO3\CMS\Extbase\Mvc\Controller\Argument::class, 'dummyName', 'Text')->will($this->returnValue($mockArgument));
         $arguments = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Mvc\Controller\Arguments::class, array('dummy'));
         $arguments->_set('objectManager', $mockObjectManager);
@@ -197,10 +236,13 @@ class ArgumentsTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function addNewArgumentCanAddArgumentsMarkedAsRequired()
     {
-        $mockArgument = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Controller\Argument::class, array('getName', 'setRequired'), array(), '', false);
+        $mockArgument = $this->getMockBuilder(\TYPO3\CMS\Extbase\Mvc\Controller\Argument::class)
+            ->setMethods(array('getName', 'setRequired'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockArgument->expects($this->once())->method('getName')->will($this->returnValue('dummyName'));
         $mockArgument->expects($this->once())->method('setRequired')->with(true);
-        $mockObjectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
+        $mockObjectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
         $mockObjectManager->expects($this->once())->method('get')->with(\TYPO3\CMS\Extbase\Mvc\Controller\Argument::class, 'dummyName', 'Text')->will($this->returnValue($mockArgument));
         $arguments = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Mvc\Controller\Arguments::class, array('dummy'));
         $arguments->_set('objectManager', $mockObjectManager);
@@ -212,11 +254,14 @@ class ArgumentsTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function addNewArgumentCanAddArgumentsMarkedAsOptionalWithDefaultValues()
     {
-        $mockArgument = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Controller\Argument::class, array('getName', 'setRequired', 'setDefaultValue'), array(), '', false);
+        $mockArgument = $this->getMockBuilder(\TYPO3\CMS\Extbase\Mvc\Controller\Argument::class)
+            ->setMethods(array('getName', 'setRequired', 'setDefaultValue'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockArgument->expects($this->once())->method('getName')->will($this->returnValue('dummyName'));
         $mockArgument->expects($this->once())->method('setRequired')->with(false);
         $mockArgument->expects($this->once())->method('setDefaultValue')->with('someDefaultValue');
-        $mockObjectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
+        $mockObjectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
         $mockObjectManager->expects($this->once())->method('get')->with(\TYPO3\CMS\Extbase\Mvc\Controller\Argument::class, 'dummyName', 'Text')->will($this->returnValue($mockArgument));
         $arguments = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Mvc\Controller\Arguments::class, array('dummy'));
         $arguments->_set('objectManager', $mockObjectManager);
@@ -239,9 +284,15 @@ class ArgumentsTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function removeAllClearsAllArguments()
     {
-        $mockArgument1 = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Controller\Argument::class, array('getName', 'getShortName'), array(), '', false);
+        $mockArgument1 = $this->getMockBuilder(\TYPO3\CMS\Extbase\Mvc\Controller\Argument::class)
+            ->setMethods(array('getName', 'getShortName'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockArgument1->expects($this->any())->method('getName')->will($this->returnValue('argumentName1'));
-        $mockArgument2 = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Controller\Argument::class, array('getName', 'getShortName'), array(), '', false);
+        $mockArgument2 = $this->getMockBuilder(\TYPO3\CMS\Extbase\Mvc\Controller\Argument::class)
+            ->setMethods(array('getName', 'getShortName'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockArgument2->expects($this->any())->method('getName')->will($this->returnValue('argumentName2'));
         $arguments = new \TYPO3\CMS\Extbase\Mvc\Controller\Arguments();
         $arguments[] = $mockArgument1;
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/CommandControllerTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/CommandControllerTest.php
index 4ec01c74cb5d53c1c89321862a46231ecdf51549..70a30aa4965bfca94442c17c7da0f3381d31d353 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/CommandControllerTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/CommandControllerTest.php
@@ -62,7 +62,7 @@ class CommandControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $this->expectException(StopActionException::class);
         // @TODO expectExceptionCode is 0
-        $mockResponse = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Cli\Response::class);
+        $mockResponse = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Cli\Response::class);
         $this->commandController->_set('response', $mockResponse);
         $this->commandController->_call('quit');
     }
@@ -74,7 +74,7 @@ class CommandControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $this->expectException(StopActionException::class);
         // @TODO expectExceptionCode is 0
-        $mockResponse = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Cli\Response::class);
+        $mockResponse = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Cli\Response::class);
         $mockResponse->expects($this->once())->method('setExitCode')->with(123);
         $this->commandController->_set('response', $mockResponse);
         $this->commandController->_call('quit', 123);
@@ -85,7 +85,7 @@ class CommandControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function settingRequestAdminPropertySetsAdminRoleInUserAuthentication()
     {
-        $mockedUserAuthentication = $this->getMock(\TYPO3\CMS\Core\Authentication\AbstractUserAuthentication::class);
+        $mockedUserAuthentication = $this->createMock(\TYPO3\CMS\Core\Authentication\AbstractUserAuthentication::class);
         $mockedUserAuthentication->user['admin'] = 42;
         $this->commandController->expects($this->once())
             ->method('dummyCommand')
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/MvcPropertyMappingConfigurationServiceTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/MvcPropertyMappingConfigurationServiceTest.php
index b52d12cc4ca3e09889c832c20fbc315699a64111..88955d9fa9e7bf5a2be837fa1d485c867981303b 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/MvcPropertyMappingConfigurationServiceTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/MvcPropertyMappingConfigurationServiceTest.php
@@ -125,7 +125,9 @@ class MvcPropertyMappingConfigurationServiceTest extends \TYPO3\CMS\Core\Tests\U
      */
     public function generateTrustedPropertiesTokenGeneratesTheCorrectHashesInNormalOperation($input, $expected)
     {
-        $requestHashService = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Controller\MvcPropertyMappingConfigurationService::class, array('serializeAndHashFormFieldArray'));
+        $requestHashService = $this->getMockBuilder(\TYPO3\CMS\Extbase\Mvc\Controller\MvcPropertyMappingConfigurationService::class)
+            ->setMethods(array('serializeAndHashFormFieldArray'))
+            ->getMock();
         $requestHashService->expects($this->once())->method('serializeAndHashFormFieldArray')->with($expected);
         $requestHashService->generateTrustedPropertiesToken($input);
     }
@@ -140,7 +142,9 @@ class MvcPropertyMappingConfigurationServiceTest extends \TYPO3\CMS\Core\Tests\U
     {
         $this->expectException(InvalidArgumentForHashGenerationException::class);
         $this->expectExceptionCode($expectExceptionCode);
-        $requestHashService = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Controller\MvcPropertyMappingConfigurationService::class, array('serializeAndHashFormFieldArray'));
+        $requestHashService = $this->getMockBuilder(\TYPO3\CMS\Extbase\Mvc\Controller\MvcPropertyMappingConfigurationService::class)
+            ->setMethods(array('serializeAndHashFormFieldArray'))
+            ->getMock();
         $requestHashService->generateTrustedPropertiesToken($input);
     }
 
@@ -157,10 +161,14 @@ class MvcPropertyMappingConfigurationServiceTest extends \TYPO3\CMS\Core\Tests\U
         );
         $mockHash = '12345';
 
-        $hashService = $this->getMock($this->buildAccessibleProxy(\TYPO3\CMS\Extbase\Mvc\Controller\MvcPropertyMappingConfigurationService::class), array('appendHmac'));
+        $hashService = $this->getMockBuilder($this->buildAccessibleProxy(\TYPO3\CMS\Extbase\Mvc\Controller\MvcPropertyMappingConfigurationService::class))
+            ->setMethods(array('appendHmac'))
+            ->getMock();
         $hashService->expects($this->once())->method('appendHmac')->with(serialize($formFieldArray))->will($this->returnValue(serialize($formFieldArray) . $mockHash));
 
-        $requestHashService = $this->getMock($this->buildAccessibleProxy(\TYPO3\CMS\Extbase\Mvc\Controller\MvcPropertyMappingConfigurationService::class), array('dummy'));
+        $requestHashService = $this->getMockBuilder($this->buildAccessibleProxy(\TYPO3\CMS\Extbase\Mvc\Controller\MvcPropertyMappingConfigurationService::class))
+            ->setMethods(array('dummy'))
+            ->getMock();
         $requestHashService->_set('hashService', $hashService);
 
         $expected = serialize($formFieldArray) . $mockHash;
@@ -296,13 +304,15 @@ class MvcPropertyMappingConfigurationServiceTest extends \TYPO3\CMS\Core\Tests\U
         $request = $this->getMockBuilder(\TYPO3\CMS\Extbase\Mvc\Request::class)->setMethods(array('getInternalArgument'))->disableOriginalConstructor()->getMock();
         $request->expects($this->any())->method('getInternalArgument')->with('__trustedProperties')->will($this->returnValue('fooTrustedProperties'));
 
-        $mockHashService = $this->getMock(\TYPO3\CMS\Extbase\Security\Cryptography\HashService::class, array('validateAndStripHmac'));
+        $mockHashService = $this->getMockBuilder(\TYPO3\CMS\Extbase\Security\Cryptography\HashService::class)
+            ->setMethods(array('validateAndStripHmac'))
+            ->getMock();
         $mockHashService->expects($this->once())->method('validateAndStripHmac')->with('fooTrustedProperties')->will($this->returnValue(serialize($trustedProperties)));
 
         $requestHashService = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Mvc\Controller\MvcPropertyMappingConfigurationService::class, array('dummy'));
         $requestHashService->_set('hashService', $mockHashService);
 
-        $mockObjectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
+        $mockObjectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
         $mockArgument = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Mvc\Controller\Argument::class, array('getName'), array(), '', false);
 
         $propertyMappingConfiguration = new \TYPO3\CMS\Extbase\Mvc\Controller\MvcPropertyMappingConfiguration();
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/RequestTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/RequestTest.php
index 94c6a99352b8fc6325a65826dc78864e16c36af6..11598fe28862476e4f4e91354710ecb0c33fde2c 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/RequestTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/RequestTest.php
@@ -83,7 +83,9 @@ class RequestTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function setArgumentsCallsSetArgumentForEveryArrayEntry()
     {
-        $request = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Request::class, array('setArgument'));
+        $request = $this->getMockBuilder(\TYPO3\CMS\Extbase\Mvc\Request::class)
+            ->setMethods(array('setArgument'))
+            ->getMock();
         $request->expects($this->at(0))->method('setArgument')->with('key1', 'value1');
         $request->expects($this->at(1))->method('setArgument')->with('key2', 'value2');
         $request->setArguments(array('key1' => 'value1', 'key2' => 'value2'));
@@ -94,7 +96,9 @@ class RequestTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function setArgumentShouldSetControllerExtensionNameIfPackageKeyIsGiven()
     {
-        $request = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Request::class, array('setControllerExtensionName'));
+        $request = $this->getMockBuilder(\TYPO3\CMS\Extbase\Mvc\Request::class)
+            ->setMethods(array('setControllerExtensionName'))
+            ->getMock();
         $request->expects($this->any())->method('setControllerExtensionName')->with('MyExtension');
         $request->setArgument('@extension', 'MyExtension');
         $this->assertFalse($request->hasArgument('@extension'));
@@ -105,7 +109,9 @@ class RequestTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function setArgumentShouldSetControllerSubpackageKeyIfSubpackageKeyIsGiven()
     {
-        $request = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Request::class, array('setControllerSubpackageKey'));
+        $request = $this->getMockBuilder(\TYPO3\CMS\Extbase\Mvc\Request::class)
+            ->setMethods(array('setControllerSubpackageKey'))
+            ->getMock();
         $request->expects($this->any())->method('setControllerSubpackageKey')->with('MySubPackage');
         $request->setArgument('@subpackage', 'MySubPackage');
         $this->assertFalse($request->hasArgument('@subpackage'));
@@ -116,7 +122,9 @@ class RequestTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function setArgumentShouldSetControllerNameIfControllerIsGiven()
     {
-        $request = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Request::class, array('setControllerName'));
+        $request = $this->getMockBuilder(\TYPO3\CMS\Extbase\Mvc\Request::class)
+            ->setMethods(array('setControllerName'))
+            ->getMock();
         $request->expects($this->any())->method('setControllerName')->with('MyController');
         $request->setArgument('@controller', 'MyController');
         $this->assertFalse($request->hasArgument('@controller'));
@@ -127,7 +135,9 @@ class RequestTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function setArgumentShouldSetControllerActionNameIfActionIsGiven()
     {
-        $request = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Request::class, array('setControllerActionName'));
+        $request = $this->getMockBuilder(\TYPO3\CMS\Extbase\Mvc\Request::class)
+            ->setMethods(array('setControllerActionName'))
+            ->getMock();
         $request->expects($this->any())->method('setControllerActionName')->with('foo');
         $request->setArgument('@action', 'foo');
         $this->assertFalse($request->hasArgument('@action'));
@@ -138,7 +148,9 @@ class RequestTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function setArgumentShouldSetFormatIfFormatIsGiven()
     {
-        $request = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Request::class, array('setFormat'));
+        $request = $this->getMockBuilder(\TYPO3\CMS\Extbase\Mvc\Request::class)
+            ->setMethods(array('setFormat'))
+            ->getMock();
         $request->expects($this->any())->method('setFormat')->with('txt');
         $request->setArgument('@format', 'txt');
         $this->assertFalse($request->hasArgument('@format'));
@@ -149,7 +161,9 @@ class RequestTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function setArgumentShouldSetVendorIfVendorIsGiven()
     {
-        $request = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Request::class, array('setFormat', 'setVendor'));
+        $request = $this->getMockBuilder(\TYPO3\CMS\Extbase\Mvc\Request::class)
+            ->setMethods(array('setFormat', 'setVendor'))
+            ->getMock();
         $request->expects($this->any())->method('setVendor')->with('VENDOR');
         $request->setArgument('@vendor', 'VENDOR');
         $this->assertFalse($request->hasArgument('@vendor'));
@@ -226,7 +240,10 @@ class RequestTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function theActionNameCanBeSetAndRetrieved()
     {
-        $request = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Request::class, array('getControllerObjectName'), array(), '', false);
+        $request = $this->getMockBuilder(\TYPO3\CMS\Extbase\Mvc\Request::class)
+            ->setMethods(array('getControllerObjectName'))
+            ->disableOriginalConstructor()
+            ->getMock(); 
         $request->expects($this->once())->method('getControllerObjectName')->will($this->returnValue(''));
         $request->setControllerActionName('theAction');
         $this->assertEquals('theAction', $request->getControllerActionName());
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/View/JsonViewTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/View/JsonViewTest.php
index 91d324fcab8fcdab086fb0b822289daac02dbad0..63b874d6ad7fe2d3b03ccc920b4c46c688ec1771 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/View/JsonViewTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/View/JsonViewTest.php
@@ -43,9 +43,11 @@ class JsonViewTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     protected function setUp()
     {
-        $this->view = $this->getMock(\TYPO3\CMS\Extbase\Mvc\View\JsonView::class, array('loadConfigurationFromYamlFile'));
-        $this->controllerContext = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext::class, array(), array(), '', false);
-        $this->response = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Web\Response::class, array());
+        $this->view = $this->getMockBuilder(\TYPO3\CMS\Extbase\Mvc\View\JsonView::class)
+            ->setMethods(array('loadConfigurationFromYamlFile'))
+            ->getMock();
+        $this->controllerContext = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext::class);
+        $this->response = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Web\Response::class);
         $this->controllerContext->expects($this->any())->method('getResponse')->will($this->returnValue($this->response));
         $this->view->setControllerContext($this->controllerContext);
     }
@@ -106,7 +108,9 @@ class JsonViewTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $output[] = array($object, $configuration, $expected, 'array of objects should be serialized');
 
         $properties = array('foo' => 'bar', 'prohibited' => 'xxx');
-        $nestedObject = $this->getMock($this->getUniqueId('Test'), array('getName', 'getPath', 'getProperties', 'getOther'));
+        $nestedObject = $this->getMockBuilder($this->getUniqueId('Test'))
+            ->setMethods(array('getName', 'getPath', 'getProperties', 'getOther'))
+            ->getMock();
         $nestedObject->expects($this->any())->method('getName')->will($this->returnValue('name'));
         $nestedObject->expects($this->any())->method('getPath')->will($this->returnValue('path'));
         $nestedObject->expects($this->any())->method('getProperties')->will($this->returnValue($properties));
@@ -196,7 +200,9 @@ class JsonViewTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function testTransformValueWithObjectIdentifierExposure($object, $configuration, $expected, $dummyIdentifier, $description)
     {
-        $persistenceManagerMock = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager::class, array('getIdentifierByObject'));
+        $persistenceManagerMock = $this->getMockBuilder(\TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager::class)
+            ->setMethods(array('getIdentifierByObject'))
+            ->getMock();
         $jsonView = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Mvc\View\JsonView::class, array('dummy'), array(), '', false);
         $jsonView->_set('persistenceManager', $persistenceManagerMock);
 
@@ -256,7 +262,9 @@ class JsonViewTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                 )
             )
         );
-        $reflectionService = $this->getMock(\TYPO3\CMS\Extbase\Reflection\ReflectionService::class, [ 'getClassNameByObject' ]);
+        $reflectionService = $this->getMockBuilder(\TYPO3\CMS\Extbase\Reflection\ReflectionService::class)
+            ->setMethods([ 'getClassNameByObject' ])
+            ->getMock();
         $reflectionService->expects($this->any())->method('getClassNameByObject')->will($this->returnCallback(function ($object) {
             return get_class($object);
         }));
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/Web/RequestBuilderTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/Web/RequestBuilderTest.php
index addb26ef372b4c5e5be7bbc398d3c48a1f0b1acd..ceb76b2a9ccc3e3bb209ebcf573438ba03f2344c 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/Web/RequestBuilderTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/Web/RequestBuilderTest.php
@@ -79,11 +79,13 @@ class RequestBuilderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                 )
             )
         );
-        $this->mockConfigurationManager = $this->getMock(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::class);
-        $this->mockRequest = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Web\Request::class);
-        $this->mockObjectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
-        $this->mockExtensionService = $this->getMock(\TYPO3\CMS\Extbase\Service\ExtensionService::class);
-        $this->mockEnvironmentService = $this->getMock(\TYPO3\CMS\Extbase\Service\EnvironmentService::class, array('getServerRequestMethod'));
+        $this->mockConfigurationManager = $this->createMock(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::class);
+        $this->mockRequest = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Web\Request::class);
+        $this->mockObjectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
+        $this->mockExtensionService = $this->createMock(\TYPO3\CMS\Extbase\Service\ExtensionService::class);
+        $this->mockEnvironmentService = $this->getMockBuilder(\TYPO3\CMS\Extbase\Service\EnvironmentService::class)
+            ->setMethods(array('getServerRequestMethod'))
+            ->getMock();
     }
 
     /**
@@ -181,7 +183,9 @@ class RequestBuilderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $this->injectDependencies();
         $expectedMethod = 'SomeRequestMethod';
-        $mockEnvironmentService = $this->getMock(\TYPO3\CMS\Extbase\Service\EnvironmentService::class, array('getServerRequestMethod'));
+        $mockEnvironmentService = $this->getMockBuilder(\TYPO3\CMS\Extbase\Service\EnvironmentService::class)
+            ->setMethods(array('getServerRequestMethod'))
+            ->getMock();
         $mockEnvironmentService->expects($this->once())->method('getServerRequestMethod')->will($this->returnValue($expectedMethod));
         $this->requestBuilder->_set('environmentService', $mockEnvironmentService);
         $this->mockRequest->expects($this->once())->method('setMethod')->with($expectedMethod);
@@ -196,7 +200,7 @@ class RequestBuilderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->injectDependencies();
         $expectedVendor = 'Vendor';
         $this->configuration['vendorName'] = $expectedVendor;
-        $mockConfigurationManager = $this->getMock(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::class);
+        $mockConfigurationManager = $this->createMock(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::class);
         $mockConfigurationManager->expects($this->any())->method('getConfiguration')->will($this->returnValue($this->configuration));
         $this->requestBuilder->_set('configurationManager', $mockConfigurationManager);
         $this->requestBuilder->_set('extensionService', $this->mockExtensionService);
@@ -213,7 +217,7 @@ class RequestBuilderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $expectedVendor = 'Vendor';
         $this->configuration['vendorName'] = $expectedVendor;
 
-        $mockConfigurationManager = $this->getMock(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::class);
+        $mockConfigurationManager = $this->createMock(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::class);
         $mockConfigurationManager->expects($this->any())->method('getConfiguration')->will($this->returnValue($this->configuration));
         $this->requestBuilder->_set('configurationManager', $mockConfigurationManager);
         $this->mockRequest->expects($this->once())->method('setControllerVendorName')->with($expectedVendor);
@@ -221,7 +225,7 @@ class RequestBuilderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->requestBuilder->build();
 
         unset($this->configuration['vendorName']);
-        $mockConfigurationManager = $this->getMock(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::class);
+        $mockConfigurationManager = $this->createMock(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::class);
         $mockConfigurationManager->expects($this->any())->method('getConfiguration')->will($this->returnValue($this->configuration));
         $this->requestBuilder->_set('configurationManager', $mockConfigurationManager);
 
@@ -237,7 +241,7 @@ class RequestBuilderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->expectException(Exception::class);
         $this->expectExceptionCode(1289843275);
         unset($this->configuration['extensionName']);
-        $mockConfigurationManager = $this->getMock(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::class);
+        $mockConfigurationManager = $this->createMock(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::class);
         $mockConfigurationManager->expects($this->any())->method('getConfiguration')->will($this->returnValue($this->configuration));
         $this->requestBuilder->_set('configurationManager', $mockConfigurationManager);
         $this->requestBuilder->build();
@@ -251,7 +255,7 @@ class RequestBuilderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->expectException(Exception::class);
         $this->expectExceptionCode(1289843277);
         unset($this->configuration['pluginName']);
-        $mockConfigurationManager = $this->getMock(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::class);
+        $mockConfigurationManager = $this->createMock(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::class);
         $mockConfigurationManager->expects($this->any())->method('getConfiguration')->will($this->returnValue($this->configuration));
         $this->requestBuilder->_set('configurationManager', $mockConfigurationManager);
         $this->requestBuilder->_set('extensionService', $this->mockExtensionService);
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/Web/Routing/UriBuilderTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/Web/Routing/UriBuilderTest.php
index 87dd07fc2be3218aa4898af2360aeab23c7ba12c..0340d209c8ebcb6e7ce5883e81ef60cd2917088d 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/Web/Routing/UriBuilderTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/Web/Routing/UriBuilderTest.php
@@ -66,19 +66,19 @@ class UriBuilderTest extends UnitTestCase
      */
     protected function setUp()
     {
-        $GLOBALS['TSFE'] = $this->getMock(TypoScriptFrontendController::class, array(), array(), '', false);
-        $this->mockContentObject = $this->getMock(ContentObjectRenderer::class);
-        $this->mockRequest = $this->getMock(Request::class);
-        $this->mockExtensionService = $this->getMock(ExtensionService::class);
-        $this->mockConfigurationManager = $this->getMock(ConfigurationManagerInterface::class);
+        $GLOBALS['TSFE'] = $this->createMock(TypoScriptFrontendController::class);
+        $this->mockContentObject = $this->createMock(ContentObjectRenderer::class);
+        $this->mockRequest = $this->createMock(Request::class);
+        $this->mockExtensionService = $this->createMock(ExtensionService::class);
+        $this->mockConfigurationManager = $this->createMock(ConfigurationManagerInterface::class);
         $this->uriBuilder = $this->getAccessibleMock(UriBuilder::class, array('build'));
         $this->uriBuilder->setRequest($this->mockRequest);
         $this->uriBuilder->_set('contentObject', $this->mockContentObject);
         $this->uriBuilder->_set('configurationManager', $this->mockConfigurationManager);
         $this->uriBuilder->_set('extensionService', $this->mockExtensionService);
-        $this->uriBuilder->_set('environmentService', $this->getMock(EnvironmentService::class));
+        $this->uriBuilder->_set('environmentService', $this->createMock(EnvironmentService::class));
         // Mocking backend user is required for backend URI generation as BackendUtility::getModuleUrl() is called
-        $backendUserMock = $this->getMock(BackendUserAuthentication::class);
+        $backendUserMock = $this->createMock(BackendUserAuthentication::class);
         $backendUserMock->expects($this->any())->method('check')->will($this->returnValue(true));
         $GLOBALS['BE_USER'] = $backendUserMock;
     }
@@ -661,7 +661,7 @@ class UriBuilderTest extends UnitTestCase
         $this->uriBuilder->setFormat('txt');
         $this->mockRequest->expects($this->once())->method('getControllerExtensionName')->will($this->returnValue('SomeExtensionNameFromRequest'));
 
-        $mockConfigurationManager = $this->getMock(ConfigurationManager::class);
+        $mockConfigurationManager = $this->createMock(ConfigurationManager::class);
         $mockConfigurationManager->expects($this->any())->method('getConfiguration')
             ->will($this->returnValue(array('view' => array('formatToPageTypeMapping' => array('txt' => 2)))));
         $this->uriBuilder->_set('configurationManager', $mockConfigurationManager);
@@ -683,7 +683,7 @@ class UriBuilderTest extends UnitTestCase
         $this->uriBuilder->setTargetPageUid(123);
         $this->uriBuilder->setFormat('txt');
 
-        $mockConfigurationManager = $this->getMock(ConfigurationManager::class);
+        $mockConfigurationManager = $this->createMock(ConfigurationManager::class);
         $mockConfigurationManager->expects($this->any())->method('getConfiguration')->will($this->returnValue(array()));
         $this->uriBuilder->_set('configurationManager', $mockConfigurationManager);
 
@@ -705,7 +705,7 @@ class UriBuilderTest extends UnitTestCase
         $this->uriBuilder->setTargetPageUid(123);
         $this->uriBuilder->setFormat('txt');
 
-        $mockConfigurationManager = $this->getMock(ConfigurationManager::class);
+        $mockConfigurationManager = $this->createMock(ConfigurationManager::class);
         $mockConfigurationManager->expects($this->any())->method('getConfiguration')
             ->will($this->returnValue(array(array('view' => array('formatToPageTypeMapping' => array('pdf' => 2))))));
         $this->uriBuilder->_set('configurationManager', $mockConfigurationManager);
diff --git a/typo3/sysext/extbase/Tests/Unit/Object/Container/ClassInfoFactoryTest.php b/typo3/sysext/extbase/Tests/Unit/Object/Container/ClassInfoFactoryTest.php
index ddda0e3bfb8a85f49249cbf595128f8fc479f342..53fe5740dedb5cec3573b46f5a0b27f8cdd165b8 100644
--- a/typo3/sysext/extbase/Tests/Unit/Object/Container/ClassInfoFactoryTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Object/Container/ClassInfoFactoryTest.php
@@ -67,7 +67,9 @@ class ClassInfoFactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function buildClassInfoReturnsCustomClassInfoForDateTime()
     {
         /** @var \PHPUnit_Framework_MockObject_MockObject | \TYPO3\CMS\Extbase\Object\Container\ClassInfoFactory $classInfoFactory */
-        $classInfoFactory = $this->getMock(\TYPO3\CMS\Extbase\Object\Container\ClassInfoFactory::class, array('getConstructorArguments'));
+        $classInfoFactory = $this->getMockBuilder(\TYPO3\CMS\Extbase\Object\Container\ClassInfoFactory::class)
+            ->setMethods(array('getConstructorArguments'))
+            ->getMock();
         $classInfoFactory->expects($this->never())->method('getConstructorArguments');
 
         $classInfo = $classInfoFactory->buildClassInfoFromClassName('DateTime');
diff --git a/typo3/sysext/extbase/Tests/Unit/Object/Container/ContainerTest.php b/typo3/sysext/extbase/Tests/Unit/Object/Container/ContainerTest.php
index 16f443204b7afe7af2a162daded1e97115e74f9b..91fd2c72e5ff536bb3f644a5958addec83e3513e 100644
--- a/typo3/sysext/extbase/Tests/Unit/Object/Container/ContainerTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Object/Container/ContainerTest.php
@@ -34,10 +34,14 @@ class ContainerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     protected function setUp()
     {
         // The mocked cache will always indicate that he has nothing in the cache to force that we get the real class info
-        $mockedCache = $this->getMock(\TYPO3\CMS\Extbase\Object\Container\ClassInfoCache::class, array('get', 'set', 'has'));
+        $mockedCache = $this->getMockBuilder(\TYPO3\CMS\Extbase\Object\Container\ClassInfoCache::class)
+            ->setMethods(array('get', 'set', 'has'))
+            ->getMock();
         $mockedCache->expects($this->any())->method('get')->will($this->returnValue(false));
         $mockedCache->expects($this->never())->method('has');
-        $this->container = $this->getMock(\TYPO3\CMS\Extbase\Object\Container\Container::class, array('log', 'getClassInfoCache'));
+        $this->container = $this->getMockBuilder(\TYPO3\CMS\Extbase\Object\Container\Container::class)
+            ->setMethods(array('log', 'getClassInfoCache'))
+            ->getMock();
         $this->container->expects($this->any())->method('getClassInfoCache')->will($this->returnValue($mockedCache));
     }
 
@@ -125,7 +129,7 @@ class ContainerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function getInstancePassesGivenParameterToTheNewObject()
     {
-        $mockObject = $this->getMock('t3lib_object_tests_c');
+        $mockObject = $this->createMock('t3lib_object_tests_c');
         $object = $this->container->getInstance('t3lib_object_tests_a', array($mockObject));
         $this->assertInstanceOf('t3lib_object_tests_a', $object);
         $this->assertSame($mockObject, $object->c);
@@ -188,8 +192,12 @@ class ContainerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $className = \TYPO3\CMS\Extbase\Tests\Unit\Object\Container\Fixtures\NamespacedClass::class;
         $classNameHash = md5($className);
-        $mockedCache = $this->getMock(\TYPO3\CMS\Extbase\Object\Container\ClassInfoCache::class, array('has', 'set', 'get'));
-        $container = $this->getMock(\TYPO3\CMS\Extbase\Object\Container\Container::class, array('log', 'getClassInfoCache'));
+        $mockedCache = $this->getMockBuilder(\TYPO3\CMS\Extbase\Object\Container\ClassInfoCache::class)
+            ->setMethods(array('has', 'set', 'get'))
+            ->getMock();
+        $container = $this->getMockBuilder(\TYPO3\CMS\Extbase\Object\Container\Container::class)
+            ->setMethods(array('log', 'getClassInfoCache'))
+            ->getMock();
         $container->expects($this->any())->method('getClassInfoCache')->will($this->returnValue($mockedCache));
         $mockedCache->expects($this->never())->method('has');
         $mockedCache->expects($this->once())->method('get')->with($classNameHash)->will($this->returnValue(false));
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/BackendTest.php b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/BackendTest.php
index 4461c8945377a5d3f6976413227c3462da1ff9a5..21715cad743b9955313d76cbfeffac1ad28820b4 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/BackendTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/BackendTest.php
@@ -27,15 +27,15 @@ class BackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         /* \TYPO3\CMS\Extbase\Persistence\Generic\Backend|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
         $fixture = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Persistence\Generic\Backend::class, array('dummy'), array(), '', false);
         /* \TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapper|\PHPUnit_Framework_MockObject_MockObject */
-        $dataMapper = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapper::class);
+        $dataMapper = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapper::class);
         /* \TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMap|\PHPUnit_Framework_MockObject_MockObject */
-        $dataMap = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMap::class, array(), array(), '', false);
+        $dataMap = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMap::class);
         /* \TYPO3\CMS\Extbase\Persistence\Generic\Mapper\ColumnMap|\PHPUnit_Framework_MockObject_MockObject */
-        $columnMap = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\ColumnMap::class, array(), array(), '', false);
+        $columnMap = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\ColumnMap::class);
         /* \TYPO3\CMS\Extbase\Persistence\Generic\Storage\BackendInterface|\PHPUnit_Framework_MockObject_MockObject */
-        $storageBackend = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Storage\BackendInterface::class);
+        $storageBackend = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\Storage\BackendInterface::class);
         /* \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-        $domainObject = $this->getMock(\TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface::class);
+        $domainObject = $this->createMock(\TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface::class);
 
         $mmMatchFields = array(
             'identifier' => 'myTable:myField',
@@ -78,8 +78,11 @@ class BackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function getIdentifierByObjectReturnsIdentifierForNonlazyObject()
     {
         $fakeUuid = 'fakeUuid';
-        $configurationManager = $this->getMock(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::class);
-        $session = $this->getMock('stdClass', array('getIdentifierByObject'), array(), '', false);
+        $configurationManager = $this->createMock(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::class);
+        $session = $this->getMockBuilder('stdClass')
+            ->setMethods(array('getIdentifierByObject'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $object = new \stdClass();
 
         $session->expects($this->once())->method('getIdentifierByObject')->with($object)->will($this->returnValue($fakeUuid));
@@ -97,10 +100,17 @@ class BackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function getIdentifierByObjectReturnsIdentifierForLazyObject()
     {
         $fakeUuid = 'fakeUuid';
-        $configurationManager = $this->getMock(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::class);
+        $configurationManager = $this->createMock(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::class);
         $parentObject = new \stdClass();
-        $proxy = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\LazyLoadingProxy::class, array('_loadRealInstance'), array($parentObject, 'y', 'z'), '', false);
-        $session = $this->getMock('stdClass', array('getIdentifierByObject'), array(), '', false);
+        $proxy = $this->getMockBuilder(\TYPO3\CMS\Extbase\Persistence\Generic\LazyLoadingProxy::class)
+            ->setMethods(array('_loadRealInstance'))
+            ->setConstructorArgs(array($parentObject, 'y', 'z'))
+            ->disableProxyingToOriginalMethods()
+            ->getMock();
+        $session = $this->getMockBuilder('stdClass')
+            ->setMethods(array('getIdentifierByObject'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $object = new \stdClass();
 
         $proxy->expects($this->once())->method('_loadRealInstance')->will($this->returnValue($object));
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/DataMapFactoryTest.php b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/DataMapFactoryTest.php
index 1f5081324b5d2c762de468701182e2acfc88716c..f69ae1ca1db5c86b3492092f6fd5eae095437efb 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/DataMapFactoryTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/DataMapFactoryTest.php
@@ -42,7 +42,7 @@ class DataMapFactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function setRelationsDetectsOneToOneRelation($className)
     {
-        $mockColumnMap = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\ColumnMap::class, array(), array(), '', false);
+        $mockColumnMap = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\ColumnMap::class);
         $columnConfiguration = array(
             'type' => 'select',
             'foreign_table' => 'tx_myextension_bar',
@@ -64,7 +64,7 @@ class DataMapFactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function settingOneToOneRelationSetsRelationTableMatchFields()
     {
-        $mockColumnMap = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\ColumnMap::class, array(), array(), '', false);
+        $mockColumnMap = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\ColumnMap::class);
         $matchFields = array(
                 'fieldname' => 'foo_model'
             );
@@ -87,7 +87,7 @@ class DataMapFactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function settingOneToManyRelationSetsRelationTableMatchFields()
     {
-        $mockColumnMap = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\ColumnMap::class, array(), array(), '', false);
+        $mockColumnMap = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\ColumnMap::class);
         $matchFields = array(
                 'fieldname' => 'foo_model'
             );
@@ -110,7 +110,7 @@ class DataMapFactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function setRelationsDetectsOneToOneRelationWithIntermediateTable()
     {
-        $mockColumnMap = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\ColumnMap::class, array(), array(), '', false);
+        $mockColumnMap = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\ColumnMap::class);
         $columnConfiguration = array(
             'type' => 'select',
             'foreign_table' => 'tx_myextension_bar',
@@ -132,7 +132,7 @@ class DataMapFactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function setRelationsDetectsOneToManyRelation()
     {
-        $mockColumnMap = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\ColumnMap::class, array(), array(), '', false);
+        $mockColumnMap = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\ColumnMap::class);
         $columnConfiguration = array(
             'type' => 'select',
             'foreign_table' => 'tx_myextension_bar',
@@ -155,7 +155,7 @@ class DataMapFactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function setRelationsDetectsManyToManyRelationOfTypeSelect()
     {
-        $mockColumnMap = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\ColumnMap::class, array(), array(), '', false);
+        $mockColumnMap = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\ColumnMap::class);
         $columnConfiguration = array(
             'type' => 'select',
             'foreign_table' => 'tx_myextension_bar',
@@ -177,7 +177,7 @@ class DataMapFactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function setRelationsDetectsManyToManyRelationOfTypeInlineWithIntermediateTable()
     {
-        $mockColumnMap = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\ColumnMap::class, array(), array(), '', false);
+        $mockColumnMap = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\ColumnMap::class);
         $columnConfiguration = array(
             'type' => 'inline',
             'foreign_table' => 'tx_myextension_righttable',
@@ -208,7 +208,7 @@ class DataMapFactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                 'MM_table_where' => 'WHERE 2=2'
             )
         );
-        $mockColumnMap = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\ColumnMap::class, array(), array(), '', false);
+        $mockColumnMap = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\ColumnMap::class);
         $mockColumnMap->expects($this->once())->method('setTypeOfRelation')->with($this->equalTo(ColumnMap::RELATION_HAS_AND_BELONGS_TO_MANY));
         $mockColumnMap->expects($this->once())->method('setRelationTableName')->with($this->equalTo('tx_myextension_mm'));
         $mockColumnMap->expects($this->once())->method('setChildTableName')->with($this->equalTo('tx_myextension_righttable'));
@@ -236,7 +236,7 @@ class DataMapFactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             )
         );
         $leftColumnsDefinition['rights']['MM_opposite_field'] = 'opposite_field';
-        $mockColumnMap = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\ColumnMap::class, array(), array(), '', false);
+        $mockColumnMap = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\ColumnMap::class);
         $mockColumnMap->expects($this->once())->method('setTypeOfRelation')->with($this->equalTo(ColumnMap::RELATION_HAS_AND_BELONGS_TO_MANY));
         $mockColumnMap->expects($this->once())->method('setRelationTableName')->with($this->equalTo('tx_myextension_mm'));
         $mockColumnMap->expects($this->once())->method('setChildTableName')->with($this->equalTo('tx_myextension_lefttable'));
@@ -263,7 +263,7 @@ class DataMapFactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                 'foreign_sortby' => 'sorting'
             )
         );
-        $mockColumnMap = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\ColumnMap::class, array(), array(), '', false);
+        $mockColumnMap = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\ColumnMap::class);
         $mockColumnMap->expects($this->once())->method('setTypeOfRelation')->with($this->equalTo(ColumnMap::RELATION_HAS_AND_BELONGS_TO_MANY));
         $mockColumnMap->expects($this->once())->method('setRelationTableName')->with($this->equalTo('tx_myextension_mm'));
         $mockColumnMap->expects($this->once())->method('setChildTableName')->with($this->equalTo('tx_myextension_righttable'));
@@ -291,7 +291,7 @@ class DataMapFactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                 'MM' => 'tx_myextension_mm'
             )
         );
-        $mockColumnMap = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\ColumnMap::class, array(), array(), '', false);
+        $mockColumnMap = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\ColumnMap::class);
         $mockColumnMap->expects($this->once())->method('setRelationTableName')->with($this->equalTo('tx_myextension_mm'));
         $mockColumnMap->expects($this->once())->method('getRelationTableName')->will($this->returnValue('tx_myextension_mm'));
         $mockColumnMap->expects($this->never())->method('setrelationTablePageIdColumnName');
@@ -313,7 +313,7 @@ class DataMapFactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                 'MM' => 'tx_myextension_mm'
             )
         );
-        $mockColumnMap = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\ColumnMap::class, array(), array(), '', false);
+        $mockColumnMap = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\ColumnMap::class);
         $mockColumnMap->expects($this->once())->method('setRelationTableName')->with($this->equalTo('tx_myextension_mm'));
         $mockColumnMap->expects($this->once())->method('getRelationTableName')->will($this->returnValue('tx_myextension_mm'));
         $mockColumnMap->expects($this->once())->method('setrelationTablePageIdColumnName')->with($this->equalTo('pid'));
@@ -348,7 +348,10 @@ class DataMapFactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             'eval' => $type,
         );
 
-        $mockColumnMap = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\ColumnMap::class, array('setDateTimeStorageFormat'), array(), '', false);
+        $mockColumnMap = $this->getMockBuilder(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\ColumnMap::class)
+            ->setMethods(array('setDateTimeStorageFormat'))
+            ->disableOriginalConstructor()
+            ->getMock();
 
         if ($expectedValue !== null) {
             $mockColumnMap->expects($this->once())->method('setDateTimeStorageFormat')->with($this->equalTo($type));
@@ -369,7 +372,10 @@ class DataMapFactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->expectException(InvalidClassException::class);
         // @TODO expectExceptionCode is 0
         $mockDataMapFactory = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapFactory::class, array('getControlSection'), array(), '', false);
-        $cacheMock = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\VariableFrontend::class, array('get'), array(), '', false);
+        $cacheMock = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\Frontend\VariableFrontend::class)
+            ->setMethods(array('get'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $cacheMock->expects($this->any())->method('get')->will($this->returnValue(false));
         $mockDataMapFactory->_set('dataMapCache', $cacheMock);
         $mockDataMapFactory->buildDataMap('UnknownObject');
@@ -410,17 +416,20 @@ class DataMapFactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         );
 
         /** @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject $objectManager */
-        $objectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManager::class, array('dummy'), array(), '', false);
+        $objectManager = $this->getMockBuilder(\TYPO3\CMS\Extbase\Object\ObjectManager::class)
+            ->setMethods(array('dummy'))
+            ->disableOriginalConstructor()
+            ->getMock();
 
         /** @var $configurationManager \TYPO3\CMS\Extbase\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject */
-        $configurationManager = $this->getMock(\TYPO3\CMS\Extbase\Configuration\ConfigurationManager::class);
+        $configurationManager = $this->createMock(\TYPO3\CMS\Extbase\Configuration\ConfigurationManager::class);
         $configurationManager->expects($this->once())->method('getConfiguration')->with('Framework')->will($this->returnValue($configuration));
         /** @var \TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapFactory $dataMapFactory */
         $dataMapFactory = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapFactory::class, array('test'));
         $dataMapFactory->_set('reflectionService', new \TYPO3\CMS\Extbase\Reflection\ReflectionService());
         $dataMapFactory->_set('objectManager', $objectManager);
         $dataMapFactory->_set('configurationManager', $configurationManager);
-        $cacheMock = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\VariableFrontend::class, array(), array(), '', false);
+        $cacheMock = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\VariableFrontend::class);
         $cacheMock->expects($this->any())->method('get')->will($this->returnValue(false));
         $dataMapFactory->_set('dataMapCache', $cacheMock);
         $dataMap = $dataMapFactory->buildDataMap(\TYPO3\CMS\Extbase\Domain\Model\FrontendUser::class);
@@ -461,8 +470,10 @@ class DataMapFactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $dataMapFactory = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapFactory::class, array('dummy'));
 
         /** @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject $objectManager */
-        $objectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
-        $columnMap = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\ColumnMap::class, array(), array('column', 'property'));
+        $objectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
+        $columnMap = $this->getMockBuilder(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\ColumnMap::class)
+            ->setConstructorArgs(array('column', 'property'))
+            ->getMock();
         $objectManager->expects($this->once())->method('get')->will($this->returnValue($columnMap));
 
         $dataMapFactory->_set('objectManager', $objectManager);
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/DataMapperTest.php b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/DataMapperTest.php
index e79dd765c88abbdbc0eebb9cb4b539ae46b6de47..ad5c2ba86403d03ef152b594d2bf6f6f7d7f64b5 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/DataMapperTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/DataMapperTest.php
@@ -34,7 +34,7 @@ class DataMapperTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         /** @var DataMapper|AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject $dataMapper */
         $dataMapper = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapper::class, array('mapSingleRow', 'getTargetType'));
         $dataMapper->expects($this->any())->method('getTargetType')->will($this->returnArgument(1));
-        $dataMapFactory = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapFactory::class);
+        $dataMapFactory = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapFactory::class);
         $dataMapper->_set('dataMapFactory', $dataMapFactory);
         $dataMapper->expects($this->once())->method('mapSingleRow')->with($rows[0])->will($this->returnValue($object));
         $dataMapper->map(get_class($object), $rows);
@@ -47,7 +47,7 @@ class DataMapperTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $row = array('uid' => '1234');
         $object = new \stdClass();
-        $persistenceSession = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Session::class);
+        $persistenceSession = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\Session::class);
         $persistenceSession->expects($this->once())->method('hasIdentifier')->with('1234')->will($this->returnValue(true));
         $persistenceSession->expects($this->once())->method('getObjectByIdentifier')->with('1234')->will($this->returnValue($object));
         $dataMapper = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapper::class, array('dummy'));
@@ -94,7 +94,9 @@ class DataMapperTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $classSchema->addProperty('secondProperty', 'integer');
         $classSchema->addProperty('thirdProperty', 'float');
         $classSchema->addProperty('fourthProperty', 'boolean');
-        $mockReflectionService = $this->getMock(\TYPO3\CMS\Extbase\Reflection\ReflectionService::class, array('getClassSchema'));
+        $mockReflectionService = $this->getMockBuilder(\TYPO3\CMS\Extbase\Reflection\ReflectionService::class)
+            ->setMethods(array('getClassSchema'))
+            ->getMock();
         $mockReflectionService->expects($this->any())->method('getClassSchema')->will($this->returnValue($classSchema));
         $dataMapper = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapper::class, array('dummy'));
         $dataMapper->_set('dataMaps', $dataMaps);
@@ -115,11 +117,14 @@ class DataMapperTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $columnMap = new ColumnMap('columnName', 'propertyName');
         $columnMap->setTypeOfRelation(ColumnMap::RELATION_HAS_ONE);
-        $dataMap = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMap::class, array('getColumnMap'), array(), '', false);
+        $dataMap = $this->getMockBuilder(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMap::class)
+            ->setMethods(array('getColumnMap'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $dataMap->expects($this->any())->method('getColumnMap')->will($this->returnValue($columnMap));
         $dataMapper = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapper::class, array('getDataMap'));
         $dataMapper->expects($this->any())->method('getDataMap')->will($this->returnValue($dataMap));
-        $result = $dataMapper->_call('fetchRelatedEager', $this->getMock(\TYPO3\CMS\Extbase\DomainObject\AbstractEntity::class), 'SomeName', '');
+        $result = $dataMapper->_call('fetchRelatedEager', $this->createMock(\TYPO3\CMS\Extbase\DomainObject\AbstractEntity::class), 'SomeName', '');
         $this->assertEquals(null, $result);
     }
 
@@ -132,11 +137,14 @@ class DataMapperTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $columnMap = new ColumnMap('columnName', 'propertyName');
         $columnMap->setTypeOfRelation(ColumnMap::RELATION_BELONGS_TO_MANY);
-        $dataMap = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMap::class, array('getColumnMap'), array(), '', false);
+        $dataMap = $this->getMockBuilder(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMap::class)
+            ->setMethods(array('getColumnMap'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $dataMap->expects($this->any())->method('getColumnMap')->will($this->returnValue($columnMap));
         $dataMapper = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapper::class, array('getDataMap'));
         $dataMapper->expects($this->any())->method('getDataMap')->will($this->returnValue($dataMap));
-        $result = $dataMapper->_call('fetchRelatedEager', $this->getMock(\TYPO3\CMS\Extbase\DomainObject\AbstractEntity::class), 'SomeName', '');
+        $result = $dataMapper->_call('fetchRelatedEager', $this->createMock(\TYPO3\CMS\Extbase\DomainObject\AbstractEntity::class), 'SomeName', '');
         $this->assertEquals(array(), $result);
     }
 
@@ -150,12 +158,15 @@ class DataMapperTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $columnMap = new ColumnMap('columnName', 'propertyName');
         $columnMap->setTypeOfRelation(ColumnMap::RELATION_HAS_ONE);
-        $dataMap = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMap::class, array('getColumnMap'), array(), '', false);
+        $dataMap = $this->getMockBuilder(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMap::class)
+            ->setMethods(array('getColumnMap'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $dataMap->expects($this->any())->method('getColumnMap')->will($this->returnValue($columnMap));
         $dataMapper = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapper::class, array('getDataMap', 'fetchRelated'));
         $dataMapper->expects($this->any())->method('getDataMap')->will($this->returnValue($dataMap));
         $dataMapper->expects($this->never())->method('fetchRelated');
-        $result = $dataMapper->_call('mapObjectToClassProperty', $this->getMock(\TYPO3\CMS\Extbase\DomainObject\AbstractEntity::class), 'SomeName', '');
+        $result = $dataMapper->_call('mapObjectToClassProperty', $this->createMock(\TYPO3\CMS\Extbase\DomainObject\AbstractEntity::class), 'SomeName', '');
         $this->assertEquals(null, $result);
     }
 
@@ -170,7 +181,10 @@ class DataMapperTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $columnMap = new ColumnMap('columnName', 'propertyName');
         $columnMap->setTypeOfRelation(ColumnMap::RELATION_HAS_ONE);
-        $dataMap = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMap::class, array('getColumnMap'), array(), '', false);
+        $dataMap = $this->getMockBuilder(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMap::class)
+            ->setMethods(array('getColumnMap'))
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $className = $this->getUniqueId('Class1');
         $classNameWithNS = __NAMESPACE__ . '\\' . $className;
@@ -191,7 +205,10 @@ class DataMapperTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $session = new \TYPO3\CMS\Extbase\Persistence\Generic\Session();
         $session->registerObject($child, $identifier);
 
-        $mockReflectionService = $this->getMock(\TYPO3\CMS\Extbase\Reflection\ReflectionService::class, array('getClassSchema'), array(), '', false);
+        $mockReflectionService = $this->getMockBuilder(\TYPO3\CMS\Extbase\Reflection\ReflectionService::class)
+            ->setMethods(array('getClassSchema'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockReflectionService->expects($this->any())->method('getClassSchema')->will($this->returnValue($classSchema1));
 
         $dataMap->expects($this->any())->method('getColumnMap')->will($this->returnValue($columnMap));
@@ -316,13 +333,7 @@ class DataMapperTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->expectException(UnexpectedTypeException::class);
         $this->expectExceptionCode(1274799934);
         $dataMapper = new DataMapper();
-        $input = $this->getMock(
-            \TYPO3\CMS\Extbase\Persistence\Generic\LazyLoadingProxy::class,
-            array(),
-            array(),
-            '',
-            false
-        );
+        $input = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\LazyLoadingProxy::class);
         $input->expects($this->once())->method('_loadRealInstance')->will($this->returnValue($dataMapper));
         $dataMapper->getPlainValue($input);
     }
@@ -333,13 +344,8 @@ class DataMapperTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function getPlainValueCallsGetUidOnDomainObjectInterfaceInput()
     {
         $dataMapper = new DataMapper();
-        $input = $this->getMock(
-            \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface::class,
-            array(),
-            array(),
-            '',
-            false
-        );
+        $input = $this->createMock(\TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface::class);
+
         $input->expects($this->once())->method('getUid')->will($this->returnValue(23));
         $this->assertSame(23, $dataMapper->getPlainValue($input));
     }
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/PersistenceManagerTest.php b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/PersistenceManagerTest.php
index c4fefc081b153b3d761351bce6e15cb0417b9a5b..26237056103f9f1d5869e5b76b5cbaaf8a4735f2 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/PersistenceManagerTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/PersistenceManagerTest.php
@@ -26,7 +26,7 @@ class PersistenceManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 
     protected function setUp()
     {
-        $this->mockObjectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
+        $this->mockObjectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
     }
 
     /**
@@ -37,7 +37,7 @@ class PersistenceManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $entity2 = new \TYPO3\CMS\Extbase\Tests\Unit\Persistence\Fixture\Model\Entity2();
         $objectStorage = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
         $objectStorage->attach($entity2);
-        $mockBackend = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface::class);
+        $mockBackend = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface::class);
         $mockBackend->expects($this->once())->method('setAggregateRootObjects')->with($objectStorage);
 
         $manager = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager::class, array('dummy'));
@@ -55,7 +55,7 @@ class PersistenceManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $entity2 = new \TYPO3\CMS\Extbase\Tests\Unit\Persistence\Fixture\Model\Entity2();
         $objectStorage = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
         $objectStorage->attach($entity2);
-        $mockBackend = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface::class);
+        $mockBackend = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface::class);
         $mockBackend->expects($this->once())->method('setDeletedEntities')->with($objectStorage);
 
         $manager = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager::class, array('dummy'));
@@ -73,7 +73,7 @@ class PersistenceManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $fakeUuid = 'fakeUuid';
         $object = new \stdClass();
 
-        $mockBackend = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface::class);
+        $mockBackend = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface::class);
         $mockBackend->expects($this->once())->method('getIdentifierByObject')->with($object)->will($this->returnValue($fakeUuid));
 
         /** @var \TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface $manager */
@@ -91,7 +91,7 @@ class PersistenceManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $fakeUuid = 'fakeUuid';
         $object = new \stdClass();
 
-        $mockSession = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Session::class);
+        $mockSession = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\Session::class);
         $mockSession->expects($this->once())->method('hasIdentifier')->with($fakeUuid)->will($this->returnValue(true));
         $mockSession->expects($this->once())->method('getObjectByIdentifier')->with($fakeUuid)->will($this->returnValue($object));
 
@@ -110,10 +110,10 @@ class PersistenceManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $object = new \stdClass();
         $fakeEntityType = get_class($object);
 
-        $mockSession = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Session::class);
+        $mockSession = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\Session::class);
         $mockSession->expects($this->once())->method('hasIdentifier')->with($fakeUuid)->will($this->returnValue(false));
 
-        $mockBackend = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface::class);
+        $mockBackend = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface::class);
         $mockBackend->expects($this->once())->method('getObjectByIdentifier')->with($fakeUuid, $fakeEntityType)->will($this->returnValue($object));
 
         $manager = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager::class, array('dummy'));
@@ -131,10 +131,10 @@ class PersistenceManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $fakeUuid = '42';
         $fakeEntityType = 'foobar';
 
-        $mockSession = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Session::class);
+        $mockSession = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\Session::class);
         $mockSession->expects($this->once())->method('hasIdentifier')->with($fakeUuid, $fakeEntityType)->will($this->returnValue(false));
 
-        $mockBackend = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface::class);
+        $mockBackend = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface::class);
         $mockBackend->expects($this->once())->method('getObjectByIdentifier')->with($fakeUuid, $fakeEntityType)->will($this->returnValue(null));
 
         $manager = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager::class, array('dummy'));
@@ -241,7 +241,10 @@ class PersistenceManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $entity1 = new $classNameWithNamespace();
         $repository = $this->getAccessibleMock($repositorClassNameWithNamespace, array('dummy'), array($this->mockObjectManager));
         $repository->_set('objectType', get_class($entity1));
-        $mockBackend = $this->getMock($this->buildAccessibleProxy(\TYPO3\CMS\Extbase\Persistence\Generic\Backend::class), array('commit', 'setChangedEntities'), array(), '', false);
+        $mockBackend = $this->getMockBuilder($this->buildAccessibleProxy(\TYPO3\CMS\Extbase\Persistence\Generic\Backend::class))
+            ->setMethods(array('commit', 'setChangedEntities'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockBackend->expects($this->once())
             ->method('setChangedEntities')
             ->with($this->equalTo($changedEntities));
@@ -261,12 +264,12 @@ class PersistenceManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function clearStateForgetsAboutNewObjects()
     {
-        $mockObject = $this->getMock('TYPO3\CMS\Extbase\Persistence\Aspect\PersistenceMagicInterface');
+        $mockObject = $this->createMock(\TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface::class);
         $mockObject->Persistence_Object_Identifier = 'abcdefg';
 
-        $mockSession = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Session::class);
+        $mockSession = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\Session::class);
         $mockSession->expects($this->any())->method('hasIdentifier')->will($this->returnValue(false));
-        $mockBackend = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface::class);
+        $mockBackend = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface::class);
 
         $persistenceManager = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager::class, array('dummy'));
         $persistenceManager->_set('persistenceSession', $mockSession);
@@ -285,7 +288,9 @@ class PersistenceManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function tearDownWithBackendSupportingTearDownDelegatesCallToBackend()
     {
         $methods = array_merge(get_class_methods(\TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface::class), array('tearDown'));
-        $mockBackend = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface::class, $methods);
+        $mockBackend = $this->getMockBuilder(\TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface::class)
+            ->setMethods($methods)
+            ->getMock();
         $mockBackend->expects($this->once())->method('tearDown');
 
         $persistenceManager = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager::class, array('dummy'));
@@ -315,7 +320,10 @@ class PersistenceManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $fullClassName = 'Foo_Bar_Domain_Model_' . $className;
         $entity1 = new $fullClassName();
         $aggregateRootObjects->attach($entity1);
-        $mockBackend = $this->getMock($this->buildAccessibleProxy(\TYPO3\CMS\Extbase\Persistence\Generic\Backend::class), array('commit', 'setAggregateRootObjects', 'setDeletedEntities'), array(), '', false);
+        $mockBackend = $this->getMockBuilder($this->buildAccessibleProxy(\TYPO3\CMS\Extbase\Persistence\Generic\Backend::class))
+            ->setMethods(array('commit', 'setAggregateRootObjects', 'setDeletedEntities'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockBackend->expects($this->once())
             ->method('setAggregateRootObjects')
             ->with($this->equalTo($aggregateRootObjects));
@@ -343,7 +351,10 @@ class PersistenceManagerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $classNameWithNamespace = __NAMESPACE__ . '\\Domain\\Model\\' . $className;
         $entity1 = new $classNameWithNamespace();
         $aggregateRootObjects->attach($entity1);
-        $mockBackend = $this->getMock($this->buildAccessibleProxy(\TYPO3\CMS\Extbase\Persistence\Generic\Backend::class), array('commit', 'setAggregateRootObjects', 'setDeletedEntities'), array(), '', false);
+        $mockBackend = $this->getMockBuilder($this->buildAccessibleProxy(\TYPO3\CMS\Extbase\Persistence\Generic\Backend::class))
+            ->setMethods(array('commit', 'setAggregateRootObjects', 'setDeletedEntities'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockBackend->expects($this->once())
             ->method('setAggregateRootObjects')
             ->with($this->equalTo($aggregateRootObjects));
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryFactoryTest.php b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryFactoryTest.php
index 6d7b8461218c340fc7db597e218d2d2d25ef2208..c376b630ed62b860e42945db5144491b565fe207 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryFactoryTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryFactoryTest.php
@@ -41,14 +41,19 @@ class QueryFactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 
     protected function setUp()
     {
-        $this->dataMap = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMap::class, array('getIsStatic', 'getRootLevel'), array('Vendor\\Ext\\Domain\\Model\\ClubMate', 'tx_ext_domain_model_clubmate'));
+        $this->dataMap = $this->getMockBuilder(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMap::class)
+            ->setMethods(array('getIsStatic', 'getRootLevel'))
+            ->setConstructorArgs(array('Vendor\\Ext\\Domain\\Model\\ClubMate', 'tx_ext_domain_model_clubmate'))
+            ->getMock();
 
         $this->queryFactory = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Persistence\Generic\QueryFactory::class, array('dummy'));
         $this->queryFactory->_set('configurationManager',
-            $this->getMock(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::class)
+            $this->createMock(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::class)
         );
 
-        $this->dataMapper = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapper::class, array('getDataMap', 'convertClassNameToTableName'));
+        $this->dataMapper = $this->getMockBuilder(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapper::class)
+            ->setMethods(array('getDataMap', 'convertClassNameToTableName'))
+            ->getMock();
         $this->dataMapper->expects($this->any())->method('getDataMap')->will($this->returnValue($this->dataMap));
         $this->queryFactory->_set('dataMapper', $this->dataMapper);
     }
@@ -74,13 +79,13 @@ class QueryFactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function createDoesNotRespectStoragePageIfStaticOrRootLevelIsTrue($static, $rootLevel, $expectedResult)
     {
         /** @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject $objectManager */
-        $objectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
+        $objectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
         $this->queryFactory->_set('objectManager', $objectManager);
 
         $this->dataMap->expects($this->any())->method('getIsStatic')->will($this->returnValue($static));
         $this->dataMap->expects($this->any())->method('getRootLevel')->will($this->returnValue($rootLevel));
 
-        $query = $this->getMock(\TYPO3\CMS\Extbase\Persistence\QueryInterface::class);
+        $query = $this->createMock(\TYPO3\CMS\Extbase\Persistence\QueryInterface::class);
         $objectManager->expects($this->at(0))->method('get')
             ->with(\TYPO3\CMS\Extbase\Persistence\QueryInterface::class)
             ->will($this->returnValue($query));
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryResultTest.php b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryResultTest.php
index 0d7551a18c9673c2baec1960e5672b3769967686..26827786afbdaf10e6bde3b392fcfc55c24421ae 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryResultTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryResultTest.php
@@ -51,11 +51,11 @@ class QueryResultTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     protected function setUp()
     {
-        $this->mockPersistenceManager = $this->getMock(\TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface::class);
+        $this->mockPersistenceManager = $this->createMock(\TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface::class);
         $this->mockPersistenceManager->expects($this->any())->method('getObjectDataByQuery')->will($this->returnValue(array('one', 'two')));
         $this->mockPersistenceManager->expects($this->any())->method('getObjectCountByQuery')->will($this->returnValue(2));
-        $this->mockDataMapper = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapper::class);
-        $this->mockQuery = $this->getMock(\TYPO3\CMS\Extbase\Persistence\QueryInterface::class);
+        $this->mockDataMapper = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapper::class);
+        $this->mockQuery = $this->createMock(\TYPO3\CMS\Extbase\Persistence\QueryInterface::class);
         $this->queryResult = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Persistence\Generic\QueryResult::class, array('dummy'), array($this->mockQuery));
         $this->queryResult->_set('persistenceManager', $this->mockPersistenceManager);
         $this->queryResult->_set('dataMapper', $this->mockDataMapper);
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryTest.php b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryTest.php
index 6fc7ab9640738ae138fdd55feda4dfea28d4a964..2ba2d2e8506816752fc4851c7f17e48bf49acd4c 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryTest.php
@@ -47,11 +47,11 @@ class QueryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     protected function setUp()
     {
         $this->query = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Persistence\Generic\Query::class, array('dummy'), array('someType'));
-        $this->querySettings = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface::class);
+        $this->querySettings = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface::class);
         $this->query->_set('querySettings', $this->querySettings);
-        $this->persistenceManager = $this->getMock(\TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface::class);
+        $this->persistenceManager = $this->createMock(\TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface::class);
         $this->query->_set('persistenceManager', $this->persistenceManager);
-        $this->dataMapper = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapper::class);
+        $this->dataMapper = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapper::class);
         $this->query->_set('dataMapper', $this->dataMapper);
     }
 
@@ -61,9 +61,9 @@ class QueryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function executeReturnsQueryResultInstanceAndInjectsItself()
     {
         /** @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject $objectManager */
-        $objectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
+        $objectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
         $this->query->_set('objectManager', $objectManager);
-        $queryResult = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\QueryResult::class, array(), array(), '', false);
+        $queryResult = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\QueryResult::class);
         $objectManager->expects($this->once())->method('get')->with(\TYPO3\CMS\Extbase\Persistence\QueryResultInterface::class, $this->query)->will($this->returnValue($queryResult));
         $actualResult = $this->query->execute();
         $this->assertSame($queryResult, $actualResult);
@@ -145,9 +145,9 @@ class QueryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function equalsForCaseSensitiveFalseLowercasesOperand($propertyName, $operand, $expectedOperand)
     {
         /** @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject $objectManager */
-        $objectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
+        $objectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
         /** @var \TYPO3\CMS\Extbase\Persistence\Generic\Qom\DynamicOperandInterface $dynamicOperand */
-        $dynamicOperand = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Qom\PropertyValueInterface::class);
+        $dynamicOperand = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\Qom\PropertyValueInterface::class);
         $objectManager->expects($this->any())->method('get')->will($this->returnValue($dynamicOperand));
         /** @var $qomFactory \TYPO3\CMS\Extbase\Persistence\Generic\Qom\QueryObjectModelFactory */
         $qomFactory = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Persistence\Generic\Qom\QueryObjectModelFactory::class, array('comparison'));
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/SessionTest.php b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/SessionTest.php
index da72db64a66c252f79134738785b305ecc773a59..5a8cde8eb23e6a8d93ad58c5ba271556fab1d1d7 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/SessionTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/SessionTest.php
@@ -133,7 +133,7 @@ class SessionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function objectCanBeRegisteredAsReconstituted()
     {
         $persistenceSession = new \TYPO3\CMS\Extbase\Persistence\Generic\Session();
-        $entity = $this->getMock(\TYPO3\CMS\Extbase\DomainObject\AbstractEntity::class);
+        $entity = $this->createMock(\TYPO3\CMS\Extbase\DomainObject\AbstractEntity::class);
         $persistenceSession->registerReconstitutedEntity($entity);
         $reconstitutedObjects = $persistenceSession->getReconstitutedEntities();
         $this->assertTrue($reconstitutedObjects->contains($entity), 'The object was not registered as reconstituted.');
@@ -145,7 +145,7 @@ class SessionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function objectCanBeUnregisteredAsReconstituted()
     {
         $persistenceSession = new \TYPO3\CMS\Extbase\Persistence\Generic\Session();
-        $entity = $this->getMock(\TYPO3\CMS\Extbase\DomainObject\AbstractEntity::class);
+        $entity = $this->createMock(\TYPO3\CMS\Extbase\DomainObject\AbstractEntity::class);
         $persistenceSession->registerReconstitutedEntity($entity);
         $persistenceSession->unregisterReconstitutedEntity($entity);
         $reconstitutedObjects = $persistenceSession->getReconstitutedEntities();
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Storage/Typo3DbBackendTest.php b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Storage/Typo3DbBackendTest.php
index c5ef788b5905ef457653d57428fe1bd86048ee02..d7fd8d5a554c463252c7afa5dc1480c14d76b00c 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Storage/Typo3DbBackendTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Storage/Typo3DbBackendTest.php
@@ -43,22 +43,37 @@ class Typo3DbBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function uidOfAlreadyPersistedValueObjectIsDeterminedCorrectly()
     {
-        $mockValueObject = $this->getMock(\TYPO3\CMS\Extbase\DomainObject\AbstractValueObject::class, array('_getProperties'), array(), '', false);
+        $mockValueObject = $this->getMockBuilder(\TYPO3\CMS\Extbase\DomainObject\AbstractValueObject::class)
+            ->setMethods(array('_getProperties'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockValueObject->expects($this->once())->method('_getProperties')->will($this->returnValue(array('propertyName' => 'propertyValue')));
-        $mockColumnMap = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMap::class, array('isPersistableProperty', 'getColumnName'), array(), '', false);
+        $mockColumnMap = $this->getMockBuilder(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMap::class)
+            ->setMethods(array('isPersistableProperty', 'getColumnName'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockColumnMap->expects($this->any())->method('getColumnName')->will($this->returnValue('column_name'));
         $tableName = 'tx_foo_table';
-        $mockDataMap = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMap::class, array('isPersistableProperty', 'getColumnMap', 'getTableName'), array(), '', false);
+        $mockDataMap = $this->getMockBuilder(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMap::class)
+            ->setMethods(array('isPersistableProperty', 'getColumnMap', 'getTableName'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockDataMap->expects($this->any())->method('isPersistableProperty')->will($this->returnValue(true));
         $mockDataMap->expects($this->any())->method('getColumnMap')->will($this->returnValue($mockColumnMap));
         $mockDataMap->expects($this->any())->method('getTableName')->will($this->returnValue($tableName));
-        $mockDataMapper = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapper::class, array('getDataMap', 'getPlainValue'), array(), '', false);
+        $mockDataMapper = $this->getMockBuilder(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapper::class)
+            ->setMethods(array('getDataMap', 'getPlainValue'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockDataMapper->expects($this->once())->method('getDataMap')->will($this->returnValue($mockDataMap));
         $mockDataMapper->expects($this->once())->method('getPlainValue')->will($this->returnValue('plainPropertyValue'));
         $expectedStatement = 'SELECT * FROM tx_foo_table WHERE column_name=?';
         $expectedParameters = array('plainPropertyValue');
         $expectedUid = 52;
-        $mockDataBaseHandle = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array('sql_query', 'sql_fetch_assoc'), array(), '', false);
+        $mockDataBaseHandle = $this->getMockBuilder(\TYPO3\CMS\Core\Database\DatabaseConnection::class)
+            ->setMethods(array('sql_query', 'sql_fetch_assoc'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockDataBaseHandle->expects($this->once())->method('sql_query')->will($this->returnValue('resource'));
         $mockDataBaseHandle->expects($this->any())->method('sql_fetch_assoc')->with('resource')->will($this->returnValue(array('uid' => $expectedUid)));
         $mockTypo3DbBackend = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Persistence\Generic\Storage\Typo3DbBackend::class, array('checkSqlErrors', 'replacePlaceholders', 'addVisibilityConstraintStatement'), array(), '', false);
@@ -90,12 +105,17 @@ class Typo3DbBackendTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             'pid' => '-1'
         );
         /** @var \TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings|\PHPUnit_Framework_MockObject_MockObject $querySettings */
-        $mockQuerySettings = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings::class, array('dummy'), array(), '', false);
+        $mockQuerySettings = $this->getMockBuilder(\TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings::class)
+            ->setMethods(array('dummy'))
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $workspaceUid = 2;
         $sourceMock = new \TYPO3\CMS\Extbase\Persistence\Generic\Qom\Selector('tx_foo', 'Tx_Foo');
         /** @var $pageRepositoryMock \TYPO3\CMS\Frontend\Page\PageRepository|\PHPUnit_Framework_MockObject_MockObject */
-        $pageRepositoryMock = $this->getMock(\TYPO3\CMS\Frontend\Page\PageRepository::class, array('movePlhOL', 'getWorkspaceVersionOfRecord'));
+        $pageRepositoryMock = $this->getMockBuilder(\TYPO3\CMS\Frontend\Page\PageRepository::class)
+            ->setMethods(array('movePlhOL', 'getWorkspaceVersionOfRecord'))
+            ->getMock();
         $pageRepositoryMock->versioningPreview = true;
         $pageRepositoryMock->expects($this->once())->method('getWorkspaceVersionOfRecord')->with($workspaceUid, 'tx_foo', '42')->will($this->returnValue($workspaceVersion));
         $mockTypo3DbBackend = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Persistence\Generic\Storage\Typo3DbBackend::class, array('dummy'), array(), '', false);
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Storage/Typo3DbQueryParserTest.php b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Storage/Typo3DbQueryParserTest.php
index 36a404d67e984eed5e331da4efa60a37cfab03c6..e780ebaca88f7bf48d28303c23064bbd91213158 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Storage/Typo3DbQueryParserTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Storage/Typo3DbQueryParserTest.php
@@ -30,7 +30,7 @@ class Typo3DbQueryParserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             'languageField' => 'sys_language_uid'
         );
         /** @var \TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings|\PHPUnit_Framework_MockObject_MockObject $querySettings */
-        $querySettings = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings::class);
+        $querySettings = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings::class);
         $mockTypo3DbQueryParser = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Persistence\Generic\Storage\Typo3DbQueryParser::class, array('dummy'), array(), '', false);
         $sql = $mockTypo3DbQueryParser->_callRef('getSysLanguageStatement', $table, $table, $querySettings);
         $expectedSql = '(' . $table . '.sys_language_uid IN (0,-1))';
@@ -47,7 +47,9 @@ class Typo3DbQueryParserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             'languageField' => 'sys_language_uid'
         );
         /** @var \TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings|\PHPUnit_Framework_MockObject_MockObject $querySettings */
-        $querySettings = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings::class, array('dummy'));
+        $querySettings = $this->getMockBuilder(\TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings::class)
+            ->setMethods(array('dummy'))
+            ->getMock();
         $querySettings->setLanguageUid('1');
         $mockTypo3DbQueryParser = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Persistence\Generic\Storage\Typo3DbQueryParser::class, array('dummy'), array(), '', false);
         $sql = $mockTypo3DbQueryParser->_callRef('getSysLanguageStatement', $table, $table, $querySettings);
@@ -177,9 +179,15 @@ class Typo3DbQueryParserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function orderStatementGenerationWorks()
     {
-        $mockSource = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Qom\Selector::class, array('getNodeTypeName'), array(), '', false);
+        $mockSource = $this->getMockBuilder(\TYPO3\CMS\Extbase\Persistence\Generic\Qom\Selector::class)
+            ->setMethods(array('getNodeTypeName'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockSource->expects($this->any())->method('getNodeTypeName')->will($this->returnValue('Tx_MyExt_ClassName'));
-        $mockDataMapper = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapper::class, array('convertPropertyNameToColumnName', 'convertClassNameToTableName'), array(), '', false);
+        $mockDataMapper = $this->getMockBuilder(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapper::class)
+            ->setMethods(array('convertPropertyNameToColumnName', 'convertClassNameToTableName'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockDataMapper->expects($this->once())->method('convertClassNameToTableName')->with('Tx_MyExt_ClassName')->will($this->returnValue('tx_myext_tablename'));
         $mockDataMapper->expects($this->once())->method('convertPropertyNameToColumnName')->with('fooProperty', 'Tx_MyExt_ClassName')->will($this->returnValue('converted_fieldname'));
         $sql = array();
@@ -198,9 +206,15 @@ class Typo3DbQueryParserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $this->expectException(UnsupportedOrderException::class);
         $this->expectExceptionCode(1242816074);
-        $mockSource = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Qom\Selector::class, array('getNodeTypeName'), array(), '', false);
+        $mockSource = $this->getMockBuilder(\TYPO3\CMS\Extbase\Persistence\Generic\Qom\Selector::class)
+            ->setMethods(array('getNodeTypeName'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockSource->expects($this->never())->method('getNodeTypeName');
-        $mockDataMapper = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapper::class, array('convertPropertyNameToColumnName', 'convertClassNameToTableName'), array(), '', false);
+        $mockDataMapper = $this->getMockBuilder(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapper::class)
+            ->setMethods(array('convertPropertyNameToColumnName', 'convertClassNameToTableName'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockDataMapper->expects($this->never())->method('convertClassNameToTableName');
         $mockDataMapper->expects($this->never())->method('convertPropertyNameToColumnName');
         $sql = array();
@@ -215,9 +229,15 @@ class Typo3DbQueryParserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function orderStatementGenerationWorksWithMultipleOrderings()
     {
-        $mockSource = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Qom\Selector::class, array('getNodeTypeName'), array(), '', false);
+        $mockSource = $this->getMockBuilder(\TYPO3\CMS\Extbase\Persistence\Generic\Qom\Selector::class)
+            ->setMethods(array('getNodeTypeName'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockSource->expects($this->any())->method('getNodeTypeName')->will($this->returnValue('Tx_MyExt_ClassName'));
-        $mockDataMapper = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapper::class, array('convertPropertyNameToColumnName', 'convertClassNameToTableName'), array(), '', false);
+        $mockDataMapper = $this->getMockBuilder(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapper::class)
+            ->setMethods(array('convertPropertyNameToColumnName', 'convertClassNameToTableName'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockDataMapper->expects($this->any())->method('convertClassNameToTableName')->with('Tx_MyExt_ClassName')->will($this->returnValue('tx_myext_tablename'));
         $mockDataMapper->expects($this->any())->method('convertPropertyNameToColumnName')->will($this->returnValue('converted_fieldname'));
         $sql = array();
@@ -263,13 +283,18 @@ class Typo3DbQueryParserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $GLOBALS['TSFE'] = new \stdClass();
         $GLOBALS['TSFE']->sys_page = new \TYPO3\CMS\Frontend\Page\PageRepository();
         $GLOBALS['SIM_ACCESS_TIME'] = 123456789;
-        $mockQuerySettings = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings::class, array('getIgnoreEnableFields', 'getEnableFieldsToBeIgnored', 'getIncludeDeleted'), array(), '', false);
+        $mockQuerySettings = $this->getMockBuilder(\TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings::class)
+            ->setMethods(array('getIgnoreEnableFields', 'getEnableFieldsToBeIgnored', 'getIncludeDeleted'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockQuerySettings->expects($this->once())->method('getIgnoreEnableFields')->will($this->returnValue($ignoreEnableFields));
         $mockQuerySettings->expects($this->once())->method('getEnableFieldsToBeIgnored')->will($this->returnValue($enableFieldsToBeIgnored));
         $mockQuerySettings->expects($this->once())->method('getIncludeDeleted')->will($this->returnValue($deletedValue));
 
         /** @var $mockEnvironmentService \TYPO3\CMS\Extbase\Service\EnvironmentService | \PHPUnit_Framework_MockObject_MockObject */
-        $mockEnvironmentService = $this->getMock(\TYPO3\CMS\Extbase\Service\EnvironmentService::class, array('isEnvironmentInFrontendMode'));
+        $mockEnvironmentService = $this->getMockBuilder(\TYPO3\CMS\Extbase\Service\EnvironmentService::class)
+            ->setMethods(array('isEnvironmentInFrontendMode'))
+            ->getMock();
         $mockEnvironmentService->expects($this->any())->method('isEnvironmentInFrontendMode')->will($this->returnValue($mode == 'FE'));
 
         $mockTypo3DbQueryParser = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Persistence\Generic\Storage\Typo3DbQueryParser::class, array('dummy'), array(), '', false);
@@ -307,12 +332,17 @@ class Typo3DbQueryParserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $GLOBALS['TSFE']->sys_page = new \TYPO3\CMS\Frontend\Page\PageRepository();
         $GLOBALS['SIM_ACCESS_TIME'] = 123456789;
         /** @var \TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings $mockQuerySettings */
-        $mockQuerySettings = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings::class, array('dummy'), array(), '', false);
+        $mockQuerySettings = $this->getMockBuilder(\TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings::class)
+            ->setMethods(array('dummy'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockQuerySettings->setIgnoreEnableFields(!$respectEnableFields);
         $mockQuerySettings->setIncludeDeleted(!$respectEnableFields);
 
         /** @var $mockEnvironmentService \TYPO3\CMS\Extbase\Service\EnvironmentService | \PHPUnit_Framework_MockObject_MockObject */
-        $mockEnvironmentService = $this->getMock(\TYPO3\CMS\Extbase\Service\EnvironmentService::class, array('isEnvironmentInFrontendMode'));
+        $mockEnvironmentService = $this->getMockBuilder(\TYPO3\CMS\Extbase\Service\EnvironmentService::class)
+            ->setMethods(array('isEnvironmentInFrontendMode'))
+            ->getMock();
         $mockEnvironmentService->expects($this->any())->method('isEnvironmentInFrontendMode')->will($this->returnValue($mode == 'FE'));
 
         $mockTypo3DbQueryParser = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Persistence\Generic\Storage\Typo3DbQueryParser::class, array('dummy'), array(), '', false);
@@ -336,13 +366,18 @@ class Typo3DbQueryParserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             ),
             'delete' => 'deleted_column'
         );
-        $mockQuerySettings = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings::class, array('getIgnoreEnableFields', 'getEnableFieldsToBeIgnored', 'getIncludeDeleted'), array(), '', false);
+        $mockQuerySettings = $this->getMockBuilder(\TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings::class)
+            ->setMethods(array('getIgnoreEnableFields', 'getEnableFieldsToBeIgnored', 'getIncludeDeleted'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockQuerySettings->expects($this->once())->method('getIgnoreEnableFields')->will($this->returnValue(false));
         $mockQuerySettings->expects($this->once())->method('getEnableFieldsToBeIgnored')->will($this->returnValue(array()));
         $mockQuerySettings->expects($this->once())->method('getIncludeDeleted')->will($this->returnValue(true));
 
         /** @var $mockEnvironmentService \TYPO3\CMS\Extbase\Service\EnvironmentService | \PHPUnit_Framework_MockObject_MockObject */
-        $mockEnvironmentService = $this->getMock(\TYPO3\CMS\Extbase\Service\EnvironmentService::class, array('isEnvironmentInFrontendMode'));
+        $mockEnvironmentService = $this->getMockBuilder(\TYPO3\CMS\Extbase\Service\EnvironmentService::class)
+            ->setMethods(array('isEnvironmentInFrontendMode'))
+            ->getMock();
         $mockEnvironmentService->expects($this->any())->method('isEnvironmentInFrontendMode')->will($this->returnValue(true));
 
         $mockTypo3DbQueryParser = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Persistence\Generic\Storage\Typo3DbQueryParser::class, array('dummy'), array(), '', false);
@@ -397,7 +432,7 @@ class Typo3DbQueryParserTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             'rootLevel' => $rootLevel
         );
         $mockTypo3DbQueryParser = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Persistence\Generic\Storage\Typo3DbQueryParser::class, array('dummy'), array(), '', false);
-        $mockFrontendVariableCache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\VariableFrontend::class, array(), array(), '', false);
+        $mockFrontendVariableCache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\VariableFrontend::class);
         $mockDatabaseHandle = $this->prophesize(DatabaseConnection::class);
         $mockDatabaseHandle->cleanIntArray(Argument::cetera())->willReturnArgument(0);
         $mockTypo3DbQueryParser->_set('databaseHandle', $mockDatabaseHandle->reveal());
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/RepositoryTest.php b/typo3/sysext/extbase/Tests/Unit/Persistence/RepositoryTest.php
index 0b15bf4de0922442a5bb7a6f6ec96c78ba49b8d5..833945e81b944c71d80b4d792a0101cba8737710 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/RepositoryTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/RepositoryTest.php
@@ -68,13 +68,13 @@ class RepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 
     protected function setUp()
     {
-        $this->mockQueryFactory = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\QueryFactory::class);
-        $this->mockQuery = $this->getMock(\TYPO3\CMS\Extbase\Persistence\QueryInterface::class);
-        $this->mockQuerySettings = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface::class);
+        $this->mockQueryFactory = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\QueryFactory::class);
+        $this->mockQuery = $this->createMock(\TYPO3\CMS\Extbase\Persistence\QueryInterface::class);
+        $this->mockQuerySettings = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface::class);
         $this->mockQuery->expects($this->any())->method('getQuerySettings')->will($this->returnValue($this->mockQuerySettings));
         $this->mockQueryFactory->expects($this->any())->method('create')->will($this->returnValue($this->mockQuery));
-        $this->mockSession = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Session::class);
-        $this->mockConfigurationManager = $this->getMock(\TYPO3\CMS\Extbase\Configuration\ConfigurationManager::class);
+        $this->mockSession = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\Session::class);
+        $this->mockConfigurationManager = $this->createMock(\TYPO3\CMS\Extbase\Configuration\ConfigurationManager::class);
         $this->mockBackend = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Persistence\Generic\Backend::class, array('dummy'), array($this->mockConfigurationManager));
         $this->inject($this->mockBackend, 'session', $this->mockSession);
         $this->mockPersistenceManager = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager::class, array('createQueryForType'));
@@ -82,7 +82,7 @@ class RepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->inject($this->mockPersistenceManager, 'persistenceSession', $this->mockSession);
         $this->inject($this->mockPersistenceManager, 'backend', $this->mockBackend);
         $this->mockPersistenceManager->expects($this->any())->method('createQueryForType')->will($this->returnValue($this->mockQuery));
-        $this->mockObjectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
+        $this->mockObjectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
         $this->repository = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Persistence\Repository::class, array('dummy'), array($this->mockObjectManager));
         $this->repository->_set('persistenceManager', $this->mockPersistenceManager);
     }
@@ -100,7 +100,7 @@ class RepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function createQueryCallsPersistenceManagerWithExpectedClassName()
     {
-        $mockPersistenceManager = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager::class);
+        $mockPersistenceManager = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager::class);
         $mockPersistenceManager->expects($this->once())->method('createQueryForType')->with('ExpectedType');
 
         $this->repository->_set('objectType', 'ExpectedType');
@@ -115,9 +115,9 @@ class RepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function createQuerySetsDefaultOrderingIfDefined()
     {
         $orderings = array('foo' => \TYPO3\CMS\Extbase\Persistence\QueryInterface::ORDER_ASCENDING);
-        $mockQuery = $this->getMock(\TYPO3\CMS\Extbase\Persistence\QueryInterface::class);
+        $mockQuery = $this->createMock(\TYPO3\CMS\Extbase\Persistence\QueryInterface::class);
         $mockQuery->expects($this->once())->method('setOrderings')->with($orderings);
-        $mockPersistenceManager = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager::class);
+        $mockPersistenceManager = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager::class);
         $mockPersistenceManager->expects($this->exactly(2))->method('createQueryForType')->with('ExpectedType')->will($this->returnValue($mockQuery));
 
         $this->repository->_set('objectType', 'ExpectedType');
@@ -134,12 +134,15 @@ class RepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function findAllCreatesQueryAndReturnsResultOfExecuteCall()
     {
-        $expectedResult = $this->getMock(\TYPO3\CMS\Extbase\Persistence\QueryResultInterface::class);
+        $expectedResult = $this->createMock(\TYPO3\CMS\Extbase\Persistence\QueryResultInterface::class);
 
-        $mockQuery = $this->getMock(\TYPO3\CMS\Extbase\Persistence\QueryInterface::class);
+        $mockQuery = $this->createMock(\TYPO3\CMS\Extbase\Persistence\QueryInterface::class);
         $mockQuery->expects($this->once())->method('execute')->with()->will($this->returnValue($expectedResult));
 
-        $repository = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Repository::class, array('createQuery'), array($this->mockObjectManager));
+        $repository = $this->getMockBuilder(\TYPO3\CMS\Extbase\Persistence\Repository::class)
+            ->setMethods(array('createQuery'))
+            ->setConstructorArgs(array($this->mockObjectManager))
+            ->getMock();
         $repository->expects($this->once())->method('createQuery')->will($this->returnValue($mockQuery));
 
         $this->assertSame($expectedResult, $repository->findAll());
@@ -153,7 +156,7 @@ class RepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $identifier = '42';
         $object = new \stdClass();
 
-        $expectedResult = $this->getMock(\TYPO3\CMS\Extbase\Persistence\QueryResultInterface::class);
+        $expectedResult = $this->createMock(\TYPO3\CMS\Extbase\Persistence\QueryResultInterface::class);
         $expectedResult->expects($this->once())->method('getFirst')->will($this->returnValue($object));
 
         $this->mockQuery->expects($this->any())->method('getQuerySettings')->will($this->returnValue($this->mockQuerySettings));
@@ -171,7 +174,7 @@ class RepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function addDelegatesToPersistenceManager()
     {
         $object = new \stdClass();
-        $mockPersistenceManager = $this->getMock(\TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface::class);
+        $mockPersistenceManager = $this->createMock(\TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface::class);
         $mockPersistenceManager->expects($this->once())->method('add')->with($object);
         $this->inject($this->repository, 'persistenceManager', $mockPersistenceManager);
         $this->repository->_set('objectType', get_class($object));
@@ -184,7 +187,7 @@ class RepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function removeDelegatesToPersistenceManager()
     {
         $object = new \stdClass();
-        $mockPersistenceManager = $this->getMock(\TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface::class);
+        $mockPersistenceManager = $this->createMock(\TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface::class);
         $mockPersistenceManager->expects($this->once())->method('remove')->with($object);
         $this->inject($this->repository, 'persistenceManager', $mockPersistenceManager);
         $this->repository->_set('objectType', get_class($object));
@@ -197,7 +200,7 @@ class RepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function updateDelegatesToPersistenceManager()
     {
         $object = new \stdClass();
-        $mockPersistenceManager = $this->getMock(\TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface::class);
+        $mockPersistenceManager = $this->createMock(\TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface::class);
         $mockPersistenceManager->expects($this->once())->method('update')->with($object);
         $this->inject($this->repository, 'persistenceManager', $mockPersistenceManager);
         $this->repository->_set('objectType', get_class($object));
@@ -209,13 +212,16 @@ class RepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function magicCallMethodAcceptsFindBySomethingCallsAndExecutesAQueryWithThatCriteria()
     {
-        $mockQueryResult = $this->getMock(\TYPO3\CMS\Extbase\Persistence\QueryResultInterface::class);
-        $mockQuery = $this->getMock(\TYPO3\CMS\Extbase\Persistence\QueryInterface::class);
+        $mockQueryResult = $this->createMock(\TYPO3\CMS\Extbase\Persistence\QueryResultInterface::class);
+        $mockQuery = $this->createMock(\TYPO3\CMS\Extbase\Persistence\QueryInterface::class);
         $mockQuery->expects($this->once())->method('equals')->with('foo', 'bar')->will($this->returnValue('matchCriteria'));
         $mockQuery->expects($this->once())->method('matching')->with('matchCriteria')->will($this->returnValue($mockQuery));
         $mockQuery->expects($this->once())->method('execute')->with()->will($this->returnValue($mockQueryResult));
 
-        $repository = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Repository::class, array('createQuery'), array($this->mockObjectManager));
+        $repository = $this->getMockBuilder(\TYPO3\CMS\Extbase\Persistence\Repository::class)
+            ->setMethods(array('createQuery'))
+            ->setConstructorArgs(array($this->mockObjectManager))
+            ->getMock();
         $repository->expects($this->once())->method('createQuery')->will($this->returnValue($mockQuery));
 
         $this->assertSame($mockQueryResult, $repository->findByFoo('bar'));
@@ -227,15 +233,18 @@ class RepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function magicCallMethodAcceptsFindOneBySomethingCallsAndExecutesAQueryWithThatCriteria()
     {
         $object = new \stdClass();
-        $mockQueryResult = $this->getMock(\TYPO3\CMS\Extbase\Persistence\QueryResultInterface::class);
+        $mockQueryResult = $this->createMock(\TYPO3\CMS\Extbase\Persistence\QueryResultInterface::class);
         $mockQueryResult->expects($this->once())->method('getFirst')->will($this->returnValue($object));
-        $mockQuery = $this->getMock(\TYPO3\CMS\Extbase\Persistence\QueryInterface::class);
+        $mockQuery = $this->createMock(\TYPO3\CMS\Extbase\Persistence\QueryInterface::class);
         $mockQuery->expects($this->once())->method('equals')->with('foo', 'bar')->will($this->returnValue('matchCriteria'));
         $mockQuery->expects($this->once())->method('matching')->with('matchCriteria')->will($this->returnValue($mockQuery));
         $mockQuery->expects($this->once())->method('setLimit')->will($this->returnValue($mockQuery));
         $mockQuery->expects($this->once())->method('execute')->will($this->returnValue($mockQueryResult));
 
-        $repository = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Repository::class, array('createQuery'), array($this->mockObjectManager));
+        $repository = $this->getMockBuilder(\TYPO3\CMS\Extbase\Persistence\Repository::class)
+            ->setMethods(array('createQuery'))
+            ->setConstructorArgs(array($this->mockObjectManager))
+            ->getMock();
         $repository->expects($this->once())->method('createQuery')->will($this->returnValue($mockQuery));
 
         $this->assertSame($object, $repository->findOneByFoo('bar'));
@@ -246,14 +255,17 @@ class RepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function magicCallMethodAcceptsCountBySomethingCallsAndExecutesAQueryWithThatCriteria()
     {
-        $mockQuery = $this->getMock(\TYPO3\CMS\Extbase\Persistence\QueryInterface::class);
-        $mockQueryResult = $this->getMock(\TYPO3\CMS\Extbase\Persistence\QueryResultInterface::class);
+        $mockQuery = $this->createMock(\TYPO3\CMS\Extbase\Persistence\QueryInterface::class);
+        $mockQueryResult = $this->createMock(\TYPO3\CMS\Extbase\Persistence\QueryResultInterface::class);
         $mockQuery->expects($this->once())->method('equals')->with('foo', 'bar')->will($this->returnValue('matchCriteria'));
         $mockQuery->expects($this->once())->method('matching')->with('matchCriteria')->will($this->returnValue($mockQuery));
         $mockQuery->expects($this->once())->method('execute')->will($this->returnValue($mockQueryResult));
         $mockQueryResult->expects($this->once())->method('count')->will($this->returnValue(2));
 
-        $repository = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Repository::class, array('createQuery'), array($this->mockObjectManager));
+        $repository = $this->getMockBuilder(\TYPO3\CMS\Extbase\Persistence\Repository::class)
+            ->setMethods(array('createQuery'))
+            ->setConstructorArgs(array($this->mockObjectManager))
+            ->getMock();
         $repository->expects($this->once())->method('createQuery')->will($this->returnValue($mockQuery));
 
         $this->assertSame(2, $repository->countByFoo('bar'));
@@ -266,7 +278,10 @@ class RepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $this->expectException(UnsupportedMethodException::class);
         $this->expectExceptionCode(1233180480);
-        $repository = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Repository::class, array('createQuery'), array($this->mockObjectManager));
+        $repository = $this->getMockBuilder(\TYPO3\CMS\Extbase\Persistence\Repository::class)
+            ->setMethods(array('createQuery'))
+            ->setConstructorArgs(array($this->mockObjectManager))
+            ->getMock();
         $repository->__call('foo', array());
     }
 
@@ -348,7 +363,7 @@ class RepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function createQueryReturnsQueryWithUnmodifiedDefaultQuerySettings()
     {
         $this->mockQuery = new \TYPO3\CMS\Extbase\Persistence\Generic\Query('foo');
-        $mockDefaultQuerySettings = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface::class);
+        $mockDefaultQuerySettings = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface::class);
         $this->repository->setDefaultQuerySettings($mockDefaultQuerySettings);
         $query = $this->repository->createQuery();
         $instanceQuerySettings = $query->getQuerySettings();
@@ -363,7 +378,10 @@ class RepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $fakeUid = '123';
         $object = new \stdClass();
-        $repository = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Repository::class, array('findByIdentifier'), array($this->mockObjectManager));
+        $repository = $this->getMockBuilder(\TYPO3\CMS\Extbase\Persistence\Repository::class)
+            ->setMethods(array('findByIdentifier'))
+            ->setConstructorArgs(array($this->mockObjectManager))
+            ->getMock();
         $expectedResult = $object;
         $repository->expects($this->once())->method('findByIdentifier')->will($this->returnValue($object));
         $actualResult = $repository->findByUid($fakeUid);
diff --git a/typo3/sysext/extbase/Tests/Unit/Property/PropertyMapperTest.php b/typo3/sysext/extbase/Tests/Unit/Property/PropertyMapperTest.php
index 151cf82b0e42d37deb8284eea24eb1392a385414..cd87e5b23cb564cfc9b995fb2322566d0c75b59a 100644
--- a/typo3/sysext/extbase/Tests/Unit/Property/PropertyMapperTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Property/PropertyMapperTest.php
@@ -44,8 +44,8 @@ class PropertyMapperTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     protected function setUp()
     {
-        $this->mockConfigurationBuilder = $this->getMock(\TYPO3\CMS\Extbase\Property\PropertyMappingConfigurationBuilder::class);
-        $this->mockConfiguration = $this->getMock(\TYPO3\CMS\Extbase\Property\PropertyMappingConfigurationInterface::class);
+        $this->mockConfigurationBuilder = $this->createMock(\TYPO3\CMS\Extbase\Property\PropertyMappingConfigurationBuilder::class);
+        $this->mockConfiguration = $this->createMock(\TYPO3\CMS\Extbase\Property\PropertyMappingConfigurationInterface::class);
     }
 
     /**
@@ -110,7 +110,7 @@ class PropertyMapperTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     protected function getMockTypeConverter($name = '', $canConvertFrom = true, $properties = array(), $typeOfSubObject = '')
     {
-        $mockTypeConverter = $this->getMock(\TYPO3\CMS\Extbase\Property\TypeConverterInterface::class);
+        $mockTypeConverter = $this->createMock(\TYPO3\CMS\Extbase\Property\TypeConverterInterface::class);
         $mockTypeConverter->_name = $name;
         $mockTypeConverter->expects($this->any())->method('canConvertFrom')->will($this->returnValue($canConvertFrom));
         $mockTypeConverter->expects($this->any())->method('convertFrom')->will($this->returnValue($name));
diff --git a/typo3/sysext/extbase/Tests/Unit/Property/PropertyMappingConfigurationTest.php b/typo3/sysext/extbase/Tests/Unit/Property/PropertyMappingConfigurationTest.php
index 9f29ff69f5becfed757b46ca690db3b4a740d561..79b998d28866258239705d54cbb8ee4226c5b27d 100644
--- a/typo3/sysext/extbase/Tests/Unit/Property/PropertyMappingConfigurationTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Property/PropertyMappingConfigurationTest.php
@@ -174,7 +174,7 @@ class PropertyMappingConfigurationTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
      */
     public function getTypeConverterReturnsTypeConverterIfItHasBeenSet()
     {
-        $mockTypeConverter = $this->getMock(\TYPO3\CMS\Extbase\Property\TypeConverterInterface::class);
+        $mockTypeConverter = $this->createMock(\TYPO3\CMS\Extbase\Property\TypeConverterInterface::class);
         $this->propertyMappingConfiguration->setTypeConverter($mockTypeConverter);
         $this->assertSame($mockTypeConverter, $this->propertyMappingConfiguration->getTypeConverter());
     }
@@ -214,7 +214,7 @@ class PropertyMappingConfigurationTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
             array('setMapping', array('k1', 'k1a')),
             array('setTypeConverterOptions', array($mockTypeConverterClass, array('k1' => 'v1', 'k2' => 'v2'))),
             array('setTypeConverterOption', array($mockTypeConverterClass, 'k1', 'v3')),
-            array('setTypeConverter', array($this->getMock(\TYPO3\CMS\Extbase\Property\TypeConverterInterface::class))),
+            array('setTypeConverter', array($this->createMock(\TYPO3\CMS\Extbase\Property\TypeConverterInterface::class))),
         );
     }
 
diff --git a/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/DateTimeConverterTest.php b/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/DateTimeConverterTest.php
index c700fbb51d2be8e282cf7a4a5b4641d84fcba53a..2c1a7fb3f01134c6788cf7ce9baf1199238ebfbf 100644
--- a/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/DateTimeConverterTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/DateTimeConverterTest.php
@@ -101,7 +101,7 @@ class DateTimeConverterTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function convertFromUsesDefaultDateFormatIfItIsNotConfigured()
     {
         $expectedResult = '1980-12-13T20:15:07+01:23';
-        $mockMappingConfiguration = $this->getMock(\TYPO3\CMS\Extbase\Property\PropertyMappingConfigurationInterface::class);
+        $mockMappingConfiguration = $this->createMock(\TYPO3\CMS\Extbase\Property\PropertyMappingConfigurationInterface::class);
         $mockMappingConfiguration
                 ->expects($this->atLeastOnce())
                 ->method('getConfigurationValue')
@@ -150,7 +150,7 @@ class DateTimeConverterTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function convertFromStringTests($source, $dateFormat, $isValid)
     {
         if ($dateFormat !== null) {
-            $mockMappingConfiguration = $this->getMock(\TYPO3\CMS\Extbase\Property\PropertyMappingConfigurationInterface::class);
+            $mockMappingConfiguration = $this->createMock(\TYPO3\CMS\Extbase\Property\PropertyMappingConfigurationInterface::class);
             $mockMappingConfiguration
                     ->expects($this->atLeastOnce())
                     ->method('getConfigurationValue')
@@ -394,7 +394,7 @@ class DateTimeConverterTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $dateFormat = isset($source['dateFormat']) && $source['dateFormat'] !== '' ? $source['dateFormat'] : null;
         if ($dateFormat !== null) {
-            $mockMappingConfiguration = $this->getMock(\TYPO3\CMS\Extbase\Property\PropertyMappingConfigurationInterface::class);
+            $mockMappingConfiguration = $this->createMock(\TYPO3\CMS\Extbase\Property\PropertyMappingConfigurationInterface::class);
             $mockMappingConfiguration
                     ->expects($this->atLeastOnce())
                     ->method('getConfigurationValue')
diff --git a/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/FloatConverterTest.php b/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/FloatConverterTest.php
index e55017a5f1e3a8cdc3a560260fd4560080b2cf9a..7c406455a5d5470a77d5b958acf7e1feb4f6679a 100644
--- a/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/FloatConverterTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/FloatConverterTest.php
@@ -75,7 +75,7 @@ class FloatConverterTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function convertFromShouldRespectConfiguration()
     {
-        $mockMappingConfiguration = $this->getMock(\TYPO3\CMS\Extbase\Property\PropertyMappingConfigurationInterface::class);
+        $mockMappingConfiguration = $this->createMock(\TYPO3\CMS\Extbase\Property\PropertyMappingConfigurationInterface::class);
         $mockMappingConfiguration
             ->expects($this->at(0))
             ->method('getConfigurationValue')
diff --git a/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/ObjectConverterTest.php b/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/ObjectConverterTest.php
index c75c332f297789e71a24a87e4f9797730c276c0f..7c614538eaecac5b197dc61cffb7c0618450e614 100644
--- a/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/ObjectConverterTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/ObjectConverterTest.php
@@ -55,9 +55,9 @@ class ObjectConverterTest extends UnitTestCase
      */
     protected function setUp()
     {
-        $this->mockReflectionService = $this->getMock(\TYPO3\CMS\Extbase\Reflection\ReflectionService::class);
-        $this->mockObjectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
-        $this->mockContainer = $this->getMock(\TYPO3\CMS\Extbase\Object\Container\Container::class);
+        $this->mockReflectionService = $this->createMock(\TYPO3\CMS\Extbase\Reflection\ReflectionService::class);
+        $this->mockObjectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
+        $this->mockContainer = $this->createMock(\TYPO3\CMS\Extbase\Object\Container\Container::class);
 
         $this->converter = new ObjectConverter();
         $this->inject($this->converter, 'reflectionService', $this->mockReflectionService);
diff --git a/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/PersistentObjectConverterTest.php b/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/PersistentObjectConverterTest.php
index 8db770a0965ce36b71a70ff1a049f681291a110f..32ac0a50ef85b661354759c76f3a5f952bd6b68d 100644
--- a/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/PersistentObjectConverterTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/PersistentObjectConverterTest.php
@@ -68,13 +68,13 @@ class PersistentObjectConverterTest extends UnitTestCase
     protected function setUp()
     {
         $this->converter = new PersistentObjectConverter();
-        $this->mockReflectionService = $this->getMock(\TYPO3\CMS\Extbase\Reflection\ReflectionService::class);
+        $this->mockReflectionService = $this->createMock(\TYPO3\CMS\Extbase\Reflection\ReflectionService::class);
         $this->inject($this->converter, 'reflectionService', $this->mockReflectionService);
 
-        $this->mockPersistenceManager = $this->getMock(\TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface::class);
+        $this->mockPersistenceManager = $this->createMock(\TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface::class);
         $this->inject($this->converter, 'persistenceManager', $this->mockPersistenceManager);
 
-        $this->mockObjectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class, array());
+        $this->mockObjectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
         $this->mockObjectManager->expects($this->any())
             ->method('get')
             ->will($this->returnCallback(function ($className, ...$arguments) {
@@ -87,7 +87,7 @@ class PersistentObjectConverterTest extends UnitTestCase
                 }));
         $this->inject($this->converter, 'objectManager', $this->mockObjectManager);
 
-        $this->mockContainer = $this->getMock(\TYPO3\CMS\Extbase\Object\Container\Container::class);
+        $this->mockContainer = $this->createMock(\TYPO3\CMS\Extbase\Object\Container\Container::class);
         $this->inject($this->converter, 'objectContainer', $this->mockContainer);
     }
 
@@ -256,15 +256,17 @@ class PersistentObjectConverterTest extends UnitTestCase
      */
     public function setupMockQuery($numberOfResults, $howOftenIsGetFirstCalled)
     {
-        $mockClassSchema = $this->getMock(\TYPO3\CMS\Extbase\Reflection\ClassSchema::class, array(), array('Dummy'));
+        $mockClassSchema = $this->getMockBuilder(\TYPO3\CMS\Extbase\Reflection\ClassSchema::class)
+            ->setConstructorArgs(array('Dummy'))
+            ->getMock();
         $mockClassSchema->expects($this->any())->method('getIdentityProperties')->will($this->returnValue(array('key1' => 'someType')));
         $this->mockReflectionService->expects($this->any())->method('getClassSchema')->with('SomeType')->will($this->returnValue($mockClassSchema));
 
         $mockConstraint = $this->getMockBuilder(\TYPO3\CMS\Extbase\Persistence\Generic\Qom\Comparison::class)->disableOriginalConstructor()->getMock();
 
         $mockObject = new \stdClass();
-        $mockQuery = $this->getMock(\TYPO3\CMS\Extbase\Persistence\QueryInterface::class);
-        $mockQueryResult = $this->getMock(\TYPO3\CMS\Extbase\Persistence\QueryResultInterface::class);
+        $mockQuery = $this->createMock(\TYPO3\CMS\Extbase\Persistence\QueryInterface::class);
+        $mockQueryResult = $this->createMock(\TYPO3\CMS\Extbase\Persistence\QueryResultInterface::class);
         $mockQueryResult->expects($this->any())->method('count')->will($this->returnValue($numberOfResults));
         $mockQueryResult->expects($howOftenIsGetFirstCalled)->method('getFirst')->will($this->returnValue($mockObject));
         $mockQuery->expects($this->any())->method('equals')->with('key1', 'value1')->will($this->returnValue($mockConstraint));
diff --git a/typo3/sysext/extbase/Tests/Unit/Reflection/ClassSchemaTest.php b/typo3/sysext/extbase/Tests/Unit/Reflection/ClassSchemaTest.php
index 9acb2702d34f10264f38b64b1d47997c153a804b..ab5d97297e1a4510f8ff9dc7ceb993bf5f0c22be 100644
--- a/typo3/sysext/extbase/Tests/Unit/Reflection/ClassSchemaTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Reflection/ClassSchemaTest.php
@@ -35,7 +35,7 @@ class ClassSchemaTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 		');
 
         /** @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject $objectManager */
-        $objectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
+        $objectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
         $mockClassSchema = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Reflection\ClassSchema::class, array('dummy'), array('Foo\\Bar\\Domain\\Model\\' . $className));
         $objectManager->expects($this->once())->method('get')->will($this->returnValue($mockClassSchema));
 
@@ -60,7 +60,7 @@ class ClassSchemaTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 		');
 
         /** @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject $objectManager */
-        $objectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
+        $objectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
         $mockClassSchema = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Reflection\ClassSchema::class, array('dummy'), array('Foo_Bar_Domain_Model_' . $className));
         $objectManager->expects($this->once())->method('get')->will($this->returnValue($mockClassSchema));
 
diff --git a/typo3/sysext/extbase/Tests/Unit/Scheduler/FieldProviderTest.php b/typo3/sysext/extbase/Tests/Unit/Scheduler/FieldProviderTest.php
index 0b343ba33c377a6f15af4e1f5e209dcb9d6f11f7..d953f6d35d465d8099140be676da87390e824001 100644
--- a/typo3/sysext/extbase/Tests/Unit/Scheduler/FieldProviderTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Scheduler/FieldProviderTest.php
@@ -59,7 +59,9 @@ class FieldProviderTest extends UnitTestCase
         $command3->expects($this->once())->method('getCommandIdentifier')->will($this->returnValue('extbase:mockc:funcc'));
 
         /** @var CommandManager|\PHPUnit_Framework_MockObject_MockObject $commandManager */
-        $commandManager = $this->getMock(CommandManager::class, array('getAvailableCommands'));
+        $commandManager = $this->getMockBuilder(CommandManager::class)
+            ->setMethods(array('getAvailableCommands'))
+            ->getMock();
         $commandManager->expects($this->any())->method('getAvailableCommands')->will($this->returnValue(array($command1, $command2, $command3)));
 
         /** @var FieldProvider|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface $fieldProvider */
@@ -92,7 +94,9 @@ class FieldProviderTest extends UnitTestCase
         $command->method('getCommandIdentifier')->will($this->returnValue('extbase:mocka:funca'));
 
         /** @var CommandManager|\PHPUnit_Framework_MockObject_MockObject $commandManager */
-        $commandManager = $this->getMock(CommandManager::class, array('getAvailableCommands'));
+        $commandManager = $this->getMockBuilder(CommandManager::class)
+            ->setMethods(array('getAvailableCommands'))
+            ->getMock();
         $commandManager->expects($this->any())->method('getAvailableCommands')->will($this->returnValue(array($command)));
 
         /** @var FieldProvider|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface $fieldProvider */
@@ -123,7 +127,9 @@ class FieldProviderTest extends UnitTestCase
         $command->method('getCommandIdentifier')->will($this->returnValue('extbase:mocka:funca'));
 
         /** @var CommandManager|\PHPUnit_Framework_MockObject_MockObject $commandManager */
-        $commandManager = $this->getMock(CommandManager::class, array('getAvailableCommands'));
+        $commandManager = $this->getMockBuilder(CommandManager::class)
+            ->setMethods(array('getAvailableCommands'))
+            ->getMock();
         $commandManager->expects($this->any())->method('getAvailableCommands')->will($this->returnValue(array($command)));
 
         /** @var FieldProvider|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface $fieldProvider */
@@ -166,7 +172,7 @@ class FieldProviderTest extends UnitTestCase
         );
         $submittedData = array();
         /** @var SchedulerModuleController $schedulerModule */
-        $schedulerModule = $this->getMock(SchedulerModuleController::class, array(), array(), '', false);
+        $schedulerModule = $this->createMock(SchedulerModuleController::class);
         $this->assertTrue($fieldProvider->validateAdditionalFields($submittedData, $schedulerModule));
     }
 
@@ -200,7 +206,9 @@ class FieldProviderTest extends UnitTestCase
         $command3->expects($this->any())->method('getCommandIdentifier')->will($this->returnValue('extbase:mockc:funcc'));
 
         /** @var CommandManager|\PHPUnit_Framework_MockObject_MockObject $commandManager */
-        $commandManager = $this->getMock(CommandManager::class, array('getAvailableCommands'));
+        $commandManager = $this->getMockBuilder(CommandManager::class)
+            ->setMethods(array('getAvailableCommands'))
+            ->getMock();
         $commandManager->expects($this->any())->method('getAvailableCommands')->will($this->returnValue(array($command1, $command2, $command3)));
 
         /** @var FieldProvider|\PHPUnit_Framework_MockObject_MockObject|\|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface $fieldProvider */
@@ -245,7 +253,7 @@ class FieldProviderTest extends UnitTestCase
         $task = new Task();
         $task->setCommandIdentifier($command1->getCommandIdentifier());
         /** @var SchedulerModuleController $schedulerModule */
-        $schedulerModule = $this->getMock(SchedulerModuleController::class, array(), array(), '', false);
+        $schedulerModule = $this->createMock(SchedulerModuleController::class);
 
         $this->assertEquals($expectedAdditionalFields, $fieldProvider->getAdditionalFields($taskInfo, $task, $schedulerModule));
     }
diff --git a/typo3/sysext/extbase/Tests/Unit/Scheduler/TaskTest.php b/typo3/sysext/extbase/Tests/Unit/Scheduler/TaskTest.php
index b6055428050d07f0c13f7d12ef6bb7a23fe2bf09..2140f88327639f61a5e2a89b54fa2dc645b0a6d5 100644
--- a/typo3/sysext/extbase/Tests/Unit/Scheduler/TaskTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Scheduler/TaskTest.php
@@ -31,7 +31,10 @@ class TaskTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 
     protected function setUp()
     {
-        $this->taskExecutor = $this->getMock(\TYPO3\CMS\Extbase\Scheduler\TaskExecutor::class, array('execute'), array(), '', false);
+        $this->taskExecutor = $this->getMockBuilder(\TYPO3\CMS\Extbase\Scheduler\TaskExecutor::class)
+            ->setMethods(array('execute'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->task = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Scheduler\Task::class, array('logException', '__wakeup'), array(), '', false);
     }
 
diff --git a/typo3/sysext/extbase/Tests/Unit/Service/CacheServiceTest.php b/typo3/sysext/extbase/Tests/Unit/Service/CacheServiceTest.php
index 6944b19c36e1bf20666a0895e3e075e220dfb0aa..f7bfa43d7f82b72196b684ddabb5e69b677a3313 100644
--- a/typo3/sysext/extbase/Tests/Unit/Service/CacheServiceTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Service/CacheServiceTest.php
@@ -32,7 +32,7 @@ class CacheServiceTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     protected function setUp()
     {
         $this->cacheService = new \TYPO3\CMS\Extbase\Service\CacheService();
-        $this->cacheManagerMock = $this->getMock(\TYPO3\CMS\Core\Cache\CacheManager::class);
+        $this->cacheManagerMock = $this->createMock(\TYPO3\CMS\Core\Cache\CacheManager::class);
         $this->cacheService->injectCacheManager($this->cacheManagerMock);
     }
 
diff --git a/typo3/sysext/extbase/Tests/Unit/Service/ExtensionServiceTest.php b/typo3/sysext/extbase/Tests/Unit/Service/ExtensionServiceTest.php
index a6f2b48e15b172aecc0a0170711fed7cdc44e371..913cbcdca25e7e5f5fde23ffe0b123a1f75540d7 100644
--- a/typo3/sysext/extbase/Tests/Unit/Service/ExtensionServiceTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Service/ExtensionServiceTest.php
@@ -41,11 +41,13 @@ class ExtensionServiceTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 
     protected function setUp()
     {
-        $GLOBALS['TYPO3_DB'] = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array('fullQuoteStr', 'exec_SELECTgetRows'));
+        $GLOBALS['TYPO3_DB'] = $this->getMockBuilder(\TYPO3\CMS\Core\Database\DatabaseConnection::class)
+            ->setMethods(array('fullQuoteStr', 'exec_SELECTgetRows'))
+            ->getMock();
         $GLOBALS['TSFE'] = new \stdClass();
         $GLOBALS['TSFE']->gr_list = '';
         $this->extensionService = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Service\ExtensionService::class, array('dummy'));
-        $this->mockConfigurationManager = $this->getMock(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::class);
+        $this->mockConfigurationManager = $this->createMock(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::class);
         $this->extensionService->_set('configurationManager', $this->mockConfigurationManager);
         $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['extbase']['extensions'] = array(
             'ExtensionName' => array(
diff --git a/typo3/sysext/extbase/Tests/Unit/Service/FlexFormServiceTest.php b/typo3/sysext/extbase/Tests/Unit/Service/FlexFormServiceTest.php
index a9a951058dc567c55eae9fbe05c900c8a86f3bc4..5cc0c10d42ebe08c9394c057d766e1bc0a5c23a8 100644
--- a/typo3/sysext/extbase/Tests/Unit/Service/FlexFormServiceTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Service/FlexFormServiceTest.php
@@ -109,12 +109,15 @@ class FlexFormServiceTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 
         // The subject calls xml2array statically, which calls getHash and setHash statically, which uses
         // caches, those need to be mocked.
-        $cacheManagerMock = $this->getMock(\TYPO3\CMS\Core\Cache\CacheManager::class, array(), array(), '', false);
-        $cacheMock = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class, array(), array(), '', false);
+        $cacheManagerMock = $this->createMock(\TYPO3\CMS\Core\Cache\CacheManager::class);
+        $cacheMock = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class);
         $cacheManagerMock->expects($this->any())->method('getCache')->will($this->returnValue($cacheMock));
         GeneralUtility::setSingletonInstance(\TYPO3\CMS\Core\Cache\CacheManager::class, $cacheManagerMock);
 
-        $flexFormService = $this->getMock(\TYPO3\CMS\Extbase\Service\FlexFormService::class, array('dummy'), array(), '', false);
+        $flexFormService = $this->getMockBuilder(\TYPO3\CMS\Extbase\Service\FlexFormService::class)
+            ->setMethods(array('dummy'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $convertedFlexFormArray = $flexFormService->convertFlexFormContentToArray($input);
         $this->assertSame($expected, $convertedFlexFormArray);
     }
diff --git a/typo3/sysext/extbase/Tests/Unit/Service/ImageScriptServiceTest.php b/typo3/sysext/extbase/Tests/Unit/Service/ImageScriptServiceTest.php
index 25a48efaca5c460cb131c17e9a232a8158951325..63d78f3ec65ab5202625fd848e21c0c5d28f44bb 100644
--- a/typo3/sysext/extbase/Tests/Unit/Service/ImageScriptServiceTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Service/ImageScriptServiceTest.php
@@ -42,7 +42,7 @@ class ImageScriptServiceTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     protected function setUp()
     {
         $this->subject = new ImageService();
-        $this->environmentService = $this->getMock(EnvironmentService::class);
+        $this->environmentService = $this->createMock(EnvironmentService::class);
         $this->inject($this->subject, 'environmentService', $this->environmentService);
         GeneralUtility::flushInternalRuntimeCaches();
         $_SERVER['HTTP_HOST'] = 'foo.bar';
@@ -54,8 +54,8 @@ class ImageScriptServiceTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function fileIsUnwrappedFromReferenceForProcessing()
     {
         $reference = $this->getAccessibleMock(FileReference::class, array(), array(), '', false);
-        $file = $this->getMock(File::class, array(), array(), '', false);
-        $file->expects($this->once())->method('process')->willReturn($this->getMock(ProcessedFile::class, array(), array(), '', false));
+        $file = $this->createMock(File::class);
+        $file->expects($this->once())->method('process')->willReturn($this->createMock(ProcessedFile::class));
         $reference->expects($this->once())->method('getOriginalFile')->willReturn($file);
         $reference->_set('file', $file);
 
@@ -84,7 +84,7 @@ class ImageScriptServiceTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $GLOBALS['TSFE'] = new \stdClass();
         $GLOBALS['TSFE']->absRefPrefix = '/prefix/';
 
-        $file = $this->getMock(File::class, array(), array(), '', false);
+        $file = $this->createMock(File::class);
         $file->expects($this->once())->method('getPublicUrl')->willReturn($imageUri);
 
         $this->assertSame($expected, $this->subject->getImageUri($file));
@@ -112,7 +112,7 @@ class ImageScriptServiceTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $GLOBALS['TSFE'] = new \stdClass();
         $GLOBALS['TSFE']->absRefPrefix = '/prefix/';
 
-        $file = $this->getMock(File::class, array(), array(), '', false);
+        $file = $this->createMock(File::class);
         $file->expects($this->once())->method('getPublicUrl')->willReturn($imageUri);
 
         $this->assertSame($expected, $this->subject->getImageUri($file, true));
diff --git a/typo3/sysext/extbase/Tests/Unit/SignalSlot/DispatcherTest.php b/typo3/sysext/extbase/Tests/Unit/SignalSlot/DispatcherTest.php
index 7ba4f01fc4b49de24c13f1325807bd091ab7839c..d78674a9ccfa245c86dd33c0d64c75bbc2aabab8 100644
--- a/typo3/sysext/extbase/Tests/Unit/SignalSlot/DispatcherTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/SignalSlot/DispatcherTest.php
@@ -40,8 +40,12 @@ class DispatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function connectAllowsForConnectingASlotWithASignal()
     {
-        $mockSignal = $this->getMock('ClassA', array('emitSomeSignal'));
-        $mockSlot = $this->getMock('ClassB', array('someSlotMethod'));
+        $mockSignal = $this->getMockBuilder('ClassA')
+            ->setMethods(array('emitSomeSignal'))
+            ->getMock();
+        $mockSlot = $this->getMockBuilder('ClassB')
+            ->setMethods(array('someSlotMethod'))
+            ->getMock();
         $this->signalSlotDispatcher->connect(get_class($mockSignal), 'emitSomeSignal', get_class($mockSlot), 'someSlotMethod', true);
         $expectedSlots = array(
             array('class' => get_class($mockSlot), 'method' => 'someSlotMethod', 'object' => null, 'passSignalInformation' => true)
@@ -54,8 +58,12 @@ class DispatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function connectAlsoAcceptsObjectsInPlaceOfTheClassName()
     {
-        $mockSignal = $this->getMock('ClassA', array('emitSomeSignal'));
-        $mockSlot = $this->getMock('ClassB', array('someSlotMethod'));
+        $mockSignal = $this->getMockBuilder('ClassA')
+            ->setMethods(array('emitSomeSignal'))
+            ->getMock();
+        $mockSlot = $this->getMockBuilder('ClassB')
+            ->setMethods(array('someSlotMethod'))
+            ->getMock();
         $this->signalSlotDispatcher->connect(get_class($mockSignal), 'emitSomeSignal', $mockSlot, 'someSlotMethod', true);
         $expectedSlots = array(
             array('class' => null, 'method' => 'someSlotMethod', 'object' => $mockSlot, 'passSignalInformation' => true)
@@ -68,7 +76,9 @@ class DispatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function connectAlsoAcceptsClosuresActingAsASlot()
     {
-        $mockSignal = $this->getMock('ClassA', array('emitSomeSignal'));
+        $mockSignal = $this->getMockBuilder('ClassA')
+            ->setMethods(array('emitSomeSignal'))
+            ->getMock();
         $mockSlot = function () {
         };
         $this->signalSlotDispatcher->connect(get_class($mockSignal), 'emitSomeSignal', $mockSlot, 'foo', true);
@@ -99,7 +109,7 @@ class DispatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $slotClassName = OnlyClassNameSpecifiedFixture::class;
         $mockSlot = new OnlyClassNameSpecifiedFixture();
-        $mockObjectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
+        $mockObjectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
         $mockObjectManager->expects($this->once())->method('isRegistered')->with($slotClassName)->will($this->returnValue(true));
         $mockObjectManager->expects($this->once())->method('get')->with($slotClassName)->will($this->returnValue($mockSlot));
         $this->signalSlotDispatcher->_set('objectManager', $mockObjectManager);
@@ -116,7 +126,7 @@ class DispatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $this->signalSlotDispatcher->_set('isInitialized', true);
 
-        $firstMockSlot = $this->getMock(\TYPO3\CMS\Extbase\Tests\Fixture\SlotFixture::class);
+        $firstMockSlot = $this->createMock(\TYPO3\CMS\Extbase\Tests\Fixture\SlotFixture::class);
         $firstMockSlot->expects($this->once())
             ->method('slot')
             ->will($this->returnCallback(
@@ -124,7 +134,7 @@ class DispatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                             return array('modified_' . $foo, 'modified_' . $baz);}
                     ));
 
-        $secondMockSlot = $this->getMock(\TYPO3\CMS\Extbase\Tests\Fixture\SlotFixture::class);
+        $secondMockSlot = $this->createMock(\TYPO3\CMS\Extbase\Tests\Fixture\SlotFixture::class);
         $secondMockSlot->expects($this->once())
             ->method('slot')
             ->with('modified_bar', 'modified_quux');
@@ -142,7 +152,7 @@ class DispatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $this->signalSlotDispatcher->_set('isInitialized', true);
 
-        $firstMockSlot = $this->getMock(\TYPO3\CMS\Extbase\Tests\Fixture\SlotFixture::class);
+        $firstMockSlot = $this->createMock(\TYPO3\CMS\Extbase\Tests\Fixture\SlotFixture::class);
         $firstMockSlot->expects($this->once())
             ->method('slot')
             ->will($this->returnCallback(
@@ -150,7 +160,7 @@ class DispatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                             return array('modified_' . $foo, 'modified_' . $baz);}
                     ));
 
-        $secondMockSlot = $this->getMock(\TYPO3\CMS\Extbase\Tests\Fixture\SlotFixture::class);
+        $secondMockSlot = $this->createMock(\TYPO3\CMS\Extbase\Tests\Fixture\SlotFixture::class);
         $secondMockSlot->expects($this->once())
             ->method('slot')
             ->with('modified_bar', 'modified_quux');
@@ -168,7 +178,7 @@ class DispatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $this->signalSlotDispatcher->_set('isInitialized', true);
 
-        $firstMockSlot = $this->getMock(\TYPO3\CMS\Extbase\Tests\Fixture\SlotFixture::class);
+        $firstMockSlot = $this->createMock(\TYPO3\CMS\Extbase\Tests\Fixture\SlotFixture::class);
         $firstMockSlot->expects($this->once())
             ->method('slot')
             ->will($this->returnCallback(
@@ -176,11 +186,11 @@ class DispatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                             return array('modified_' . $foo, 'modified_' . $baz);}
                     ));
 
-        $secondMockSlot = $this->getMock(\TYPO3\CMS\Extbase\Tests\Fixture\SlotFixture::class);
+        $secondMockSlot = $this->createMock(\TYPO3\CMS\Extbase\Tests\Fixture\SlotFixture::class);
         $secondMockSlot->expects($this->once())
             ->method('slot');
 
-        $thirdMockSlot = $this->getMock(\TYPO3\CMS\Extbase\Tests\Fixture\SlotFixture::class);
+        $thirdMockSlot = $this->createMock(\TYPO3\CMS\Extbase\Tests\Fixture\SlotFixture::class);
         $thirdMockSlot->expects($this->once())
             ->method('slot')
             ->with('modified_bar', 'modified_quux');
@@ -201,7 +211,7 @@ class DispatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->expectExceptionCode(1376683067);
         $this->signalSlotDispatcher->_set('isInitialized', true);
 
-        $mockSlot = $this->getMock(\TYPO3\CMS\Extbase\Tests\Fixture\SlotFixture::class);
+        $mockSlot = $this->createMock(\TYPO3\CMS\Extbase\Tests\Fixture\SlotFixture::class);
         $mockSlot->expects($this->once())
             ->method('slot')
             ->will($this->returnCallback(
@@ -222,7 +232,7 @@ class DispatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->expectExceptionCode(1376683066);
         $this->signalSlotDispatcher->_set('isInitialized', true);
 
-        $mockSlot = $this->getMock(\TYPO3\CMS\Extbase\Tests\Fixture\SlotFixture::class);
+        $mockSlot = $this->createMock(\TYPO3\CMS\Extbase\Tests\Fixture\SlotFixture::class);
         $mockSlot->expects($this->once())
             ->method('slot')
             ->will($this->returnCallback(
@@ -241,7 +251,7 @@ class DispatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $this->expectException(InvalidSlotException::class);
         $this->expectExceptionCode(1245673367);
-        $mockObjectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
+        $mockObjectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
         $mockObjectManager->expects($this->once())->method('isRegistered')->with('NonExistingClassName')->will($this->returnValue(false));
         $this->signalSlotDispatcher->_set('objectManager', $mockObjectManager);
         $this->signalSlotDispatcher->_set('isInitialized', true);
@@ -258,7 +268,7 @@ class DispatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->expectExceptionCode(1245673368);
         $slotClassName = SlotMethodDoesNotExistFixture::class;
         $mockSlot = new SlotMethodDoesNotExistFixture();
-        $mockObjectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
+        $mockObjectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
         $mockObjectManager->expects($this->once())->method('isRegistered')->with($slotClassName)->will($this->returnValue(true));
         $mockObjectManager->expects($this->once())->method('get')->with($slotClassName)->will($this->returnValue($mockSlot));
         $this->signalSlotDispatcher->_set('objectManager', $mockObjectManager);
@@ -277,7 +287,7 @@ class DispatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $mockSlot = function () use (&$arguments) {
             ($arguments = func_get_args());
         };
-        $mockObjectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
+        $mockObjectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
         $this->signalSlotDispatcher->connect('SignalClassName', 'methodName', $mockSlot, null, true);
         $this->signalSlotDispatcher->_set('objectManager', $mockObjectManager);
         $this->signalSlotDispatcher->_set('isInitialized', true);
diff --git a/typo3/sysext/extbase/Tests/Unit/Utility/DebuggerUtilityTest.php b/typo3/sysext/extbase/Tests/Unit/Utility/DebuggerUtilityTest.php
index 7c2cdbe1ab7c9072a5f5008c5992d8b6c8b54f9e..dd38f40c146178443e11f8f600073a2a05f28091 100644
--- a/typo3/sysext/extbase/Tests/Unit/Utility/DebuggerUtilityTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Utility/DebuggerUtilityTest.php
@@ -35,7 +35,9 @@ class DebuggerUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function debuggerRewindsInstancesOfIterator()
     {
         /** @var $objectStorage \TYPO3\CMS\Extbase\Persistence\ObjectStorage */
-        $objectStorage = $this->getMock(\TYPO3\CMS\Extbase\Persistence\ObjectStorage::class, array('dummy'));
+        $objectStorage = $this->getMockBuilder(\TYPO3\CMS\Extbase\Persistence\ObjectStorage::class)
+            ->setMethods(array('dummy'))
+            ->getMock();
         for ($i = 0; $i < 5; $i++) {
             $obj = new \stdClass();
             $obj->property = $i;
diff --git a/typo3/sysext/extbase/Tests/Unit/Utility/ExtensionUtilityTest.php b/typo3/sysext/extbase/Tests/Unit/Utility/ExtensionUtilityTest.php
index be9891547de545bfe4e7d9b6024a64994a8350c7..546aceb449512f76e823d8a975c07b861fe345cb 100644
--- a/typo3/sysext/extbase/Tests/Unit/Utility/ExtensionUtilityTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Utility/ExtensionUtilityTest.php
@@ -21,7 +21,9 @@ class ExtensionUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 {
     protected function setUp()
     {
-        $GLOBALS['TYPO3_DB'] = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array('fullQuoteStr', 'exec_SELECTgetRows'));
+        $GLOBALS['TYPO3_DB'] = $this->getMockBuilder(\TYPO3\CMS\Core\Database\DatabaseConnection::class)
+            ->setMethods(array('fullQuoteStr', 'exec_SELECTgetRows'))
+            ->getMock();
 
         $GLOBALS['TSFE'] = new \stdClass();
         $GLOBALS['TSFE']->tmpl = new \stdClass();
diff --git a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/AlphanumericValidatorTest.php b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/AlphanumericValidatorTest.php
index d8688738f2c32e4e8317e7c65f12cf7c97944309..e83e3f444d00c7117547ad48a6bdda710d768748 100644
--- a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/AlphanumericValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/AlphanumericValidatorTest.php
@@ -32,7 +32,9 @@ class AlphanumericValidatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function alphanumericValidatorShouldReturnNoErrorsForAnAlphanumericString()
     {
         /** @var \TYPO3\CMS\Extbase\Validation\Validator\AlphanumericValidator|\PHPUnit_Framework_MockObject_MockObject $subject */
-        $subject = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\AlphanumericValidator::class, array('translateErrorMessage'));
+        $subject = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\AlphanumericValidator::class)
+            ->setMethods(array('translateErrorMessage'))
+            ->getMock();
         $this->assertFalse($subject->validate('12ssDF34daweidf')->hasErrors());
     }
 
@@ -42,7 +44,9 @@ class AlphanumericValidatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function alphanumericValidatorReturnsErrorsForAStringWithSpecialCharacters()
     {
         /** @var \TYPO3\CMS\Extbase\Validation\Validator\AlphanumericValidator|\PHPUnit_Framework_MockObject_MockObject $subject */
-        $subject = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\AlphanumericValidator::class, array('translateErrorMessage'));
+        $subject = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\AlphanumericValidator::class)
+            ->setMethods(array('translateErrorMessage'))
+            ->getMock();
         $this->assertTrue($subject->validate('adsf%&/$jklsfdö')->hasErrors());
     }
 
@@ -52,7 +56,9 @@ class AlphanumericValidatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function alphanumericValidatorCreatesTheCorrectErrorForAnInvalidSubject()
     {
         /** @var \TYPO3\CMS\Extbase\Validation\Validator\AlphanumericValidator|\PHPUnit_Framework_MockObject_MockObject $subject */
-        $subject = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\AlphanumericValidator::class, array('translateErrorMessage'));
+        $subject = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\AlphanumericValidator::class)
+            ->setMethods(array('translateErrorMessage'))
+            ->getMock();
         $this->assertEquals(1, count($subject->validate('adsf%&/$jklsfdö')->getErrors()));
     }
 
@@ -62,7 +68,9 @@ class AlphanumericValidatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function alphanumericValidatorShouldReturnNoErrorsForAnAlphanumericUnicodeString()
     {
         /** @var \TYPO3\CMS\Extbase\Validation\Validator\AlphanumericValidator|\PHPUnit_Framework_MockObject_MockObject $subject */
-        $subject = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\AlphanumericValidator::class, array('translateErrorMessage'));
+        $subject = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\AlphanumericValidator::class)
+            ->setMethods(array('translateErrorMessage'))
+            ->getMock();
         $this->assertFalse($subject->validate('12ssDF34daweidfäøüößØœ你好')->hasErrors());
     }
 }
diff --git a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/BooleanValidatorTest.php b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/BooleanValidatorTest.php
index f63db25b32ee1a32021e2411950f83cda1708eef..d4cbcf5bd22cc09c472554b71b87d27c47a63fae 100644
--- a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/BooleanValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/BooleanValidatorTest.php
@@ -36,7 +36,10 @@ class BooleanValidatorTest extends \TYPO3\CMS\Extbase\Tests\Unit\Validation\Vali
     public function booleanValidatorReturnsNoErrorForAFalseStringExpectation()
     {
         $options = array('is' => 'false');
-        $validator = $this->getMock($this->validatorClassName, array('translateErrorMessage'), array($options));
+        $validator = $this->getMockBuilder($this->validatorClassName)
+            ->setMethods(array('translateErrorMessage'))
+            ->setConstructorArgs(array($options))
+            ->getMock();
         $this->assertFalse($validator->validate(false)->hasErrors());
     }
 
@@ -46,7 +49,10 @@ class BooleanValidatorTest extends \TYPO3\CMS\Extbase\Tests\Unit\Validation\Vali
     public function booleanValidatorReturnsNoErrorForATrueStringExpectation()
     {
         $options = array('is' => 'true');
-        $validator = $this->getMock($this->validatorClassName, array('translateErrorMessage'), array($options));
+        $validator = $this->getMockBuilder($this->validatorClassName)
+            ->setMethods(array('translateErrorMessage'))
+            ->setConstructorArgs(array($options))
+            ->getMock();
         $this->assertFalse($validator->validate(true)->hasErrors());
     }
 
@@ -56,7 +62,10 @@ class BooleanValidatorTest extends \TYPO3\CMS\Extbase\Tests\Unit\Validation\Vali
     public function booleanValidatorReturnsNoErrorForATrueExpectation()
     {
         $options = array('is' => true);
-        $validator = $this->getMock($this->validatorClassName, array('translateErrorMessage'), array($options));
+        $validator = $this->getMockBuilder($this->validatorClassName)
+            ->setMethods(array('translateErrorMessage'))
+            ->setConstructorArgs(array($options))
+            ->getMock();
         $this->assertFalse($validator->validate(true)->hasErrors());
     }
 
@@ -66,7 +75,10 @@ class BooleanValidatorTest extends \TYPO3\CMS\Extbase\Tests\Unit\Validation\Vali
     public function booleanValidatorReturnsNoErrorForAFalseExpectation()
     {
         $options = array('is' => false);
-        $validator = $this->getMock($this->validatorClassName, array('translateErrorMessage'), array($options));
+        $validator = $this->getMockBuilder($this->validatorClassName)
+            ->setMethods(array('translateErrorMessage'))
+            ->setConstructorArgs(array($options))
+            ->getMock();
         $this->assertFalse($validator->validate(false)->hasErrors());
     }
 
@@ -76,7 +88,10 @@ class BooleanValidatorTest extends \TYPO3\CMS\Extbase\Tests\Unit\Validation\Vali
     public function booleanValidatorReturnsErrorForTrueWhenFalseExpected()
     {
         $options = array('is' => false);
-        $validator = $this->getMock($this->validatorClassName, array('translateErrorMessage'), array($options));
+        $validator = $this->getMockBuilder($this->validatorClassName)
+            ->setMethods(array('translateErrorMessage'))
+            ->setConstructorArgs(array($options))
+            ->getMock();
         $this->assertTrue($validator->validate(true)->hasErrors());
     }
 
@@ -86,7 +101,10 @@ class BooleanValidatorTest extends \TYPO3\CMS\Extbase\Tests\Unit\Validation\Vali
     public function booleanValidatorReturnsErrorForFalseWhenTrueExpected()
     {
         $options = array('is' => true);
-        $validator = $this->getMock($this->validatorClassName, array('translateErrorMessage'), array($options));
+        $validator = $this->getMockBuilder($this->validatorClassName)
+            ->setMethods(array('translateErrorMessage'))
+            ->setConstructorArgs(array($options))
+            ->getMock();
         $this->assertTrue($validator->validate(false)->hasErrors());
     }
 
@@ -96,7 +114,10 @@ class BooleanValidatorTest extends \TYPO3\CMS\Extbase\Tests\Unit\Validation\Vali
     public function booleanValidatorReturnsErrorForAString()
     {
         $options = array('is' => true);
-        $validator = $this->getMock($this->validatorClassName, array('translateErrorMessage'), array($options));
+        $validator = $this->getMockBuilder($this->validatorClassName)
+            ->setMethods(array('translateErrorMessage'))
+            ->setConstructorArgs(array($options))
+            ->getMock();
         $this->assertTrue($validator->validate('a string')->hasErrors());
     }
 
@@ -106,7 +127,10 @@ class BooleanValidatorTest extends \TYPO3\CMS\Extbase\Tests\Unit\Validation\Vali
     public function booleanValidatorReturnsTrueIfNoParameterIsGiven()
     {
         $options = array();
-        $validator = $this->getMock($this->validatorClassName, array('translateErrorMessage'), array($options));
+        $validator = $this->getMockBuilder($this->validatorClassName)
+            ->setMethods(array('translateErrorMessage'))
+            ->setConstructorArgs(array($options))
+            ->getMock();
         $this->assertFalse($validator->validate(true)->hasErrors());
     }
 }
diff --git a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/CollectionValidatorTest.php b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/CollectionValidatorTest.php
index dfc1f9f7f6eb8453f2a4969c25c5b8882098a6f4..01e0a32150c854ce5ac42192a9789748fc6d5cae 100644
--- a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/CollectionValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/CollectionValidatorTest.php
@@ -89,7 +89,11 @@ class CollectionValidatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->mockValidatorResolver->expects($this->exactly(4))
             ->method('createValidator')
             ->with('EmailAddress')
-            ->will($this->returnValue($this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\EmailAddressValidator::class, array('translateErrorMessage'))));
+            ->will($this->returnValue(
+                $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\EmailAddressValidator::class)
+                    ->setMethods(array('translateErrorMessage'))
+                    ->getMock()
+            ));
         $this->validator->_set('validatorResolver', $this->mockValidatorResolver);
         $arrayOfEmailAddresses = array(
             'foo@bar.de',
@@ -120,9 +124,15 @@ class CollectionValidatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $B->c = array($A);
 
         // Create validators
-        $aValidator = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\GenericObjectValidator::class, array('translateErrorMessage'), array(array()));
+        $aValidator = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\GenericObjectValidator::class)
+            ->setMethods(array('translateErrorMessage'))
+            ->setConstructorArgs(array(array()))
+            ->getMock();
         $this->validator->_set('options', array('elementValidator' => 'Integer'));
-        $integerValidator = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\IntegerValidator::class, array('translateErrorMessage'), array(array()));
+        $integerValidator = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\IntegerValidator::class)
+            ->setMethods(array('translateErrorMessage'))
+            ->setConstructorArgs(array(array()))
+            ->getMock();
 
         $this->mockValidatorResolver->expects($this->any())
             ->method('createValidator')
diff --git a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/ConjunctionValidatorTest.php b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/ConjunctionValidatorTest.php
index 6e290e1ee0014e6c0ae22695592830e8c1b23774..9f2107279dae65037a181280fe1532849bf28d3c 100644
--- a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/ConjunctionValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/ConjunctionValidatorTest.php
@@ -34,7 +34,7 @@ class ConjunctionValidatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $proxyClassName = $this->buildAccessibleProxy(\TYPO3\CMS\Extbase\Validation\Validator\ConjunctionValidator::class);
         $conjunctionValidator = new $proxyClassName(array());
-        $mockValidator = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class);
+        $mockValidator = $this->createMock(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class);
         $conjunctionValidator->addValidator($mockValidator);
         $this->assertTrue($conjunctionValidator->_get('validators')->contains($mockValidator));
     }
@@ -45,13 +45,19 @@ class ConjunctionValidatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function allValidatorsInTheConjunctionAreCalledEvenIfOneReturnsError()
     {
         $validatorConjunction = new \TYPO3\CMS\Extbase\Validation\Validator\ConjunctionValidator(array());
-        $validatorObject = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class, array('validate', 'getOptions'));
+        $validatorObject = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class)
+            ->setMethods(array('validate', 'getOptions'))
+            ->getMock();
         $validatorObject->expects($this->once())->method('validate')->will($this->returnValue(new \TYPO3\CMS\Extbase\Error\Result()));
         $errors = new \TYPO3\CMS\Extbase\Error\Result();
         $errors->addError(new \TYPO3\CMS\Extbase\Error\Error('Error', 123));
-        $secondValidatorObject = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class, array('validate', 'getOptions'));
+        $secondValidatorObject = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class)
+            ->setMethods(array('validate', 'getOptions'))
+            ->getMock();
         $secondValidatorObject->expects($this->once())->method('validate')->will($this->returnValue($errors));
-        $thirdValidatorObject = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class, array('validate', 'getOptions'));
+        $thirdValidatorObject = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class)
+            ->setMethods(array('validate', 'getOptions'))
+            ->getMock();
         $thirdValidatorObject->expects($this->once())->method('validate')->will($this->returnValue(new \TYPO3\CMS\Extbase\Error\Result()));
         $validatorConjunction->addValidator($validatorObject);
         $validatorConjunction->addValidator($secondValidatorObject);
@@ -65,9 +71,13 @@ class ConjunctionValidatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function validatorConjunctionReturnsNoErrorsIfAllJunctionedValidatorsReturnNoErrors()
     {
         $validatorConjunction = new \TYPO3\CMS\Extbase\Validation\Validator\ConjunctionValidator(array());
-        $validatorObject = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class, array('validate', 'getOptions'));
+        $validatorObject = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class)
+            ->setMethods(array('validate', 'getOptions'))
+            ->getMock();
         $validatorObject->expects($this->any())->method('validate')->will($this->returnValue(new \TYPO3\CMS\Extbase\Error\Result()));
-        $secondValidatorObject = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class, array('validate', 'getOptions'));
+        $secondValidatorObject = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class)
+            ->setMethods(array('validate', 'getOptions'))
+            ->getMock();
         $secondValidatorObject->expects($this->any())->method('validate')->will($this->returnValue(new \TYPO3\CMS\Extbase\Error\Result()));
         $validatorConjunction->addValidator($validatorObject);
         $validatorConjunction->addValidator($secondValidatorObject);
@@ -80,7 +90,9 @@ class ConjunctionValidatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function validatorConjunctionReturnsErrorsIfOneValidatorReturnsErrors()
     {
         $validatorConjunction = new \TYPO3\CMS\Extbase\Validation\Validator\ConjunctionValidator(array());
-        $validatorObject = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class, array('validate', 'getOptions'));
+        $validatorObject = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class)
+            ->setMethods(array('validate', 'getOptions'))
+            ->getMock();
         $errors = new \TYPO3\CMS\Extbase\Error\Result();
         $errors->addError(new \TYPO3\CMS\Extbase\Error\Error('Error', 123));
         $validatorObject->expects($this->any())->method('validate')->will($this->returnValue($errors));
@@ -95,8 +107,12 @@ class ConjunctionValidatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         /** @var \TYPO3\CMS\Extbase\Validation\Validator\ConjunctionValidator|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
         $validatorConjunction = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Validation\Validator\ConjunctionValidator::class, array('dummy'), array(array()), '', true);
-        $validator1 = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class, array('validate', 'getOptions'));
-        $validator2 = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class, array('validate', 'getOptions'));
+        $validator1 = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class)
+            ->setMethods(array('validate', 'getOptions'))
+            ->getMock();
+        $validator2 = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class)
+            ->setMethods(array('validate', 'getOptions'))
+            ->getMock();
         $validatorConjunction->addValidator($validator1);
         $validatorConjunction->addValidator($validator2);
         $validatorConjunction->removeValidator($validator1);
@@ -112,7 +128,9 @@ class ConjunctionValidatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->expectException(NoSuchValidatorException::class);
         $this->expectExceptionCode(1207020177);
         $validatorConjunction = new \TYPO3\CMS\Extbase\Validation\Validator\ConjunctionValidator(array());
-        $validator = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class, array('validate', 'getOptions'));
+        $validator = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class)
+            ->setMethods(array('validate', 'getOptions'))
+            ->getMock();
         $validatorConjunction->removeValidator($validator);
     }
 
@@ -122,8 +140,12 @@ class ConjunctionValidatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function countReturnesTheNumberOfValidatorsContainedInTheConjunction()
     {
         $validatorConjunction = new \TYPO3\CMS\Extbase\Validation\Validator\ConjunctionValidator(array());
-        $validator1 = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class, array('validate', 'getOptions'));
-        $validator2 = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class, array('validate', 'getOptions'));
+        $validator1 = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class)
+            ->setMethods(array('validate', 'getOptions'))
+            ->getMock();
+        $validator2 = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class)
+            ->setMethods(array('validate', 'getOptions'))
+            ->getMock();
         $this->assertSame(0, count($validatorConjunction));
         $validatorConjunction->addValidator($validator1);
         $validatorConjunction->addValidator($validator2);
diff --git a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/DisjunctionValidatorTest.php b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/DisjunctionValidatorTest.php
index a038394a38e990a5289b4fd1521a2e58083ef7a3..d0a5ee0467e0d03d31be9ab857ebe775816a1a26 100644
--- a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/DisjunctionValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/DisjunctionValidatorTest.php
@@ -33,11 +33,15 @@ class DisjunctionValidatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $this->markTestSkipped('Needs a bugfix of Flow first.');
         $validatorDisjunction = new \TYPO3\CMS\Extbase\Validation\Validator\DisjunctionValidator(array());
-        $validatorObject = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class, array('validate', 'getOptions'));
+        $validatorObject = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class)
+            ->setMethods(array('validate', 'getOptions'))
+            ->getMock();
         $validatorObject->expects($this->once())->method('validate')->will($this->returnValue(new \TYPO3\CMS\Extbase\Error\Result()));
         $errors = new \TYPO3\CMS\Extbase\Error\Result();
         $errors->addError(new \TYPO3\CMS\Extbase\Error\Error('Error', 123));
-        $secondValidatorObject = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class, array('validate', 'getOptions'));
+        $secondValidatorObject = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class)
+            ->setMethods(array('validate', 'getOptions'))
+            ->getMock();
         $secondValidatorObject->expects($this->exactly(1))->method('validate')->will($this->returnValue($errors));
         $validatorDisjunction->addValidator($validatorObject);
         $validatorDisjunction->addValidator($secondValidatorObject);
@@ -50,11 +54,15 @@ class DisjunctionValidatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function validateReturnsNoErrorsIfOneValidatorReturnsNoError()
     {
         $validatorDisjunction = new \TYPO3\CMS\Extbase\Validation\Validator\DisjunctionValidator(array());
-        $validatorObject = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class, array('validate', 'getOptions'));
+        $validatorObject = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class)
+            ->setMethods(array('validate', 'getOptions'))
+            ->getMock();
         $validatorObject->expects($this->any())->method('validate')->will($this->returnValue(new \TYPO3\CMS\Extbase\Error\Result()));
         $errors = new \TYPO3\CMS\Extbase\Error\Result();
         $errors->addError(new \TYPO3\CMS\Extbase\Error\Error('Error', 123));
-        $secondValidatorObject = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class, array('validate', 'getOptions'));
+        $secondValidatorObject = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class)
+            ->setMethods(array('validate', 'getOptions'))
+            ->getMock();
         $secondValidatorObject->expects($this->any())->method('validate')->will($this->returnValue($errors));
         $validatorDisjunction->addValidator($validatorObject);
         $validatorDisjunction->addValidator($secondValidatorObject);
@@ -71,11 +79,15 @@ class DisjunctionValidatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $error2 = new \TYPO3\CMS\Extbase\Error\Error('Error2', 123);
         $errors1 = new \TYPO3\CMS\Extbase\Error\Result();
         $errors1->addError($error1);
-        $validatorObject = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class, array('validate', 'getOptions'));
+        $validatorObject = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class)
+            ->setMethods(array('validate', 'getOptions'))
+            ->getMock();
         $validatorObject->expects($this->any())->method('validate')->will($this->returnValue($errors1));
         $errors2 = new \TYPO3\CMS\Extbase\Error\Result();
         $errors2->addError($error2);
-        $secondValidatorObject = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class, array('validate', 'getOptions'));
+        $secondValidatorObject = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class)
+            ->setMethods(array('validate', 'getOptions'))
+            ->getMock();
         $secondValidatorObject->expects($this->any())->method('validate')->will($this->returnValue($errors2));
         $validatorDisjunction->addValidator($validatorObject);
         $validatorDisjunction->addValidator($secondValidatorObject);
diff --git a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/EmailAddressValidatorTest.php b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/EmailAddressValidatorTest.php
index c015cbe009e962b6e3b5f04164fee1baae6725e3..8968d0e0ef8f06cad40ce13ad75d3834785fbe89 100644
--- a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/EmailAddressValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/EmailAddressValidatorTest.php
@@ -50,7 +50,9 @@ class EmailAddressValidatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function emailAddressValidatorReturnsNoErrorsForAValidEmailAddress($address)
     {
         /** @var \TYPO3\CMS\Extbase\Validation\Validator\EmailAddressValidator|\PHPUnit_Framework_MockObject_MockObject $subject */
-        $subject = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\EmailAddressValidator::class, array('translateErrorMessage'));
+        $subject = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\EmailAddressValidator::class)
+            ->setMethods(array('translateErrorMessage'))
+            ->getMock();
         $this->assertFalse($subject->validate($address)->hasErrors());
     }
 
@@ -82,7 +84,9 @@ class EmailAddressValidatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function emailAddressValidatorReturnsFalseForAnInvalidEmailAddress($address)
     {
         /** @var \TYPO3\CMS\Extbase\Validation\Validator\EmailAddressValidator|\PHPUnit_Framework_MockObject_MockObject $subject */
-        $subject = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\EmailAddressValidator::class, array('translateErrorMessage'));
+        $subject = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\EmailAddressValidator::class)
+            ->setMethods(array('translateErrorMessage'))
+            ->getMock();
         $this->assertTrue($subject->validate($address)->hasErrors());
     }
 
@@ -92,7 +96,9 @@ class EmailAddressValidatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function emailValidatorCreatesTheCorrectErrorForAnInvalidEmailAddress()
     {
         /** @var \TYPO3\CMS\Extbase\Validation\Validator\EmailAddressValidator|\PHPUnit_Framework_MockObject_MockObject $subject */
-        $subject = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\EmailAddressValidator::class, array('translateErrorMessage'));
+        $subject = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\EmailAddressValidator::class)
+            ->setMethods(array('translateErrorMessage'))
+            ->getMock();
         $this->assertEquals(1, count($subject->validate('notAValidMail@Address')->getErrors()));
     }
 }
diff --git a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/FloatValidatorTest.php b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/FloatValidatorTest.php
index d722444282076c756113e0ca4654ef2fa3cad3ef..9e20ffc621d624f42e90e3525dc0dc43ec07c148 100644
--- a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/FloatValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/FloatValidatorTest.php
@@ -32,7 +32,9 @@ class FloatValidatorTest extends \TYPO3\CMS\Extbase\Tests\Unit\Validation\Valida
 
     public function setup()
     {
-        $this->validator = $this->getMock($this->validatorClassName, array('translateErrorMessage'));
+        $this->validator = $this->getMockBuilder($this->validatorClassName)
+            ->setMethods(array('translateErrorMessage'))
+            ->getMock();
     }
 
     /**
diff --git a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/GenericObjectValidatorTest.php b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/GenericObjectValidatorTest.php
index 5a3fcd6ddf889f2437e87437c1f632bcf89c6377..535f1c81bd2402e16f389e20a2eebd55c5998c64 100644
--- a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/GenericObjectValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/GenericObjectValidatorTest.php
@@ -85,9 +85,13 @@ class GenericObjectValidatorTest extends \TYPO3\CMS\Extbase\Tests\Unit\Validatio
      */
     public function validateChecksAllPropertiesForWhichAPropertyValidatorExists($mockObject, $validationResultForFoo, $validationResultForBar, $errors)
     {
-        $validatorForFoo = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class, array('validate', 'getOptions'));
+        $validatorForFoo = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class)
+            ->setMethods(array('validate', 'getOptions'))
+            ->getMock();
         $validatorForFoo->expects($this->once())->method('validate')->with('foovalue')->will($this->returnValue($validationResultForFoo));
-        $validatorForBar = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class, array('validate', 'getOptions'));
+        $validatorForBar = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class)
+            ->setMethods(array('validate', 'getOptions'))
+            ->getMock();
         $validatorForBar->expects($this->once())->method('validate')->with('barvalue')->will($this->returnValue($validationResultForBar));
         $this->validator->addPropertyValidator('foo', $validatorForFoo);
         $this->validator->addPropertyValidator('bar', $validatorForBar);
@@ -137,7 +141,9 @@ class GenericObjectValidatorTest extends \TYPO3\CMS\Extbase\Tests\Unit\Validatio
         $error = new \TYPO3\CMS\Extbase\Error\Error('error1', 123);
         $result = new \TYPO3\CMS\Extbase\Error\Result();
         $result->addError($error);
-        $mockUuidValidator = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class, array('validate', 'getOptions'));
+        $mockUuidValidator = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class)
+            ->setMethods(array('validate', 'getOptions'))
+            ->getMock();
         $mockUuidValidator->expects($this->any())->method('validate')->with(15)->will($this->returnValue($result));
         $bValidator->addPropertyValidator('uuid', $mockUuidValidator);
         $this->assertSame(array('b.uuid' => array($error)), $aValidator->validate($A)->getFlattenedErrors());
@@ -164,7 +170,9 @@ class GenericObjectValidatorTest extends \TYPO3\CMS\Extbase\Tests\Unit\Validatio
         $error1 = new \TYPO3\CMS\Extbase\Error\Error('error1', 123);
         $result1 = new \TYPO3\CMS\Extbase\Error\Result();
         $result1->addError($error1);
-        $mockUuidValidator = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class, array('validate', 'getOptions'));
+        $mockUuidValidator = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class)
+            ->setMethods(array('validate', 'getOptions'))
+            ->getMock();
         $mockUuidValidator->expects($this->any())->method('validate')->with(15)->will($this->returnValue($result1));
         $aValidator->addPropertyValidator('uuid', $mockUuidValidator);
         $bValidator->addPropertyValidator('uuid', $mockUuidValidator);
diff --git a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/IntegerValidatorTest.php b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/IntegerValidatorTest.php
index 5adb0b795ab6130d1ef74aacd0b12d920b396ce6..e2f1ccd9edb131fd321e8b9136f94f4deae49949 100644
--- a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/IntegerValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/IntegerValidatorTest.php
@@ -32,7 +32,9 @@ class IntegerValidatorTest extends \TYPO3\CMS\Extbase\Tests\Unit\Validation\Vali
 
     public function setup()
     {
-        $this->validator = $this->getMock($this->validatorClassName, array('translateErrorMessage'));
+        $this->validator = $this->getMockBuilder($this->validatorClassName)
+            ->setMethods(array('translateErrorMessage'))
+            ->getMock();
     }
 
     /**
diff --git a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/NotEmptyValidatorTest.php b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/NotEmptyValidatorTest.php
index d8ded1d8d937365edb53e2197f5d2cbd3a652c7b..dc65b9ef46e64993852a3d32e687740603a28546 100644
--- a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/NotEmptyValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/NotEmptyValidatorTest.php
@@ -32,7 +32,9 @@ class NotEmptyValidatorTest extends \TYPO3\CMS\Extbase\Tests\Unit\Validation\Val
 
     public function setup()
     {
-        $this->validator = $this->getMock($this->validatorClassName, array('translateErrorMessage'));
+        $this->validator = $this->getMockBuilder($this->validatorClassName)
+            ->setMethods(array('translateErrorMessage'))
+            ->getMock();
     }
 
     /**
diff --git a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/NumberRangeValidatorTest.php b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/NumberRangeValidatorTest.php
index 0e15d9bd6b6e206fb3a82a8a1da33c6349abfce7..60866847af0251ff8215fa9a9057e295518024ba 100644
--- a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/NumberRangeValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/NumberRangeValidatorTest.php
@@ -34,7 +34,10 @@ class NumberRangeValidatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function numberRangeValidatorReturnsNoErrorForASimpleIntegerInRange()
     {
         $options = array('minimum' => 0, 'maximum' => 1000);
-        $validator = $this->getMock($this->validatorClassName, array('dummy'), array($options));
+        $validator = $this->getMockBuilder($this->validatorClassName)
+            ->setMethods(array('dummy'))
+            ->setConstructorArgs(array($options))
+            ->getMock();
         $this->assertFalse($validator->validate(10.5)->hasErrors());
     }
 
@@ -44,7 +47,10 @@ class NumberRangeValidatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function numberRangeValidatorReturnsErrorForANumberOutOfRange()
     {
         $options = array('minimum' => 0, 'maximum' => 1000);
-        $validator = $this->getMock($this->validatorClassName, array('translateErrorMessage'), array($options));
+        $validator = $this->getMockBuilder($this->validatorClassName)
+            ->setMethods(array('translateErrorMessage'))
+            ->setConstructorArgs(array($options))
+            ->getMock();
         $this->assertTrue($validator->validate(1000.1)->hasErrors());
     }
 
@@ -54,7 +60,10 @@ class NumberRangeValidatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function numberRangeValidatorReturnsNoErrorForANumberInReversedRange()
     {
         $options = array('minimum' => 1000, 'maximum' => 0);
-        $validator = $this->getMock($this->validatorClassName, array('dummy'), array($options));
+        $validator = $this->getMockBuilder($this->validatorClassName)
+            ->setMethods(array('dummy'))
+            ->setConstructorArgs(array($options))
+            ->getMock();
         $this->assertFalse($validator->validate(100)->hasErrors());
     }
 
@@ -64,7 +73,10 @@ class NumberRangeValidatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function numberRangeValidatorReturnsErrorForAString()
     {
         $options = array('minimum' => 0, 'maximum' => 1000);
-        $validator = $this->getMock($this->validatorClassName, array('translateErrorMessage'), array($options));
+        $validator = $this->getMockBuilder($this->validatorClassName)
+            ->setMethods(array('translateErrorMessage'))
+            ->setConstructorArgs(array($options))
+            ->getMock();
         $this->assertTrue($validator->validate('not a number')->hasErrors());
     }
 }
diff --git a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/NumberValidatorTest.php b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/NumberValidatorTest.php
index d60178c82b9538926a7c3bad770a5f1db1afa38e..8e6f21f81a4e08bbe507fe24f0e6c8eb743d7233 100644
--- a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/NumberValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/NumberValidatorTest.php
@@ -35,7 +35,9 @@ class NumberValidatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 
     public function setup()
     {
-        $this->validator = $this->getMock($this->validatorClassName, array('translateErrorMessage'));
+        $this->validator = $this->getMockBuilder($this->validatorClassName)
+            ->setMethods(array('translateErrorMessage'))
+            ->getMock();
     }
 
     /**
diff --git a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/RegularExpressionValidatorTest.php b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/RegularExpressionValidatorTest.php
index c3ab12f88060340c041643e81a9647ac66261aac..8013a11c6fea07f2317fbff6aef137922394d666 100644
--- a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/RegularExpressionValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/RegularExpressionValidatorTest.php
@@ -34,7 +34,10 @@ class RegularExpressionValidatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function regularExpressionValidatorMatchesABasicExpressionCorrectly()
     {
         $options = array('regularExpression' => '/^simple[0-9]expression$/');
-        $validator = $this->getMock($this->validatorClassName, array('translateErrorMessage'), array($options));
+        $validator = $this->getMockBuilder($this->validatorClassName)
+            ->setMethods(array('translateErrorMessage'))
+            ->setConstructorArgs(array($options))
+            ->getMock();
         $this->assertFalse($validator->validate('simple1expression')->hasErrors());
         $this->assertTrue($validator->validate('simple1expressions')->hasErrors());
     }
@@ -45,7 +48,10 @@ class RegularExpressionValidatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function regularExpressionValidatorCreatesTheCorrectErrorIfTheExpressionDidNotMatch()
     {
         $options = array('regularExpression' => '/^simple[0-9]expression$/');
-        $validator = $this->getMock($this->validatorClassName, array('translateErrorMessage'), array($options));
+        $validator = $this->getMockBuilder($this->validatorClassName)
+            ->setMethods(array('translateErrorMessage'))
+            ->setConstructorArgs(array($options))
+            ->getMock();
         $errors = $validator->validate('some subject that will not match')->getErrors();
         // we only test for the error code, after the translation Method for message is mocked anyway
         $this->assertEquals(array(new \TYPO3\CMS\Extbase\Validation\Error(null, 1221565130)), $errors);
diff --git a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/StringLengthValidatorTest.php b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/StringLengthValidatorTest.php
index 3c19c005e5ba9ebdea298cb16adb8c2326ded8f4..797ec4daf27e41016bcff4f760d556088aa890fe 100644
--- a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/StringLengthValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/StringLengthValidatorTest.php
@@ -31,7 +31,9 @@ class StringLengthValidatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 
     public function setup()
     {
-        $this->validator = $this->getMock($this->validatorClassName, array('translateErrorMessage'));
+        $this->validator = $this->getMockBuilder($this->validatorClassName)
+            ->setMethods(array('translateErrorMessage'))
+            ->getMock();
     }
 
     /**
@@ -61,7 +63,10 @@ class StringLengthValidatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function stringLengthValidatorReturnsNoErrorForAStringShorterThanMaxLengthAndLongerThanMinLength()
     {
         $options = array('minimum' => 0, 'maximum' => 50);
-        $validator = $this->getMock($this->validatorClassName, array('dummy'), array($options));
+        $validator = $this->getMockBuilder($this->validatorClassName)
+            ->setMethods(array('dummy'))
+            ->setConstructorArgs(array($options))
+            ->getMock();
         $this->assertFalse($validator->validate('this is a very simple string')->hasErrors());
     }
 
@@ -71,7 +76,10 @@ class StringLengthValidatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function stringLengthValidatorReturnsErrorForAStringShorterThanThanMinLength()
     {
         $options = array('minimum' => 50, 'maximum' => 100);
-        $validator = $this->getMock($this->validatorClassName, array('translateErrorMessage'), array($options));
+        $validator = $this->getMockBuilder($this->validatorClassName)
+            ->setMethods(array('translateErrorMessage'))
+            ->setConstructorArgs(array($options))
+            ->getMock();
         $this->assertTrue($validator->validate('this is a very short string')->hasErrors());
     }
 
@@ -81,7 +89,10 @@ class StringLengthValidatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function stringLengthValidatorReturnsErrorsForAStringLongerThanThanMaxLength()
     {
         $options = array('minimum' => 5, 'maximum' => 10);
-        $validator = $this->getMock($this->validatorClassName, array('translateErrorMessage'), array($options));
+        $validator = $this->getMockBuilder($this->validatorClassName)
+            ->setMethods(array('translateErrorMessage'))
+            ->setConstructorArgs(array($options))
+            ->getMock();
         $this->assertTrue($validator->validate('this is a very short string')->hasErrors());
     }
 
@@ -91,7 +102,10 @@ class StringLengthValidatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function stringLengthValidatorReturnsNoErrorsForAStringLongerThanThanMinLengthAndMaxLengthNotSpecified()
     {
         $options = array('minimum' => 5);
-        $validator = $this->getMock($this->validatorClassName, array('dummy'), array($options));
+        $validator = $this->getMockBuilder($this->validatorClassName)
+            ->setMethods(array('dummy'))
+            ->setConstructorArgs(array($options))
+            ->getMock();
         $this->assertFalse($validator->validate('this is a very short string')->hasErrors());
     }
 
@@ -101,7 +115,10 @@ class StringLengthValidatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function stringLengthValidatorReturnsNoErrorsForAStringShorterThanThanMaxLengthAndMinLengthNotSpecified()
     {
         $options = array('maximum' => 100);
-        $validator = $this->getMock($this->validatorClassName, array('dummy'), array($options));
+        $validator = $this->getMockBuilder($this->validatorClassName)
+            ->setMethods(array('dummy'))
+            ->setConstructorArgs(array($options))
+            ->getMock();
         $this->assertFalse($validator->validate('this is a very short string')->hasErrors());
     }
 
@@ -111,7 +128,10 @@ class StringLengthValidatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function stringLengthValidatorReturnsNoErrorsForAStringLengthEqualToMaxLengthAndMinLengthNotSpecified()
     {
         $options = array('maximum' => 10);
-        $validator = $this->getMock($this->validatorClassName, array('dummy'), array($options));
+        $validator = $this->getMockBuilder($this->validatorClassName)
+            ->setMethods(array('dummy'))
+            ->setConstructorArgs(array($options))
+            ->getMock();
         $this->assertFalse($validator->validate('1234567890')->hasErrors());
     }
 
@@ -121,7 +141,10 @@ class StringLengthValidatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function stringLengthValidatorReturnsNoErrorForAStringLengthEqualToMinLengthAndMaxLengthNotSpecified()
     {
         $options = array('minimum' => 10);
-        $validator = $this->getMock($this->validatorClassName, array('dummy'), array($options));
+        $validator = $this->getMockBuilder($this->validatorClassName)
+            ->setMethods(array('dummy'))
+            ->setConstructorArgs(array($options))
+            ->getMock();
         $this->assertFalse($validator->validate('1234567890')->hasErrors());
     }
 
@@ -131,7 +154,10 @@ class StringLengthValidatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function stringLengthValidatorReturnsNoErrorIfMinLengthAndMaxLengthAreEqualAndTheGivenStringMatchesThisValue()
     {
         $options = array('minimum' => 10, 'maximum' => 10);
-        $validator = $this->getMock($this->validatorClassName, array('dummy'), array($options));
+        $validator = $this->getMockBuilder($this->validatorClassName)
+            ->setMethods(array('dummy'))
+            ->setConstructorArgs(array($options))
+            ->getMock();
         $this->assertFalse($validator->validate('1234567890')->hasErrors());
     }
 
@@ -141,7 +167,10 @@ class StringLengthValidatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function stringLengthValidatorReturnsNoErrorsfTheStringLengthIsEqualToMaxLength()
     {
         $options = array('minimum' => 1, 'maximum' => 10);
-        $validator = $this->getMock($this->validatorClassName, array('dummy'), array($options));
+        $validator = $this->getMockBuilder($this->validatorClassName)
+            ->setMethods(array('dummy'))
+            ->setConstructorArgs(array($options))
+            ->getMock();
         $this->assertFalse($validator->validate('1234567890')->hasErrors());
     }
 
@@ -151,7 +180,10 @@ class StringLengthValidatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function stringLengthValidatorReturnsNoErrorIfTheStringLengthIsEqualToMinLength()
     {
         $options = array('minimum' => 10, 'maximum' => 100);
-        $validator = $this->getMock($this->validatorClassName, array('dummy'), array($options));
+        $validator = $this->getMockBuilder($this->validatorClassName)
+            ->setMethods(array('dummy'))
+            ->setConstructorArgs(array($options))
+            ->getMock();
         $this->assertFalse($validator->validate('1234567890')->hasErrors());
     }
 
@@ -163,7 +195,10 @@ class StringLengthValidatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->expectException(InvalidValidationOptionsException::class);
         $this->expectExceptionCode(1238107096);
         $options = array('minimum' => 101, 'maximum' => 100);
-        $validator = $this->getMock($this->validatorClassName, array('addError', 'translateErrorMessage'), array($options));
+        $validator = $this->getMockBuilder($this->validatorClassName)
+            ->setMethods(array('addError', 'translateErrorMessage'))
+            ->setConstructorArgs(array($options))
+            ->getMock();
         $validator->validate('1234567890');
     }
 
@@ -173,7 +208,10 @@ class StringLengthValidatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function stringLengthValidatorInsertsAnErrorObjectIfValidationFails()
     {
         $options = array('minimum' => 50, 'maximum' => 100);
-        $validator = $this->getMock($this->validatorClassName, array('translateErrorMessage'), array($options));
+        $validator = $this->getMockBuilder($this->validatorClassName)
+            ->setMethods(array('translateErrorMessage'))
+            ->setConstructorArgs(array($options))
+            ->getMock();
         $this->assertEquals(1, count($validator->validate('this is a very short string')->getErrors()));
     }
 
@@ -183,7 +221,10 @@ class StringLengthValidatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function stringLengthValidatorCanHandleAnObjectWithAToStringMethod()
     {
         $options = array('minimum' => 5, 'maximum' => 100);
-        $validator = $this->getMock($this->validatorClassName, array('addError', 'translateErrorMessage'), array($options));
+        $validator = $this->getMockBuilder($this->validatorClassName)
+            ->setMethods(array('addError', 'translateErrorMessage'))
+            ->setConstructorArgs(array($options))
+            ->getMock();
 
         $className = $this->getUniqueId('TestClass');
 
@@ -205,7 +246,10 @@ class StringLengthValidatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function validateReturnsErrorsIfTheGivenObjectCanNotBeConvertedToAString()
     {
         $options = array('minimum' => 5, 'maximum' => 100);
-        $validator = $this->getMock($this->validatorClassName, array('translateErrorMessage'), array($options));
+        $validator = $this->getMockBuilder($this->validatorClassName)
+            ->setMethods(array('translateErrorMessage'))
+            ->setConstructorArgs(array($options))
+            ->getMock();
 
         $className = $this->getUniqueId('TestClass');
 
diff --git a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/StringValidatorTest.php b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/StringValidatorTest.php
index 8a2898f0552786aa4c08b55182068c25b2b2b254..8d3a04cd29c8c2a728d6b6a16381d2ca690ad5ac 100644
--- a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/StringValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/StringValidatorTest.php
@@ -32,7 +32,9 @@ class StringValidatorTest extends \TYPO3\CMS\Extbase\Tests\Unit\Validation\Valid
 
     public function setup()
     {
-        $this->validator = $this->getMock($this->validatorClassName, array('translateErrorMessage'));
+        $this->validator = $this->getMockBuilder($this->validatorClassName)
+            ->setMethods(array('translateErrorMessage'))
+            ->getMock();
     }
 
     /**
diff --git a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/TextValidatorTest.php b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/TextValidatorTest.php
index 9604d820ab780fb57870ad78e84d11f3d4599add..f83e1d850d7f77afbcc37b625daf5df2a79f7182 100644
--- a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/TextValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/TextValidatorTest.php
@@ -32,7 +32,9 @@ class TextValidatorTest extends \TYPO3\CMS\Extbase\Tests\Unit\Validation\Validat
 
     public function setup()
     {
-        $this->validator = $this->getMock($this->validatorClassName, array('translateErrorMessage'));
+        $this->validator = $this->getMockBuilder($this->validatorClassName)
+            ->setMethods(array('translateErrorMessage'))
+            ->getMock();
     }
 
     /**
diff --git a/typo3/sysext/extbase/Tests/Unit/Validation/ValidatorResolverTest.php b/typo3/sysext/extbase/Tests/Unit/Validation/ValidatorResolverTest.php
index e11de3978a41e2c0722492d014cacd7f46a4eb3c..823c6f14c81bc26f7f151b74bc7cb1cae79f5837 100644
--- a/typo3/sysext/extbase/Tests/Unit/Validation/ValidatorResolverTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Validation/ValidatorResolverTest.php
@@ -35,7 +35,7 @@ class ValidatorResolverTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     protected function setUp()
     {
         $this->validatorResolver = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Validation\ValidatorResolver::class, array('dummy'));
-        $this->mockObjectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
+        $this->mockObjectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
         $this->validatorResolver->_set('objectManager', $this->mockObjectManager);
     }
 
@@ -171,7 +171,10 @@ class ValidatorResolverTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function createValidatorResolvesAndReturnsAValidatorAndPassesTheGivenOptions()
     {
         $className = $this->getUniqueId('Test');
-        $mockValidator = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\ObjectValidatorInterface::class, array('validate', 'getOptions', 'setValidatedInstancesContainer'), array(), $className);
+        $mockValidator = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\ObjectValidatorInterface::class)
+            ->setMethods(array('validate', 'getOptions', 'setValidatedInstancesContainer'))
+            ->setMockClassName($className)
+            ->getMock();
         $this->mockObjectManager->expects($this->any())->method('get')->with($className)->will($this->returnValue($mockValidator));
         /** @var \TYPO3\CMS\Extbase\Validation\ValidatorResolver $validatorResolver */
         $validatorResolver = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Validation\ValidatorResolver::class, array('resolveValidatorObjectName'));
@@ -199,8 +202,11 @@ class ValidatorResolverTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function getBaseValidatorCachesTheResultOfTheBuildBaseValidatorChainCalls()
     {
         $this->markTestSkipped('Functionality is different now.');
-        $mockConjunctionValidator = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\ConjunctionValidator::class, array(), array(), '', false);
-        $validatorResolver = $this->getMock(\TYPO3\CMS\Extbase\Validation\ValidatorResolver::class, array('buildBaseValidatorConjunction'), array(), '', false);
+        $mockConjunctionValidator = $this->createMock(\TYPO3\CMS\Extbase\Validation\Validator\ConjunctionValidator::class);
+        $validatorResolver = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\ValidatorResolver::class)
+            ->setMethods(array('buildBaseValidatorConjunction'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $validatorResolver->expects($this->once())->method('buildBaseValidatorConjunction')->with('Tx_Virtual_Foo')->will($this->returnValue($mockConjunctionValidator));
         $result = $validatorResolver->getBaseValidatorConjunction('Tx_Virtual_Foo');
         $this->assertSame($mockConjunctionValidator, $result, '#1');
@@ -215,7 +221,7 @@ class ValidatorResolverTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $mockController = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Mvc\Controller\ActionController::class, array('fooAction'), array(), '', false);
         $methodParameters = array();
-        $mockReflectionService = $this->getMock(\TYPO3\CMS\Extbase\Reflection\ReflectionService::class, array(), array(), '', false);
+        $mockReflectionService = $this->createMock(\TYPO3\CMS\Extbase\Reflection\ReflectionService::class);
         $mockReflectionService->expects($this->once())->method('getMethodParameters')->with(get_class($mockController), 'fooAction')->will($this->returnValue($methodParameters));
         $validatorResolver = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Validation\ValidatorResolver::class, array('createValidator'));
         $validatorResolver->_set('reflectionService', $mockReflectionService);
@@ -228,7 +234,10 @@ class ValidatorResolverTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function buildMethodArgumentsValidatorConjunctionsBuildsAConjunctionFromValidateAnnotationsOfTheSpecifiedMethod()
     {
-        $mockObject = $this->getMock('stdClass', array('fooMethod'), array(), '', false);
+        $mockObject = $this->getMockBuilder('stdClass')
+            ->setMethods(array('fooMethod'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $methodParameters = array(
             'arg1' => array(
                 'type' => 'string'
@@ -247,19 +256,19 @@ class ValidatorResolverTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                 '$arg2 VENDOR\\ModelCollection\\Domain\\Model\\Model'
             )
         );
-        $mockReflectionService = $this->getMock(\TYPO3\CMS\Extbase\Reflection\ReflectionService::class, array(), array(), '', false);
+        $mockReflectionService = $this->createMock(\TYPO3\CMS\Extbase\Reflection\ReflectionService::class);
         $mockReflectionService->expects($this->once())->method('getMethodTagsValues')->with(get_class($mockObject), 'fooAction')->will($this->returnValue($methodTagsValues));
         $mockReflectionService->expects($this->once())->method('getMethodParameters')->with(get_class($mockObject), 'fooAction')->will($this->returnValue($methodParameters));
-        $mockStringValidator = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class, array(), array(), '', false);
-        $mockArrayValidator = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class, array(), array(), '', false);
-        $mockFooValidator = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class, array(), array(), '', false);
-        $mockBarValidator = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class, array(), array(), '', false);
-        $mockQuuxValidator = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class, array(), array(), '', false);
-        $conjunction1 = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\ConjunctionValidator::class, array(), array(), '', false);
+        $mockStringValidator = $this->createMock(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class);
+        $mockArrayValidator = $this->createMock(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class);
+        $mockFooValidator = $this->createMock(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class);
+        $mockBarValidator = $this->createMock(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class);
+        $mockQuuxValidator = $this->createMock(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class);
+        $conjunction1 = $this->createMock(\TYPO3\CMS\Extbase\Validation\Validator\ConjunctionValidator::class);
         $conjunction1->expects($this->at(0))->method('addValidator')->with($mockStringValidator);
         $conjunction1->expects($this->at(1))->method('addValidator')->with($mockFooValidator);
         $conjunction1->expects($this->at(2))->method('addValidator')->with($mockBarValidator);
-        $conjunction2 = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\ConjunctionValidator::class, array(), array(), '', false);
+        $conjunction2 = $this->createMock(\TYPO3\CMS\Extbase\Validation\Validator\ConjunctionValidator::class);
         $conjunction2->expects($this->at(0))->method('addValidator')->with($mockArrayValidator);
         $conjunction2->expects($this->at(1))->method('addValidator')->with($mockQuuxValidator);
         $mockArguments = new \TYPO3\CMS\Extbase\Mvc\Controller\Arguments();
@@ -285,7 +294,10 @@ class ValidatorResolverTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $this->expectException(InvalidValidationConfigurationException::class);
         $this->expectExceptionCode(1253172726);
-        $mockObject = $this->getMock('stdClass', array('fooMethod'), array(), '', false);
+        $mockObject = $this->getMockBuilder('stdClass')
+            ->setMethods(array('fooMethod'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $methodParameters = array(
             'arg1' => array(
                 'type' => 'string'
@@ -299,12 +311,12 @@ class ValidatorResolverTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                 '$arg2 VENDOR\\ModelCollection\\Domain\\Model\\Model'
             )
         );
-        $mockReflectionService = $this->getMock(\TYPO3\CMS\Extbase\Reflection\ReflectionService::class, array(), array(), '', false);
+        $mockReflectionService = $this->createMock(\TYPO3\CMS\Extbase\Reflection\ReflectionService::class);
         $mockReflectionService->expects($this->once())->method('getMethodTagsValues')->with(get_class($mockObject), 'fooAction')->will($this->returnValue($methodTagsValues));
         $mockReflectionService->expects($this->once())->method('getMethodParameters')->with(get_class($mockObject), 'fooAction')->will($this->returnValue($methodParameters));
-        $mockStringValidator = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class, array(), array(), '', false);
-        $mockQuuxValidator = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class, array(), array(), '', false);
-        $conjunction1 = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\ConjunctionValidator::class, array(), array(), '', false);
+        $mockStringValidator = $this->createMock(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class);
+        $mockQuuxValidator = $this->createMock(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class);
+        $conjunction1 = $this->createMock(\TYPO3\CMS\Extbase\Validation\Validator\ConjunctionValidator::class);
         $conjunction1->expects($this->at(0))->method('addValidator')->with($mockStringValidator);
         $validatorResolver = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Validation\ValidatorResolver::class, array('createValidator'));
         $validatorResolver->expects($this->at(0))->method('createValidator')->with(\TYPO3\CMS\Extbase\Validation\Validator\ConjunctionValidator::class)->will($this->returnValue($conjunction1));
@@ -319,7 +331,7 @@ class ValidatorResolverTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function buildBaseValidatorConjunctionAddsValidatorsDefinedByAnnotationsInTheClassToTheReturnedConjunction()
     {
-        $mockObject = $this->getMock('stdClass');
+        $mockObject = $this->createMock('stdClass');
         $className = get_class($mockObject);
         $propertyTagsValues = array(
             'foo' => array(
@@ -337,12 +349,15 @@ class ValidatorResolverTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             )
         );
 
-        $mockReflectionService = $this->getMock(\TYPO3\CMS\Extbase\Reflection\ReflectionService::class, array(), array(), '', false);
+        $mockReflectionService = $this->createMock(\TYPO3\CMS\Extbase\Reflection\ReflectionService::class);
         $mockReflectionService->expects($this->at(0))->method('getClassPropertyNames')->with($className)->will($this->returnValue(array('foo', 'bar')));
         $mockReflectionService->expects($this->at(1))->method('getPropertyTagsValues')->with($className, 'foo')->will($this->returnValue($propertyTagsValues['foo']));
         $mockReflectionService->expects($this->at(2))->method('getPropertyTagsValues')->with($className, 'bar')->will($this->returnValue($propertyTagsValues['bar']));
-        $mockObjectValidator = $this->getMock(\TYPO3\CMS\Extbase\Validation\Validator\GenericObjectValidator::class, array('dummy'), array(), '', false);
-        $mockObjectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class, array(), array(), '', false);
+        $mockObjectValidator = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\GenericObjectValidator::class)
+            ->setMethods(array('dummy'))
+            ->disableOriginalConstructor()
+            ->getMock();
+        $mockObjectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
         $mockObjectManager->expects($this->at(0))->method('get')->with(\TYPO3\CMS\Extbase\Validation\Validator\GenericObjectValidator::class)->will($this->returnValue($mockObjectValidator));
         $validatorResolver = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Validation\ValidatorResolver::class, array('resolveValidatorObjectName', 'createValidator'));
         $validatorResolver->_set('reflectionService', $mockReflectionService);
@@ -377,7 +392,7 @@ class ValidatorResolverTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function buildBaseValidatorConjunctionCreatesValidatorFromClassName($modelClassName, $validatorClassName)
     {
-        $mockObjectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class, array(), array(), '', false);
+        $mockObjectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
         $validatorResolver = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Validation\ValidatorResolver::class, array('resolveValidatorObjectName', 'createValidator'));
         $validatorResolver->_set('objectManager', $mockObjectManager);
         $validatorResolver->expects($this->once())->method('createValidator')->with($validatorClassName)->will($this->returnValue(null));
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Controller/DownloadControllerTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Controller/DownloadControllerTest.php
index f0e221c4cfb889d65734fba0fefb89ee88bfee7d..49448588b87aaf037ae9b43789e87ed5102b4a0f 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Controller/DownloadControllerTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Controller/DownloadControllerTest.php
@@ -31,10 +31,10 @@ class DownloadControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $dummyException = new \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException($dummyExceptionMessage);
 
         $dummyExtensionName = 'dummy_extension';
-        $dummyExtension = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension::class);
+        $dummyExtension = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension::class)->getMock();
         $dummyExtension->expects($this->any())->method('getExtensionKey')->will($this->returnValue($dummyExtensionName));
 
-        $downloadUtilityMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Utility\DownloadUtility::class);
+        $downloadUtilityMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Utility\DownloadUtility::class)->getMock();
         $downloadUtilityMock->expects($this->any())->method('setDownloadPath')->willThrowException($dummyException);
 
         $subject = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Controller\DownloadController::class, array('dummy'));
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Controller/UpdateFromTerControllerTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Controller/UpdateFromTerControllerTest.php
index 2f420d8e3b6ec2fbbadd03b0283c23822a0de7b8..d2dd45e2ffcf0bde2969aab661d2e3a855fc1a69 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Controller/UpdateFromTerControllerTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Controller/UpdateFromTerControllerTest.php
@@ -50,11 +50,16 @@ class UpdateFromTerControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 
     protected function setUp()
     {
-        $this->mockObjectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
-        $this->repositoryRepositoryMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Repository\RepositoryRepository::class, array('findByUid'), array($this->mockObjectManager));
+        $this->mockObjectManager = $this->getMockBuilder(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class)->getMock();
+        $this->repositoryRepositoryMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Repository\RepositoryRepository::class)
+            ->setMethods(array('findByUid'))
+            ->setConstructorArgs(array($this->mockObjectManager))
+            ->getMock();
         $this->extensionRepositoryMock = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Domain\Repository\ExtensionRepository::class, array(), array($this->mockObjectManager));
         $this->repositoryHelperMock = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Utility\Repository\Helper::class, array('updateExtList'), array(), '', false);
-        $this->languageServiceMock = $this->getMock(\TYPO3\CMS\Lang\LanguageService::class, array('__none'));
+        $this->languageServiceMock = $this->getMockBuilder(\TYPO3\CMS\Lang\LanguageService::class)
+            ->setMethods(array('__none'))
+            ->getMock();
     }
 
     /**
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Controller/UploadExtensionFileControllerTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Controller/UploadExtensionFileControllerTest.php
index 6106c437cbdf03de95842803df8a1cefb26010bd..f7bea36cfc28920cdb4b3cae6a9a26590eb87d83 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Controller/UploadExtensionFileControllerTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Controller/UploadExtensionFileControllerTest.php
@@ -66,13 +66,16 @@ class UploadExtensionFileControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCa
     public function getExtensionFromZipFileExtractsExtensionKey($filename, $expectedKey)
     {
         $fixture = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Controller\UploadExtensionFileController::class, array('dummy'));
-        $managementServiceMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Service\ExtensionManagementService::class, array('isAvailable'), array(), '', false);
+        $managementServiceMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Service\ExtensionManagementService::class)
+            ->setMethods(array('isAvailable'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $managementServiceMock->expects($this->once())
             ->method('isAvailable')
             ->with($expectedKey)
             ->will($this->returnValue(false));
         $fixture->_set('managementService', $managementServiceMock);
-        $fileHandlingUtilityMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Utility\FileHandlingUtility::class, array(), array(), '', false);
+        $fileHandlingUtilityMock = $this->createMock(\TYPO3\CMS\Extensionmanager\Utility\FileHandlingUtility::class);
         $fileHandlingUtilityMock->expects($this->once())->method('unzipExtensionFromFile');
         $fixture->_set('fileHandlingUtility', $fileHandlingUtilityMock);
 
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Domain/Model/DownloadQueueTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Domain/Model/DownloadQueueTest.php
index 2a515909dc1abcad1c24c21356672100986b66ab..8e2c77fa7606ca8a6f4ce425ef32862ff3b036d3 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Domain/Model/DownloadQueueTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Domain/Model/DownloadQueueTest.php
@@ -37,7 +37,9 @@ class DownloadQueueTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     protected function setUp()
     {
         $this->downloadQueueMock = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Domain\Model\DownloadQueue::class, array('dummy'));
-        $this->extensionMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension::class, array('dummy'));
+        $this->extensionMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension::class)
+            ->setMethods(array('dummy'))
+            ->getMock();
         $this->extensionMock->setExtensionKey('foobar');
         $this->extensionMock->setVersion('1.0.0');
     }
@@ -83,7 +85,9 @@ class DownloadQueueTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function addExtensionToQueueThrowsExceptionIfExtensionWithSameKeyAndDifferentValuesAlreadyExists()
     {
         /** @var \TYPO3\CMS\Extensionmanager\Domain\Model\Extension $extensionMock2 */
-        $extensionMock2 = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension::class, array('dummy'));
+        $extensionMock2 = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension::class)
+            ->setMethods(array('dummy'))
+            ->getMock();
         $extensionMock2->setExtensionKey('foobar');
         $extensionMock2->setVersion('1.0.3');
 
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/ConfigurationItemRepositoryTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/ConfigurationItemRepositoryTest.php
index d600dd12721224ec1cf9c39570801eb0964cbadf..ae69885323a0a505a3980c5fe01d9fd44ff0831d 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/ConfigurationItemRepositoryTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/ConfigurationItemRepositoryTest.php
@@ -43,7 +43,7 @@ class ConfigurationItemRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             array('dummy')
         );
 
-        $this->injectedObjectManagerMock = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class, array(), array(), '', false);
+        $this->injectedObjectManagerMock = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
         $this->configurationItemRepository->_set(
             'objectManager',
             $this->injectedObjectManagerMock
@@ -99,7 +99,7 @@ class ConfigurationItemRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             'objectManager',
             $this->injectedObjectManagerMock
         );
-        $configurationUtilityMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Utility\ConfigurationUtility::class, array(), array(), '', false);
+        $configurationUtilityMock = $this->createMock(\TYPO3\CMS\Extensionmanager\Utility\ConfigurationUtility::class);
         $configurationUtilityMock
             ->expects($this->once())
             ->method('getDefaultConfigurationFromExtConfTemplateAsValuedArray')
@@ -330,8 +330,8 @@ class ConfigurationItemRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function mergeDefaultConfigurationCatchesExceptionOfConfigurationManagerIfNoLocalConfigurationExists()
     {
-        $exception = $this->getMock('RuntimeException');
-        $configurationManagerMock = $this->getMock(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class);
+        $exception = $this->getMockBuilder('RuntimeException')->getMock();
+        $configurationManagerMock = $this->getMockBuilder(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class)->getMock();
         $configurationManagerMock
             ->expects($this->once())
             ->method('getConfigurationValueByPath')
@@ -354,8 +354,8 @@ class ConfigurationItemRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function mergeDefaultConfigurationWithNoCurrentValuesReturnsTheDefaultConfiguration()
     {
-        $exception = $this->getMock('RuntimeException');
-        $configurationManagerMock = $this->getMock(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class);
+        $exception = $this->getMockBuilder('RuntimeException')->getMock();
+        $configurationManagerMock = $this->getMockBuilder(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class)->getMock();
         $configurationManagerMock
             ->expects($this->once())
             ->method('getConfigurationValueByPath')
@@ -391,7 +391,7 @@ class ConfigurationItemRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             )
         ));
 
-        $configurationManagerMock = $this->getMock(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class);
+        $configurationManagerMock = $this->getMockBuilder(\TYPO3\CMS\Core\Configuration\ConfigurationManager::class)->getMock();
         $configurationManagerMock
             ->expects($this->once())
             ->method('getConfigurationValueByPath')
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/RepositoryRepositoryTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/RepositoryRepositoryTest.php
index 5ab3aa7bcdd2ae54aad05c34066d4751822d5062..aca6563f4e6ca1509b692973034424dfa6fae22d 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/RepositoryRepositoryTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/RepositoryRepositoryTest.php
@@ -32,9 +32,12 @@ class RepositoryRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 
     protected function setUp()
     {
-        $this->mockObjectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
+        $this->mockObjectManager = $this->getMockBuilder(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class)->getMock();
         /** @var $subject \TYPO3\CMS\Extensionmanager\Domain\Repository\RepositoryRepository|\PHPUnit_Framework_MockObject_MockObject */
-        $this->subject = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Repository\RepositoryRepository::class, array('findAll'), array($this->mockObjectManager));
+        $this->subject = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Repository\RepositoryRepository::class)
+            ->setMethods(array('findAll'))
+            ->setConstructorArgs(array($this->mockObjectManager))
+            ->getMock();
     }
 
     /**
@@ -55,12 +58,12 @@ class RepositoryRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function findOneTypo3OrgRepositoryReturnsRepositoryWithCorrectTitle()
     {
-        $mockModelOne = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Model\Repository::class);
+        $mockModelOne = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Model\Repository::class)->getMock();
         $mockModelOne
             ->expects(($this->once()))
             ->method('getTitle')
             ->will($this->returnValue('foo'));
-        $mockModelTwo = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Model\Repository::class);
+        $mockModelTwo = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Model\Repository::class)->getMock();
         $mockModelTwo
             ->expects(($this->once()))
             ->method('getTitle')
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Report/ExtensionStatusTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Report/ExtensionStatusTest.php
index 6687c5ae403a0a46fb9a44098cf1f1e663860d45..68bed57268e3fdb2224e087eb08ab0b56617388e 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Report/ExtensionStatusTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Report/ExtensionStatusTest.php
@@ -39,10 +39,12 @@ class ExtensionStatusTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     protected function setUp()
     {
-        $this->mockObjectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
+        $this->mockObjectManager = $this->getMockBuilder(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class)->getMock();
         /** @var $mockRepositoryRepository \TYPO3\CMS\Extensionmanager\Domain\Repository\RepositoryRepository|\PHPUnit_Framework_MockObject_MockObject */
-        $this->mockRepositoryRepository = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Repository\RepositoryRepository::class, array(), array($this->mockObjectManager));
-        $this->mockLanguageService = $this->getMock(\TYPO3\CMS\Lang\LanguageService::class, array(), array(), '', false);
+        $this->mockRepositoryRepository = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Repository\RepositoryRepository::class)
+            ->setConstructorArgs(array($this->mockObjectManager))
+            ->getMock();
+        $this->mockLanguageService = $this->createMock(\TYPO3\CMS\Lang\LanguageService::class);
     }
 
     /**
@@ -50,7 +52,7 @@ class ExtensionStatusTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function extensionStatusImplementsStatusProviderInterface()
     {
-        $reportMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Report\ExtensionStatus::class, array(), array(), '', false);
+        $reportMock = $this->createMock(\TYPO3\CMS\Extensionmanager\Report\ExtensionStatus::class);
         $this->assertInstanceOf(\TYPO3\CMS\Reports\StatusProviderInterface::class, $reportMock);
     }
 
@@ -59,7 +61,10 @@ class ExtensionStatusTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function getStatusReturnsArray()
     {
-        $report = $this->getMock(\TYPO3\CMS\Extensionmanager\Report\ExtensionStatus::class, array('getSecurityStatusOfExtensions', 'getMainRepositoryStatus'), array(), '', false);
+        $report = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Report\ExtensionStatus::class)
+            ->setMethods(array('getSecurityStatusOfExtensions', 'getMainRepositoryStatus'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->assertInternalType('array', $report->getStatus());
     }
 
@@ -68,7 +73,10 @@ class ExtensionStatusTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function getStatusReturnArrayContainsFiveEntries()
     {
-        $report = $this->getMock(\TYPO3\CMS\Extensionmanager\Report\ExtensionStatus::class, array('getSecurityStatusOfExtensions', 'getMainRepositoryStatus'), array(), '', false);
+        $report = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Report\ExtensionStatus::class)
+            ->setMethods(array('getSecurityStatusOfExtensions', 'getMainRepositoryStatus'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->assertSame(5, count($report->getStatus()));
     }
 
@@ -77,9 +85,14 @@ class ExtensionStatusTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function getStatusReturnArrayContainsInstancesOfReportsStatusStatus()
     {
-        $statusObject = $this->getMock(\TYPO3\CMS\Reports\Status::class, array(), array('title', 'value'));
+        $statusObject = $this->getMockBuilder(\TYPO3\CMS\Reports\Status::class)
+            ->setConstructorArgs(array('title', 'value'))
+            ->getMock();
         /** @var \TYPO3\CMS\Extensionmanager\Report\ExtensionStatus $report */
-        $report = $this->getMock(\TYPO3\CMS\Extensionmanager\Report\ExtensionStatus::class, array('getSecurityStatusOfExtensions', 'getMainRepositoryStatus'), array(), '', false);
+        $report = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Report\ExtensionStatus::class)
+            ->setMethods(array('getSecurityStatusOfExtensions', 'getMainRepositoryStatus'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $report->expects($this->any())->method('getMainRepositoryStatus')->will($this->returnValue($statusObject));
         $resultStatuses = $report->getStatus();
         foreach ($resultStatuses as $status) {
@@ -95,7 +108,7 @@ class ExtensionStatusTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function getStatusCallsGetMainRepositoryStatusForMainRepositoryStatusResult()
     {
         /** @var $mockTerObject \TYPO3\CMS\Extensionmanager\Domain\Model\Extension|\PHPUnit_Framework_MockObject_MockObject */
-        $mockTerObject = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension::class);
+        $mockTerObject = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension::class)->getMock();
         $mockTerObject
             ->expects($this->any())
             ->method('getVersion')
@@ -111,7 +124,7 @@ class ExtensionStatusTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             ),
         );
         /** @var $mockListUtility \TYPO3\CMS\Extensionmanager\Utility\ListUtility|\PHPUnit_Framework_MockObject_MockObject */
-        $mockListUtility = $this->getMock(\TYPO3\CMS\Extensionmanager\Utility\ListUtility::class);
+        $mockListUtility = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Utility\ListUtility::class)->getMock();
         $mockListUtility
             ->expects($this->once())
             ->method('getAvailableAndInstalledExtensionsWithAdditionalInformation')
@@ -144,7 +157,7 @@ class ExtensionStatusTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         /** @var $mockReport \TYPO3\CMS\Extensionmanager\Report\ExtensionStatus|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
         $mockReport = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Report\ExtensionStatus::class, array('dummy'), array(), '', false);
         $mockReport->_set('objectManager', $this->mockObjectManager);
-        $statusMock = $this->getMock(\TYPO3\CMS\Reports\Status::class, array(), array(), '', false);
+        $statusMock = $this->createMock(\TYPO3\CMS\Reports\Status::class);
         $this->mockObjectManager
             ->expects($this->once())
             ->method('get')
@@ -163,7 +176,7 @@ class ExtensionStatusTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function getMainRepositoryStatusReturnsNoticeIfRepositoryUpdateIsLongerThanSevenDaysAgo()
     {
         /** @var $mockRepositoryRepository \TYPO3\CMS\Extensionmanager\Domain\Model\Repository|\PHPUnit_Framework_MockObject_MockObject */
-        $mockRepository = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Model\Repository::class);
+        $mockRepository = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Model\Repository::class)->getMock();
         $mockRepository
             ->expects($this->once())
             ->method('getLastUpdate')
@@ -177,7 +190,7 @@ class ExtensionStatusTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         /** @var $mockReport \TYPO3\CMS\Extensionmanager\Report\ExtensionStatus|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
         $mockReport = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Report\ExtensionStatus::class, array('dummy'), array(), '', false);
         $mockReport->_set('objectManager', $this->mockObjectManager);
-        $statusMock = $this->getMock(\TYPO3\CMS\Reports\Status::class, array(), array(), '', false);
+        $statusMock = $this->createMock(\TYPO3\CMS\Reports\Status::class);
         $this->mockObjectManager
             ->expects($this->once())
             ->method('get')
@@ -197,7 +210,7 @@ class ExtensionStatusTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function getMainRepositoryStatusReturnsOkIfUpdatedLessThanSevenDaysAgo()
     {
         /** @var $mockRepositoryRepository \TYPO3\CMS\Extensionmanager\Domain\Model\Repository|\PHPUnit_Framework_MockObject_MockObject */
-        $mockRepository = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Model\Repository::class);
+        $mockRepository = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Model\Repository::class)->getMock();
         $mockRepository
             ->expects($this->once())
             ->method('getLastUpdate')
@@ -211,7 +224,7 @@ class ExtensionStatusTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         /** @var $mockReport \TYPO3\CMS\Extensionmanager\Report\ExtensionStatus|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
         $mockReport = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Report\ExtensionStatus::class, array('dummy'), array(), '', false);
         $mockReport->_set('objectManager', $this->mockObjectManager);
-        $statusMock = $this->getMock(\TYPO3\CMS\Reports\Status::class, array(), array(), '', false);
+        $statusMock = $this->createMock(\TYPO3\CMS\Reports\Status::class);
         $this->mockObjectManager
             ->expects($this->once())
             ->method('get')
@@ -231,7 +244,7 @@ class ExtensionStatusTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function getSecurityStatusOfExtensionsReturnsOkForLoadedExtensionIfNoInsecureExtensionIsLoaded()
     {
         /** @var $mockTerObject \TYPO3\CMS\Extensionmanager\Domain\Model\Extension|\PHPUnit_Framework_MockObject_MockObject */
-        $mockTerObject = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension::class);
+        $mockTerObject = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension::class)->getMock();
         $mockTerObject
             ->expects($this->any())
             ->method('getVersion')
@@ -247,7 +260,7 @@ class ExtensionStatusTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             ),
         );
         /** @var $mockListUtility \TYPO3\CMS\Extensionmanager\Utility\ListUtility|\PHPUnit_Framework_MockObject_MockObject */
-        $mockListUtility = $this->getMock(\TYPO3\CMS\Extensionmanager\Utility\ListUtility::class);
+        $mockListUtility = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Utility\ListUtility::class)->getMock();
         $mockListUtility
             ->expects($this->once())
             ->method('getAvailableAndInstalledExtensionsWithAdditionalInformation')
@@ -256,7 +269,7 @@ class ExtensionStatusTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         /** @var $mockReport \TYPO3\CMS\Extensionmanager\Report\ExtensionStatus|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
         $mockReport = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Report\ExtensionStatus::class, array('dummy'), array(), '', false);
         $mockReport->_set('objectManager', $this->mockObjectManager);
-        $statusMock = $this->getMock(\TYPO3\CMS\Reports\Status::class, array(), array(), '', false);
+        $statusMock = $this->createMock(\TYPO3\CMS\Reports\Status::class);
         $this->mockObjectManager
             ->expects($this->at(0))
             ->method('get')
@@ -277,7 +290,7 @@ class ExtensionStatusTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function getSecurityStatusOfExtensionsReturnsErrorForLoadedExtensionIfInsecureExtensionIsLoaded()
     {
         /** @var $mockTerObject \TYPO3\CMS\Extensionmanager\Domain\Model\Extension|\PHPUnit_Framework_MockObject_MockObject */
-        $mockTerObject = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension::class);
+        $mockTerObject = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension::class)->getMock();
         $mockTerObject
             ->expects($this->any())
             ->method('getVersion')
@@ -293,7 +306,7 @@ class ExtensionStatusTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             ),
         );
         /** @var $mockListUtility \TYPO3\CMS\Extensionmanager\Utility\ListUtility|\PHPUnit_Framework_MockObject_MockObject */
-        $mockListUtility = $this->getMock(\TYPO3\CMS\Extensionmanager\Utility\ListUtility::class);
+        $mockListUtility = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Utility\ListUtility::class)->getMock();
         $mockListUtility
             ->expects($this->once())
             ->method('getAvailableAndInstalledExtensionsWithAdditionalInformation')
@@ -302,7 +315,7 @@ class ExtensionStatusTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         /** @var $mockReport \TYPO3\CMS\Extensionmanager\Report\ExtensionStatus|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
         $mockReport = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Report\ExtensionStatus::class, array('dummy'), array(), '', false);
         $mockReport->_set('objectManager', $this->mockObjectManager);
-        $statusMock = $this->getMock(\TYPO3\CMS\Reports\Status::class, array(), array(), '', false);
+        $statusMock = $this->createMock(\TYPO3\CMS\Reports\Status::class);
         $this->mockObjectManager
             ->expects($this->at(0))
             ->method('get')
@@ -323,7 +336,7 @@ class ExtensionStatusTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function getSecurityStatusOfExtensionsReturnsOkForExistingExtensionIfNoInsecureExtensionExists()
     {
         /** @var $mockTerObject \TYPO3\CMS\Extensionmanager\Domain\Model\Extension|\PHPUnit_Framework_MockObject_MockObject */
-        $mockTerObject = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension::class);
+        $mockTerObject = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension::class)->getMock();
         $mockTerObject
             ->expects($this->any())
             ->method('getVersion')
@@ -338,7 +351,7 @@ class ExtensionStatusTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             ),
         );
         /** @var $mockListUtility \TYPO3\CMS\Extensionmanager\Utility\ListUtility|\PHPUnit_Framework_MockObject_MockObject */
-        $mockListUtility = $this->getMock(\TYPO3\CMS\Extensionmanager\Utility\ListUtility::class);
+        $mockListUtility = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Utility\ListUtility::class)->getMock();
         $mockListUtility
             ->expects($this->once())
             ->method('getAvailableAndInstalledExtensionsWithAdditionalInformation')
@@ -347,7 +360,7 @@ class ExtensionStatusTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         /** @var $mockReport \TYPO3\CMS\Extensionmanager\Report\ExtensionStatus|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
         $mockReport = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Report\ExtensionStatus::class, array('dummy'), array(), '', false);
         $mockReport->_set('objectManager', $this->mockObjectManager);
-        $statusMock = $this->getMock(\TYPO3\CMS\Reports\Status::class, array(), array(), '', false);
+        $statusMock = $this->createMock(\TYPO3\CMS\Reports\Status::class);
         $this->mockObjectManager
             ->expects($this->at(1))
             ->method('get')
@@ -368,7 +381,7 @@ class ExtensionStatusTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function getSecurityStatusOfExtensionsReturnsErrorForExistingExtensionIfInsecureExtensionExists()
     {
         /** @var $mockTerObject \TYPO3\CMS\Extensionmanager\Domain\Model\Extension|\PHPUnit_Framework_MockObject_MockObject */
-        $mockTerObject = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension::class);
+        $mockTerObject = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension::class)->getMock();
         $mockTerObject
             ->expects($this->any())
             ->method('getVersion')
@@ -383,7 +396,7 @@ class ExtensionStatusTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             ),
         );
         /** @var $mockListUtility \TYPO3\CMS\Extensionmanager\Utility\ListUtility|\PHPUnit_Framework_MockObject_MockObject */
-        $mockListUtility = $this->getMock(\TYPO3\CMS\Extensionmanager\Utility\ListUtility::class);
+        $mockListUtility = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Utility\ListUtility::class)->getMock();
         $mockListUtility
             ->expects($this->once())
             ->method('getAvailableAndInstalledExtensionsWithAdditionalInformation')
@@ -392,7 +405,7 @@ class ExtensionStatusTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         /** @var $mockReport \TYPO3\CMS\Extensionmanager\Report\ExtensionStatus|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
         $mockReport = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Report\ExtensionStatus::class, array('dummy'), array(), '', false);
         $mockReport->_set('objectManager', $this->mockObjectManager);
-        $statusMock = $this->getMock(\TYPO3\CMS\Reports\Status::class, array(), array(), '', false);
+        $statusMock = $this->createMock(\TYPO3\CMS\Reports\Status::class);
         $this->mockObjectManager
             ->expects($this->at(1))
             ->method('get')
@@ -413,7 +426,7 @@ class ExtensionStatusTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function getSecurityStatusOfExtensionsReturnsOkForLoadedExtensionIfNoOutdatedExtensionIsLoaded()
     {
         /** @var $mockTerObject \TYPO3\CMS\Extensionmanager\Domain\Model\Extension|\PHPUnit_Framework_MockObject_MockObject */
-        $mockTerObject = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension::class);
+        $mockTerObject = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension::class)->getMock();
         $mockTerObject
             ->expects($this->any())
             ->method('getVersion')
@@ -429,7 +442,7 @@ class ExtensionStatusTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             ),
         );
         /** @var $mockListUtility \TYPO3\CMS\Extensionmanager\Utility\ListUtility|\PHPUnit_Framework_MockObject_MockObject */
-        $mockListUtility = $this->getMock(\TYPO3\CMS\Extensionmanager\Utility\ListUtility::class);
+        $mockListUtility = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Utility\ListUtility::class)->getMock();
         $mockListUtility
             ->expects($this->once())
             ->method('getAvailableAndInstalledExtensionsWithAdditionalInformation')
@@ -438,7 +451,7 @@ class ExtensionStatusTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         /** @var $mockReport \TYPO3\CMS\Extensionmanager\Report\ExtensionStatus|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
         $mockReport = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Report\ExtensionStatus::class, array('dummy'), array(), '', false);
         $mockReport->_set('objectManager', $this->mockObjectManager);
-        $statusMock = $this->getMock(\TYPO3\CMS\Reports\Status::class, array(), array(), '', false);
+        $statusMock = $this->createMock(\TYPO3\CMS\Reports\Status::class);
         $this->mockObjectManager
             ->expects($this->at(2))
             ->method('get')
@@ -459,7 +472,7 @@ class ExtensionStatusTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function getSecurityStatusOfExtensionsReturnsErrorForLoadedExtensionIfOutdatedExtensionIsLoaded()
     {
         /** @var $mockTerObject \TYPO3\CMS\Extensionmanager\Domain\Model\Extension|\PHPUnit_Framework_MockObject_MockObject */
-        $mockTerObject = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension::class);
+        $mockTerObject = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension::class)->getMock();
         $mockTerObject
             ->expects($this->any())
             ->method('getVersion')
@@ -475,7 +488,7 @@ class ExtensionStatusTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             ),
         );
         /** @var $mockListUtility \TYPO3\CMS\Extensionmanager\Utility\ListUtility|\PHPUnit_Framework_MockObject_MockObject */
-        $mockListUtility = $this->getMock(\TYPO3\CMS\Extensionmanager\Utility\ListUtility::class);
+        $mockListUtility = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Utility\ListUtility::class)->getMock();
         $mockListUtility
             ->expects($this->once())
             ->method('getAvailableAndInstalledExtensionsWithAdditionalInformation')
@@ -484,7 +497,7 @@ class ExtensionStatusTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         /** @var $mockReport \TYPO3\CMS\Extensionmanager\Report\ExtensionStatus|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
         $mockReport = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Report\ExtensionStatus::class, array('dummy'), array(), '', false);
         $mockReport->_set('objectManager', $this->mockObjectManager);
-        $statusMock = $this->getMock(\TYPO3\CMS\Reports\Status::class, array(), array(), '', false);
+        $statusMock = $this->createMock(\TYPO3\CMS\Reports\Status::class);
         $this->mockObjectManager
             ->expects($this->at(2))
             ->method('get')
@@ -505,7 +518,7 @@ class ExtensionStatusTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function getSecurityStatusOfExtensionsReturnsOkForExistingExtensionIfNoOutdatedExtensionExists()
     {
         /** @var $mockTerObject \TYPO3\CMS\Extensionmanager\Domain\Model\Extension|\PHPUnit_Framework_MockObject_MockObject */
-        $mockTerObject = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension::class);
+        $mockTerObject = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension::class)->getMock();
         $mockTerObject
             ->expects($this->any())
             ->method('getVersion')
@@ -520,7 +533,7 @@ class ExtensionStatusTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             ),
         );
         /** @var $mockListUtility \TYPO3\CMS\Extensionmanager\Utility\ListUtility|\PHPUnit_Framework_MockObject_MockObject */
-        $mockListUtility = $this->getMock(\TYPO3\CMS\Extensionmanager\Utility\ListUtility::class);
+        $mockListUtility = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Utility\ListUtility::class)->getMock();
         $mockListUtility
             ->expects($this->once())
             ->method('getAvailableAndInstalledExtensionsWithAdditionalInformation')
@@ -529,7 +542,7 @@ class ExtensionStatusTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         /** @var $mockReport \TYPO3\CMS\Extensionmanager\Report\ExtensionStatus|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
         $mockReport = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Report\ExtensionStatus::class, array('dummy'), array(), '', false);
         $mockReport->_set('objectManager', $this->mockObjectManager);
-        $statusMock = $this->getMock(\TYPO3\CMS\Reports\Status::class, array(), array(), '', false);
+        $statusMock = $this->createMock(\TYPO3\CMS\Reports\Status::class);
         $this->mockObjectManager
             ->expects($this->at(3))
             ->method('get')
@@ -550,7 +563,7 @@ class ExtensionStatusTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function getSecurityStatusOfExtensionsReturnsErrorForExistingExtensionIfOutdatedExtensionExists()
     {
         /** @var $mockTerObject \TYPO3\CMS\Extensionmanager\Domain\Model\Extension|\PHPUnit_Framework_MockObject_MockObject */
-        $mockTerObject = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension::class);
+        $mockTerObject = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension::class)->getMock();
         $mockTerObject
             ->expects($this->any())
             ->method('getVersion')
@@ -565,7 +578,7 @@ class ExtensionStatusTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             ),
         );
         /** @var $mockListUtility \TYPO3\CMS\Extensionmanager\Utility\ListUtility|\PHPUnit_Framework_MockObject_MockObject */
-        $mockListUtility = $this->getMock(\TYPO3\CMS\Extensionmanager\Utility\ListUtility::class);
+        $mockListUtility = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Utility\ListUtility::class)->getMock();
         $mockListUtility
             ->expects($this->once())
             ->method('getAvailableAndInstalledExtensionsWithAdditionalInformation')
@@ -574,7 +587,7 @@ class ExtensionStatusTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         /** @var $mockReport \TYPO3\CMS\Extensionmanager\Report\ExtensionStatus|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface */
         $mockReport = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Report\ExtensionStatus::class, array('dummy'), array(), '', false);
         $mockReport->_set('objectManager', $this->mockObjectManager);
-        $statusMock = $this->getMock(\TYPO3\CMS\Reports\Status::class, array(), array(), '', false);
+        $statusMock = $this->createMock(\TYPO3\CMS\Reports\Status::class);
         $this->mockObjectManager
             ->expects($this->at(3))
             ->method('get')
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Service/ExtensionManagementServiceTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Service/ExtensionManagementServiceTest.php
index 074bb9e868a589dc14c0c6a444855e586d74c12a..60cd78f6594e3ab10d498876d3ee14d3291284e9 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Service/ExtensionManagementServiceTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Service/ExtensionManagementServiceTest.php
@@ -95,9 +95,9 @@ class ExtensionManagementServiceTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 
         $dependencyUtilityMock = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Utility\DependencyUtility::class);
         $dependencyUtilityMock->expects($this->atLeastOnce())->method('checkDependencies');
-        $installUtilityMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Utility\InstallUtility::class);
+        $installUtilityMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Utility\InstallUtility::class)->getMock();
         $installUtilityMock->expects($this->any())->method('enrichExtensionWithDetails')->will($this->returnValue(array()));
-        $extensionModelUtilityMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Utility\ExtensionModelUtility::class);
+        $extensionModelUtilityMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Utility\ExtensionModelUtility::class)->getMock();
         $extensionModelUtilityMock->expects($this->any())->method('mapExtensionArrayToModel')->will($this->returnValue($extensionModelMock));
         $managementMock->_set('dependencyUtility', $dependencyUtilityMock);
         $managementMock->_set('installUtility', $installUtilityMock);
@@ -125,7 +125,9 @@ class ExtensionManagementServiceTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         ));
 
         /** @var \TYPO3\CMS\Extensionmanager\Domain\Model\Extension $extensionModelMock */
-        $extensionModelMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension::class, array('getExtensionKey'));
+        $extensionModelMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension::class)
+            ->setMethods(array('getExtensionKey'))
+            ->getMock();
         $extensionModelMock->setExtensionKey('foobar');
         $extensionModelMock->setVersion('1.0.0');
         $downloadQueue = array(
@@ -134,9 +136,9 @@ class ExtensionManagementServiceTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 
         $dependencyUtilityMock = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Utility\DependencyUtility::class);
         $dependencyUtilityMock->expects($this->atLeastOnce())->method('checkDependencies');
-        $installUtilityMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Utility\InstallUtility::class);
+        $installUtilityMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Utility\InstallUtility::class)->getMock();
         $installUtilityMock->expects($this->any())->method('enrichExtensionWithDetails')->will($this->returnValue(array()));
-        $extensionModelUtilityMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Utility\ExtensionModelUtility::class);
+        $extensionModelUtilityMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Utility\ExtensionModelUtility::class)->getMock();
         $extensionModelUtilityMock->expects($this->any())->method('mapExtensionArrayToModel')->will($this->returnValue($extensionModelMock));
         $managementMock->_set('dependencyUtility', $dependencyUtilityMock);
         $managementMock->_set('installUtility', $installUtilityMock);
@@ -169,9 +171,9 @@ class ExtensionManagementServiceTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 
         $dependencyUtilityMock = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Utility\DependencyUtility::class);
         $dependencyUtilityMock->expects($this->atLeastOnce())->method('checkDependencies');
-        $installUtilityMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Utility\InstallUtility::class);
+        $installUtilityMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Utility\InstallUtility::class)->getMock();
         $installUtilityMock->expects($this->any())->method('enrichExtensionWithDetails')->will($this->returnValue(array()));
-        $extensionModelUtilityMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Utility\ExtensionModelUtility::class);
+        $extensionModelUtilityMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Utility\ExtensionModelUtility::class)->getMock();
         $extensionModelUtilityMock->expects($this->any())->method('mapExtensionArrayToModel')->will($this->returnValue($extensionModelMock));
         $managementMock->_set('dependencyUtility', $dependencyUtilityMock);
         $managementMock->_set('installUtility', $installUtilityMock);
@@ -241,7 +243,9 @@ class ExtensionManagementServiceTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             array('emitWillInstallExtensionsSignal', 'emitHasInstalledExtensionSignal')
         );
         /** @var \TYPO3\CMS\Extensionmanager\Domain\Model\Extension $extensionMock */
-        $extensionMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension::class, array('dummy'));
+        $extensionMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension::class)
+            ->setMethods(array('dummy'))
+            ->getMock();
         $extensionMock->setExtensionKey('foobar');
         $installQueue = array(
             'foobar' => $extensionMock,
@@ -263,7 +267,9 @@ class ExtensionManagementServiceTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             'emitHasInstalledExtensionSignal'
         ));
         /** @var \TYPO3\CMS\Extensionmanager\Domain\Model\Extension $extensionMock */
-        $extensionMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension::class, array('dummy'));
+        $extensionMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension::class)
+            ->setMethods(array('dummy'))
+            ->getMock();
         $extensionMock->setExtensionKey('foobar');
         $installQueue = array(
             'foobar' => $extensionMock,
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Task/UpdateExtensionListTaskTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Task/UpdateExtensionListTaskTest.php
index f2f3cb15703d0e5b8f8d223145cb8c3e56683cbe..e0a6824c9493c515cb269f2d01e09bc6feed97de 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Task/UpdateExtensionListTaskTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Task/UpdateExtensionListTaskTest.php
@@ -39,7 +39,7 @@ class UpdateExtensionListTaskTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             $this->markTestSkipped('Tests need EXT:scheduler loaded.');
         }
         $this->singletonInstances = \TYPO3\CMS\Core\Utility\GeneralUtility::getSingletonInstances();
-        $this->repositoryHelper = $this->getMock(\TYPO3\CMS\Extensionmanager\Utility\Repository\Helper::class, array(), array(), '', false);
+        $this->repositoryHelper = $this->createMock(\TYPO3\CMS\Extensionmanager\Utility\Repository\Helper::class);
     }
 
     /**
@@ -56,7 +56,7 @@ class UpdateExtensionListTaskTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function updateExtensionListTaskIsInstanceOfAbstractTask()
     {
-        $taskMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Task\UpdateExtensionListTask::class);
+        $taskMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Task\UpdateExtensionListTask::class)->getMock();
         $this->assertInstanceOf(\TYPO3\CMS\Scheduler\Task\AbstractTask::class, $taskMock);
     }
 
@@ -69,14 +69,14 @@ class UpdateExtensionListTaskTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                 ->expects($this->once())
                 ->method('updateExtList');
 
-        $objectManagerMock = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
+        $objectManagerMock = $this->getMockBuilder(\TYPO3\CMS\Extbase\Object\ObjectManager::class)->getMock();
         $objectManagerMock
                 ->expects($this->at(0))
                 ->method('get')
                 ->with(\TYPO3\CMS\Extensionmanager\Utility\Repository\Helper::class)
                 ->will($this->returnValue($this->repositoryHelper));
 
-        $persistenceManagerMock = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager::class);
+        $persistenceManagerMock = $this->getMockBuilder(\TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager::class)->getMock();
         $objectManagerMock
                 ->expects($this->at(1))
                 ->method('get')
@@ -84,7 +84,10 @@ class UpdateExtensionListTaskTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 
         \TYPO3\CMS\Core\Utility\GeneralUtility::setSingletonInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class, $objectManagerMock);
 
-        $task = $this->getMock(\TYPO3\CMS\Extensionmanager\Task\UpdateExtensionListTask::class, array('dummy'), array(), '', false);
+        $task = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Task\UpdateExtensionListTask::class)
+            ->setMethods(array('dummy'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $task->execute();
     }
 
@@ -93,14 +96,14 @@ class UpdateExtensionListTaskTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function executeCallsPersistAllOnPersistenceManager()
     {
-        $objectManagerMock = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
+        $objectManagerMock = $this->getMockBuilder(\TYPO3\CMS\Extbase\Object\ObjectManager::class)->getMock();
         $objectManagerMock
             ->expects($this->at(0))
             ->method('get')
             ->with(\TYPO3\CMS\Extensionmanager\Utility\Repository\Helper::class)
             ->will($this->returnValue($this->repositoryHelper));
 
-        $persistenceManagerMock = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager::class);
+        $persistenceManagerMock = $this->getMockBuilder(\TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager::class)->getMock();
         $persistenceManagerMock
             ->expects($this->once())
             ->method('persistAll');
@@ -112,7 +115,11 @@ class UpdateExtensionListTaskTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 
         \TYPO3\CMS\Core\Utility\GeneralUtility::setSingletonInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class, $objectManagerMock);
 
-        $task = $this->getMock(\TYPO3\CMS\Extensionmanager\Task\UpdateExtensionListTask::class, array('dummy'), array(), '', false);
+        /** @var \TYPO3\CMS\Extensionmanager\Task\UpdateExtensionListTask|PHPUnit_Framework_MockObject_MockObject $task */
+        $task = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Task\UpdateExtensionListTask::class)
+            ->setMethods(array('dummy'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $task->execute();
     }
 }
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Utility/ConfigurationUtilityTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Utility/ConfigurationUtilityTest.php
index 5cebed99ee2ca198b9d4dca17033d02b21b44ccb..c284b28cdb0d61c06b04e555803a6ef6dcca5d22 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Utility/ConfigurationUtilityTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Utility/ConfigurationUtilityTest.php
@@ -26,10 +26,9 @@ class ConfigurationUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function getCurrentConfigurationReturnsExtensionConfigurationAsValuedConfiguration()
     {
         /** @var $configurationUtility \TYPO3\CMS\Extensionmanager\Utility\ConfigurationUtility|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
-        $configurationUtility = $this->getMock(
-            \TYPO3\CMS\Extensionmanager\Utility\ConfigurationUtility::class,
-            array('getDefaultConfigurationFromExtConfTemplateAsValuedArray')
-        );
+        $configurationUtility = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Utility\ConfigurationUtility::class)
+            ->setMethods(array('getDefaultConfigurationFromExtConfTemplateAsValuedArray'))
+            ->getMock();
         $configurationUtility
             ->expects($this->once())
             ->method('getDefaultConfigurationFromExtConfTemplateAsValuedArray')
@@ -77,9 +76,9 @@ class ConfigurationUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             ->method('getExtensionPathInformation')
             ->will($this->returnValue(null));
 
-        $tsStyleConfig = $this->getMock(\TYPO3\CMS\Core\TypoScript\ConfigurationForm::class);
+        $tsStyleConfig = $this->getMockBuilder(\TYPO3\CMS\Core\TypoScript\ConfigurationForm::class)->getMock();
 
-        $objectManagerMock = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
+        $objectManagerMock = $this->getMockBuilder(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class)->getMock();
         $configurationUtility->_set('objectManager', $objectManagerMock);
         $objectManagerMock
             ->expects($this->once())
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Utility/DependencyUtilityTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Utility/DependencyUtilityTest.php
index 3c5060844520558ab75bbd4df42b16ddd5491f52..4b2849c91f978ae67773c8b590f18e481964db49 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Utility/DependencyUtilityTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Utility/DependencyUtilityTest.php
@@ -32,7 +32,7 @@ class DependencyUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     protected function setUp()
     {
-        $this->objectManagerMock = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
+        $this->objectManagerMock = $this->getMockBuilder(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class)->getMock();
     }
 
     /**
@@ -42,7 +42,9 @@ class DependencyUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function checkTypo3DependencyThrowsExceptionIfVersionNumberIsTooLow()
     {
         /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency $dependencyMock */
-        $dependencyMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency::class, array('getHighestVersion', 'getLowestVersion'));
+        $dependencyMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency::class)
+            ->setMethods(array('getHighestVersion', 'getLowestVersion'))
+            ->getMock();
         $dependencyMock->expects($this->atLeastOnce())->method('getLowestVersion')->will($this->returnValue('15.0.0'));
         $dependencyMock->setIdentifier('typo3');
         $dependencyUtility = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Utility\DependencyUtility::class, array('dummy'));
@@ -59,7 +61,9 @@ class DependencyUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function checkTypo3DependencyThrowsExceptionIfVersionNumberIsTooHigh()
     {
         /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency $dependencyMock */
-        $dependencyMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency::class, array('getHighestVersion', 'getLowestVersion'));
+        $dependencyMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency::class)
+            ->setMethods(array('getHighestVersion', 'getLowestVersion'))
+            ->getMock();
         $dependencyMock->expects($this->atLeastOnce())->method('getHighestVersion')->will($this->returnValue('3.0.0'));
         $dependencyMock->expects($this->atLeastOnce())->method('getLowestVersion')->will($this->returnValue('1.0.0'));
         $dependencyMock->setIdentifier('typo3');
@@ -77,7 +81,9 @@ class DependencyUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function checkTypo3DependencyThrowsExceptionIfIdentifierIsNotTypo3()
     {
         /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency $dependencyMock */
-        $dependencyMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency::class, array('getHighestVersion', 'getLowestVersion'));
+        $dependencyMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency::class)
+            ->setMethods(array('getHighestVersion', 'getLowestVersion'))
+            ->getMock();
         $dependencyMock->setIdentifier('123');
         $dependencyUtility = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Utility\DependencyUtility::class, array('dummy'));
 
@@ -93,7 +99,9 @@ class DependencyUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function checkTypo3DependencyReturnsTrueIfVersionNumberIsInRange()
     {
         /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency $dependencyMock */
-        $dependencyMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency::class, array('getHighestVersion', 'getLowestVersion'));
+        $dependencyMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency::class)
+            ->setMethods(array('getHighestVersion', 'getLowestVersion'))
+            ->getMock();
         $dependencyMock->expects($this->atLeastOnce())->method('getHighestVersion')->will($this->returnValue('15.0.0'));
         $dependencyMock->expects($this->atLeastOnce())->method('getLowestVersion')->will($this->returnValue('1.0.0'));
         $dependencyMock->setIdentifier('typo3');
@@ -109,7 +117,9 @@ class DependencyUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function checkTypo3DependencyCanHandleEmptyVersionHighestVersion()
     {
         /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency $dependencyMock */
-        $dependencyMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency::class, array('getHighestVersion', 'getLowestVersion'));
+        $dependencyMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency::class)
+            ->setMethods(array('getHighestVersion', 'getLowestVersion'))
+            ->getMock();
         $dependencyMock->expects($this->atLeastOnce())->method('getHighestVersion')->will($this->returnValue(''));
         $dependencyMock->expects($this->atLeastOnce())->method('getLowestVersion')->will($this->returnValue('1.0.0'));
         $dependencyMock->setIdentifier('typo3');
@@ -125,7 +135,9 @@ class DependencyUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function checkTypo3DependencyCanHandleEmptyVersionLowestVersion()
     {
         /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency $dependencyMock */
-        $dependencyMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency::class, array('getHighestVersion', 'getLowestVersion'));
+        $dependencyMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency::class)
+            ->setMethods(array('getHighestVersion', 'getLowestVersion'))
+            ->getMock();
         $dependencyMock->expects($this->atLeastOnce())->method('getHighestVersion')->will($this->returnValue('15.0.0'));
         $dependencyMock->expects($this->atLeastOnce())->method('getLowestVersion')->will($this->returnValue(''));
         $dependencyMock->setIdentifier('typo3');
@@ -141,7 +153,9 @@ class DependencyUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function checkPhpDependencyThrowsExceptionIfVersionNumberIsTooLow()
     {
         /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency $dependencyMock */
-        $dependencyMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency::class, array('getHighestVersion', 'getLowestVersion'));
+        $dependencyMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency::class)
+            ->setMethods(array('getHighestVersion', 'getLowestVersion'))
+            ->getMock();
         $dependencyMock->expects($this->atLeastOnce())->method('getLowestVersion')->will($this->returnValue('15.0.0'));
         $dependencyMock->setIdentifier('php');
         $dependencyUtility = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Utility\DependencyUtility::class, array('dummy'));
@@ -158,7 +172,9 @@ class DependencyUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function checkPhpDependencyThrowsExceptionIfVersionNumberIsTooHigh()
     {
         /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency $dependencyMock */
-        $dependencyMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency::class, array('getHighestVersion', 'getLowestVersion'));
+        $dependencyMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency::class)
+            ->setMethods(array('getHighestVersion', 'getLowestVersion'))
+            ->getMock();
         $dependencyMock->expects($this->atLeastOnce())->method('getHighestVersion')->will($this->returnValue('3.0.0'));
         $dependencyMock->expects($this->atLeastOnce())->method('getLowestVersion')->will($this->returnValue('1.0.0'));
         $dependencyMock->setIdentifier('php');
@@ -176,7 +192,9 @@ class DependencyUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function checkPhpDependencyThrowsExceptionIfIdentifierIsNotTypo3()
     {
         /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency $dependencyMock */
-        $dependencyMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency::class, array('getHighestVersion', 'getLowestVersion'));
+        $dependencyMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency::class)
+            ->setMethods(array('getHighestVersion', 'getLowestVersion'))
+            ->getMock();
         $dependencyMock->setIdentifier('123');
         $dependencyUtility = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Utility\DependencyUtility::class, array('dummy'));
 
@@ -192,7 +210,9 @@ class DependencyUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function checkPhpDependencyReturnsTrueIfVersionNumberIsInRange()
     {
         /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency $dependencyMock */
-        $dependencyMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency::class, array('getHighestVersion', 'getLowestVersion'));
+        $dependencyMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency::class)
+            ->setMethods(array('getHighestVersion', 'getLowestVersion'))
+            ->getMock();
         $dependencyMock->expects($this->atLeastOnce())->method('getHighestVersion')->will($this->returnValue('15.0.0'));
         $dependencyMock->expects($this->atLeastOnce())->method('getLowestVersion')->will($this->returnValue('1.0.0'));
         $dependencyMock->setIdentifier('php');
@@ -208,7 +228,9 @@ class DependencyUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function checkPhpDependencyCanHandleEmptyVersionHighestVersion()
     {
         /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency $dependencyMock */
-        $dependencyMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency::class, array('getHighestVersion', 'getLowestVersion'));
+        $dependencyMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency::class)
+            ->setMethods(array('getHighestVersion', 'getLowestVersion'))
+            ->getMock();
         $dependencyMock->expects($this->atLeastOnce())->method('getHighestVersion')->will($this->returnValue(''));
         $dependencyMock->expects($this->atLeastOnce())->method('getLowestVersion')->will($this->returnValue('1.0.0'));
         $dependencyMock->setIdentifier('php');
@@ -224,7 +246,9 @@ class DependencyUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function checkPhpDependencyCanHandleEmptyVersionLowestVersion()
     {
         /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency $dependencyMock */
-        $dependencyMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency::class, array('getHighestVersion', 'getLowestVersion'));
+        $dependencyMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency::class)
+            ->setMethods(array('getHighestVersion', 'getLowestVersion'))
+            ->getMock();
         $dependencyMock->expects($this->atLeastOnce())->method('getHighestVersion')->will($this->returnValue('15.0.0'));
         $dependencyMock->expects($this->atLeastOnce())->method('getLowestVersion')->will($this->returnValue(''));
         $dependencyMock->setIdentifier('php');
@@ -240,15 +264,21 @@ class DependencyUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function checkDependenciesCallsMethodToCheckPhpDependencies()
     {
         /** @var \TYPO3\CMS\Extensionmanager\Domain\Model\Extension $extensionMock */
-        $extensionMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension::class, array('dummy'));
+        $extensionMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension::class)
+            ->setMethods(array('dummy'))
+            ->getMock();
         /** @var \TYPO3\CMS\Extensionmanager\Domain\Model\Dependency $dependencyMock */
-        $dependencyMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency::class, array('getHighestVersion', 'getLowestVersion'));
+        $dependencyMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency::class)
+            ->setMethods(array('getHighestVersion', 'getLowestVersion'))
+            ->getMock();
         $dependencyMock->setIdentifier('php');
         $dependencyStorage = new \SplObjectStorage();
         $dependencyStorage->attach($dependencyMock);
         $extensionMock->setDependencies($dependencyStorage);
         /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Extensionmanager\Utility\DependencyUtility $dependencyUtility */
-        $dependencyUtility = $this->getMock(\TYPO3\CMS\Extensionmanager\Utility\DependencyUtility::class, array('checkPhpDependency', 'checkTypo3Dependency'));
+        $dependencyUtility = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Utility\DependencyUtility::class)
+            ->setMethods(array('checkPhpDependency', 'checkTypo3Dependency'))
+            ->getMock();
         $dependencyUtility->expects($this->atLeastOnce())->method('checkPhpDependency');
         $dependencyUtility->checkDependencies($extensionMock);
     }
@@ -260,15 +290,21 @@ class DependencyUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function checkDependenciesCallsMethodToCheckTypo3Dependencies()
     {
         /** @var \TYPO3\CMS\Extensionmanager\Domain\Model\Extension $extensionMock */
-        $extensionMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension::class, array('dummy'));
+        $extensionMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension::class)
+            ->setMethods(array('dummy'))
+            ->getMock();
         /** @var \TYPO3\CMS\Extensionmanager\Domain\Model\Dependency $dependencyMock */
-        $dependencyMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency::class, array('getHighestVersion', 'getLowestVersion'));
+        $dependencyMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency::class)
+            ->setMethods(array('getHighestVersion', 'getLowestVersion'))
+            ->getMock();
         $dependencyMock->setIdentifier('typo3');
         $dependencyStorage = new \SplObjectStorage();
         $dependencyStorage->attach($dependencyMock);
         $extensionMock->setDependencies($dependencyStorage);
         /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Extensionmanager\Utility\DependencyUtility $dependencyUtility */
-        $dependencyUtility = $this->getMock(\TYPO3\CMS\Extensionmanager\Utility\DependencyUtility::class, array('checkPhpDependency', 'checkTypo3Dependency'));
+        $dependencyUtility = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Utility\DependencyUtility::class)
+            ->setMethods(array('checkPhpDependency', 'checkTypo3Dependency'))
+            ->getMock();
 
         $dependencyUtility->expects($this->atLeastOnce())->method('checkTypo3Dependency');
         $dependencyUtility->checkDependencies($extensionMock);
@@ -281,7 +317,9 @@ class DependencyUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function isVersionCompatibleReturnsTrueForCompatibleVersion()
     {
         /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency $dependencyMock */
-        $dependencyMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency::class, array('getHighestVersion', 'getLowestVersion'));
+        $dependencyMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency::class)
+            ->setMethods(array('getHighestVersion', 'getLowestVersion'))
+            ->getMock();
         $dependencyMock->expects($this->atLeastOnce())->method('getHighestVersion')->will($this->returnValue('15.0.0'));
         $dependencyMock->expects($this->atLeastOnce())->method('getLowestVersion')->will($this->returnValue('1.0.0'));
         $version = '3.3.3';
@@ -297,7 +335,9 @@ class DependencyUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function isVersionCompatibleReturnsFalseForIncompatibleVersion()
     {
         /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency $dependencyMock */
-        $dependencyMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency::class, array('getHighestVersion', 'getLowestVersion'));
+        $dependencyMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency::class)
+            ->setMethods(array('getHighestVersion', 'getLowestVersion'))
+            ->getMock();
         $dependencyMock->expects($this->atLeastOnce())->method('getHighestVersion')->will($this->returnValue('1.0.1'));
         $dependencyMock->expects($this->atLeastOnce())->method('getLowestVersion')->will($this->returnValue('1.0.0'));
         $version = '3.3.3';
@@ -317,7 +357,9 @@ class DependencyUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             'foo' => array(),
             'bar' => array()
         );
-        $listUtilityMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Utility\ListUtility::class, array('getAvailableExtensions'));
+        $listUtilityMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Utility\ListUtility::class)
+            ->setMethods(array('getAvailableExtensions'))
+            ->getMock();
         $listUtilityMock->expects($this->atLeastOnce())->method('getAvailableExtensions')->will($this->returnValue($availableExtensions));
         $dependencyUtility = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Utility\DependencyUtility::class, array('dummy'));
         $dependencyUtility->_set('listUtility', $listUtilityMock);
@@ -336,7 +378,9 @@ class DependencyUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             'foo' => array(),
             'bar' => array()
         );
-        $listUtilityMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Utility\ListUtility::class, array('getAvailableExtensions'));
+        $listUtilityMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Utility\ListUtility::class)
+            ->setMethods(array('getAvailableExtensions'))
+            ->getMock();
         $listUtilityMock->expects($this->atLeastOnce())->method('getAvailableExtensions')->will($this->returnValue($availableExtensions));
         $dependencyUtility = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Utility\DependencyUtility::class, array('dummy'));
         $dependencyUtility->_set('listUtility', $listUtilityMock);
@@ -350,13 +394,17 @@ class DependencyUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function isAvailableVersionCompatibleCallsIsVersionCompatibleWithExtensionVersion()
     {
-        $emConfUtility = $this->getMock(\TYPO3\CMS\Extensionmanager\Utility\EmConfUtility::class, array('includeEmConf'));
+        $emConfUtility = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Utility\EmConfUtility::class)
+            ->setMethods(array('includeEmConf'))
+            ->getMock();
         $emConfUtility->expects($this->once())->method('includeEmConf')->will($this->returnValue(array(
             'key' => 'dummy',
             'version' => '1.0.0'
         )));
         $dependencyUtility = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Utility\DependencyUtility::class, array('setAvailableExtensions', 'isVersionCompatible'));
-        $dependencyMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency::class, array('getIdentifier'));
+        $dependencyMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency::class)
+            ->setMethods(array('getIdentifier'))
+            ->getMock();
         $dependencyMock->expects($this->once())->method('getIdentifier')->will($this->returnValue('dummy'));
         $dependencyUtility->_set('emConfUtility', $emConfUtility);
         $dependencyUtility->_set('availableExtensions', array(
@@ -375,7 +423,10 @@ class DependencyUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function isExtensionDownloadableFromTerReturnsTrueIfOneVersionExists()
     {
-        $extensionRepositoryMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Repository\ExtensionRepository::class, array('countByExtensionKey'), array($this->objectManagerMock));
+        $extensionRepositoryMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Repository\ExtensionRepository::class)
+            ->setMethods(array('countByExtensionKey'))
+            ->setConstructorArgs(array($this->objectManagerMock))
+            ->getMock();
         $extensionRepositoryMock->expects($this->once())->method('countByExtensionKey')->with('test123')->will($this->returnValue(1));
         $dependencyUtility = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Utility\DependencyUtility::class, array('dummy'));
         $dependencyUtility->_set('extensionRepository', $extensionRepositoryMock);
@@ -390,7 +441,10 @@ class DependencyUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function isExtensionDownloadableFromTerReturnsFalseIfNoVersionExists()
     {
-        $extensionRepositoryMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Repository\ExtensionRepository::class, array('countByExtensionKey'), array($this->objectManagerMock));
+        $extensionRepositoryMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Repository\ExtensionRepository::class)
+            ->setMethods(array('countByExtensionKey'))
+            ->setConstructorArgs(array($this->objectManagerMock))
+            ->getMock();
         $extensionRepositoryMock->expects($this->once())->method('countByExtensionKey')->with('test123')->will($this->returnValue(0));
         $dependencyUtility = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Utility\DependencyUtility::class, array('dummy'));
         $dependencyUtility->_set('extensionRepository', $extensionRepositoryMock);
@@ -405,11 +459,16 @@ class DependencyUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function isDownloadableVersionCompatibleReturnsTrueIfCompatibleVersionExists()
     {
-        $dependencyMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency::class, array('getIdentifier', 'getHighestVersion', 'getLowestVersion'));
+        $dependencyMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency::class)
+            ->setMethods(array('getIdentifier', 'getHighestVersion', 'getLowestVersion'))
+            ->getMock();
         $dependencyMock->expects($this->once())->method('getIdentifier')->will($this->returnValue('dummy'));
         $dependencyMock->expects($this->once())->method('getHighestVersion')->will($this->returnValue('10.0.0'));
         $dependencyMock->expects($this->once())->method('getLowestVersion')->will($this->returnValue('1.0.0'));
-        $extensionRepositoryMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Repository\ExtensionRepository::class, array('countByVersionRangeAndExtensionKey'), array($this->objectManagerMock));
+        $extensionRepositoryMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Repository\ExtensionRepository::class)
+            ->setMethods(array('countByVersionRangeAndExtensionKey'))
+            ->setConstructorArgs(array($this->objectManagerMock))
+            ->getMock();
         $extensionRepositoryMock->expects($this->once())->method('countByVersionRangeAndExtensionKey')->with('dummy', 1000000, 10000000)->will($this->returnValue(2));
         $dependencyUtility = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Utility\DependencyUtility::class, array('dummy'));
         $dependencyUtility->_set('extensionRepository', $extensionRepositoryMock);
@@ -424,9 +483,14 @@ class DependencyUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function isDownloadableVersionCompatibleReturnsFalseIfIncompatibleVersionExists()
     {
-        $dependencyMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency::class, array('getIdentifier'));
+        $dependencyMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency::class)
+            ->setMethods(array('getIdentifier'))
+            ->getMock();
         $dependencyMock->expects($this->once())->method('getIdentifier')->will($this->returnValue('dummy'));
-        $extensionRepositoryMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Repository\ExtensionRepository::class, array('countByVersionRangeAndExtensionKey'), array($this->objectManagerMock));
+        $extensionRepositoryMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Repository\ExtensionRepository::class)
+            ->setMethods(array('countByVersionRangeAndExtensionKey'))
+            ->setConstructorArgs(array($this->objectManagerMock))
+            ->getMock();
         $extensionRepositoryMock->expects($this->once())->method('countByVersionRangeAndExtensionKey')->with('dummy', 1000000, 2000000)->will($this->returnValue(0));
         $dependencyUtility = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Utility\DependencyUtility::class, array('getLowestAndHighestIntegerVersions'));
         $dependencyUtility->_set('extensionRepository', $extensionRepositoryMock);
@@ -450,7 +514,9 @@ class DependencyUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             'highestIntegerVersion' => 2000000
         );
 
-        $dependencyMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency::class, array('getHighestVersion', 'getLowestVersion'));
+        $dependencyMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency::class)
+            ->setMethods(array('getHighestVersion', 'getLowestVersion'))
+            ->getMock();
         $dependencyMock->expects($this->once())->method('getHighestVersion')->will($this->returnValue('2.0.0'));
         $dependencyMock->expects($this->once())->method('getLowestVersion')->will($this->returnValue('1.0.0'));
         $dependencyUtility = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Utility\DependencyUtility::class, array('dummy'));
@@ -475,14 +541,19 @@ class DependencyUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $myStorage = new \TYPO3\CMS\Extensionmanager\Tests\Unit\Fixtures\LatestCompatibleExtensionObjectStorageFixture();
         $myStorage->extensions[] = $extension1;
         $myStorage->extensions[] = $extension2;
-        $dependencyMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency::class, array('getIdentifier'));
+        $dependencyMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Model\Dependency::class)
+            ->setMethods(array('getIdentifier'))
+            ->getMock();
         $dependencyMock->expects($this->once())->method('getIdentifier')->will($this->returnValue('foobar'));
         $dependencyUtility = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Utility\DependencyUtility::class, array('getLowestAndHighestIntegerVersions'));
         $dependencyUtility->expects($this->once())->method('getLowestAndHighestIntegerVersions')->will($this->returnValue(array(
             'lowestIntegerVersion' => 1000000,
             'highestIntegerVersion' => 2000000
         )));
-        $extensionRepositoryMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Domain\Repository\ExtensionRepository::class, array('findByVersionRangeAndExtensionKeyOrderedByVersion'), array($this->objectManagerMock));
+        $extensionRepositoryMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Repository\ExtensionRepository::class)
+            ->setMethods(array('findByVersionRangeAndExtensionKeyOrderedByVersion'))
+            ->setConstructorArgs(array($this->objectManagerMock))
+            ->getMock();
         $extensionRepositoryMock->expects($this->once())->method('findByVersionRangeAndExtensionKeyOrderedByVersion')->with('foobar', 1000000, 2000000)->will($this->returnValue($myStorage));
         $dependencyUtility->_set('extensionRepository', $extensionRepositoryMock);
         $extension = $dependencyUtility->_call('getLatestCompatibleExtensionByIntegerVersionDependency', $dependencyMock);
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Utility/FileHandlingUtilityTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Utility/FileHandlingUtilityTest.php
index 303f52414e46e72dc88f82b54cf3a8ca0107dda7..333b46b93fb80e1c5bbce9567a37e0294b88ec17 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Utility/FileHandlingUtilityTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Utility/FileHandlingUtilityTest.php
@@ -142,7 +142,7 @@ class FileHandlingUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->expectException(ExtensionManagerException::class);
         $this->expectExceptionCode(1337280417);
         $fileHandlerMock = $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Utility\FileHandlingUtility::class, array('removeDirectory', 'addDirectory'));
-        $languageServiceMock = $this->getMock(\TYPO3\CMS\Lang\LanguageService::class);
+        $languageServiceMock = $this->getMockBuilder(\TYPO3\CMS\Lang\LanguageService::class)->getMock();
         $fileHandlerMock->_set('languageService', $languageServiceMock);
         $fileHandlerMock->_call('makeAndClearExtensionDir', 'testing123', 'fakepath');
     }
@@ -454,7 +454,9 @@ class FileHandlingUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     protected function getPreparedFileHandlingMockForDirectoryCreationTests()
     {
         /** @var $fileHandlerMock \TYPO3\CMS\Extensionmanager\Utility\FileHandlingUtility|\PHPUnit_Framework_MockObject_MockObject */
-        $fileHandlerMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Utility\FileHandlingUtility::class, array('createNestedDirectory', 'getAbsolutePath', 'directoryExists'));
+        $fileHandlerMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Utility\FileHandlingUtility::class)
+            ->setMethods(array('createNestedDirectory', 'getAbsolutePath', 'directoryExists'))
+            ->getMock();
         $fileHandlerMock->expects($this->any())
             ->method('getAbsolutePath')
             ->will($this->returnArgument(0));
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Utility/InstallUtilityTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Utility/InstallUtilityTest.php
index 353adbc189d73bdbbcbb2cfd24ef86308ee4ba13..cd36739e92839c34d97758b925d9d0f438537f56 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Utility/InstallUtilityTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Utility/InstallUtilityTest.php
@@ -69,7 +69,7 @@ class InstallUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             '',
             false
         );
-        $dependencyUtility = $this->getMock(\TYPO3\CMS\Extensionmanager\Utility\DependencyUtility::class);
+        $dependencyUtility = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Utility\DependencyUtility::class)->getMock();
         $this->installMock->_set('dependencyUtility', $dependencyUtility);
         $this->installMock->expects($this->any())
             ->method('getExtensionArray')
@@ -127,7 +127,7 @@ class InstallUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             ->method('processRuntimeDatabaseUpdates')
             ->with($this->extensionKey);
 
-        $cacheManagerMock = $this->getMock(\TYPO3\CMS\Core\Cache\CacheManager::class);
+        $cacheManagerMock = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\CacheManager::class)->getMock();
         $cacheManagerMock->expects($this->once())->method('flushCachesInGroup');
         $this->installMock->_set('cacheManager', $cacheManagerMock);
         $this->installMock->install($this->extensionKey);
@@ -138,7 +138,7 @@ class InstallUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function installCallsLoadExtension()
     {
-        $cacheManagerMock = $this->getMock(\TYPO3\CMS\Core\Cache\CacheManager::class);
+        $cacheManagerMock = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\CacheManager::class)->getMock();
         $cacheManagerMock->expects($this->once())->method('flushCachesInGroup');
         $this->installMock->_set('cacheManager', $cacheManagerMock);
         $this->installMock->expects($this->once())->method('loadExtension');
@@ -151,7 +151,7 @@ class InstallUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function installCallsFlushCachesIfClearCacheOnLoadIsSet()
     {
         $this->extensionData['clearcacheonload'] = true;
-        $cacheManagerMock = $this->getMock(\TYPO3\CMS\Core\Cache\CacheManager::class);
+        $cacheManagerMock = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\CacheManager::class)->getMock();
         $cacheManagerMock->expects($this->once())->method('flushCaches');
         $this->installMock->_set('cacheManager', $cacheManagerMock);
         $this->installMock->install($this->extensionKey);
@@ -163,7 +163,7 @@ class InstallUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function installCallsFlushCachesIfClearCacheOnLoadCamelCasedIsSet()
     {
         $this->extensionData['clearCacheOnLoad'] = true;
-        $cacheManagerMock = $this->getMock(\TYPO3\CMS\Core\Cache\CacheManager::class);
+        $cacheManagerMock = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\CacheManager::class)->getMock();
         $cacheManagerMock->expects($this->once())->method('flushCaches');
         $this->installMock->_set('cacheManager', $cacheManagerMock);
         $this->installMock->install($this->extensionKey);
@@ -174,7 +174,7 @@ class InstallUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function installationOfAnExtensionWillCallEnsureThatDirectoriesExist()
     {
-        $cacheManagerMock = $this->getMock(\TYPO3\CMS\Core\Cache\CacheManager::class);
+        $cacheManagerMock = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\CacheManager::class)->getMock();
         $cacheManagerMock->expects($this->once())->method('flushCachesInGroup');
         $this->installMock->_set('cacheManager', $cacheManagerMock);
         $this->installMock->expects($this->once())->method('ensureConfiguredDirectoriesExist');
@@ -186,7 +186,7 @@ class InstallUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function installCallsReloadCaches()
     {
-        $cacheManagerMock = $this->getMock(\TYPO3\CMS\Core\Cache\CacheManager::class);
+        $cacheManagerMock = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\CacheManager::class)->getMock();
         $cacheManagerMock->expects($this->once())->method('flushCachesInGroup');
         $this->installMock->_set('cacheManager', $cacheManagerMock);
         $this->installMock->expects($this->once())->method('reloadCaches');
@@ -198,7 +198,7 @@ class InstallUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function installCallsSaveDefaultConfigurationWithExtensionKey()
     {
-        $cacheManagerMock = $this->getMock(\TYPO3\CMS\Core\Cache\CacheManager::class);
+        $cacheManagerMock = $this->getMockBuilder(\TYPO3\CMS\Core\Cache\CacheManager::class)->getMock();
         $cacheManagerMock->expects($this->once())->method('flushCachesInGroup');
         $this->installMock->_set('cacheManager', $cacheManagerMock);
         $this->installMock->expects($this->once())->method('saveDefaultConfiguration')->with('dummy');
@@ -231,7 +231,7 @@ class InstallUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             '',
             false
         );
-        $dependencyUtility = $this->getMock(\TYPO3\CMS\Extensionmanager\Utility\DependencyUtility::class);
+        $dependencyUtility = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Utility\DependencyUtility::class)->getMock();
         $installMock->_set('dependencyUtility', $dependencyUtility);
 
         $installMock->expects($this->once())->method('updateDbWithExtTablesSql')->with($this->stringStartsWith($fileContent));
@@ -252,7 +252,7 @@ class InstallUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             '',
             false
         );
-        $dependencyUtility = $this->getMock(\TYPO3\CMS\Extensionmanager\Utility\DependencyUtility::class);
+        $dependencyUtility = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Utility\DependencyUtility::class)->getMock();
         $installMock->_set('dependencyUtility', $dependencyUtility);
         $installMock->expects($this->once())->method('importStaticSqlFile')->with($extRelPath);
         $installMock->processDatabaseUpdates($this->fakedExtensions[$extKey]);
@@ -291,7 +291,7 @@ class InstallUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             '',
             false
         );
-        $dependencyUtility = $this->getMock(\TYPO3\CMS\Extensionmanager\Utility\DependencyUtility::class);
+        $dependencyUtility = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Utility\DependencyUtility::class)->getMock();
         $installMock->_set('dependencyUtility', $dependencyUtility);
         $installMock->expects($this->once())->method('importT3DFile')->with($this->fakedExtensions[$extKey]['siteRelPath']);
         $installMock->processDatabaseUpdates($this->fakedExtensions[$extKey]);
@@ -340,7 +340,9 @@ class InstallUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $absPath = PATH_site . $this->fakedExtensions[$extKey]['siteRelPath'];
         \TYPO3\CMS\Core\Utility\GeneralUtility::mkdir($absPath . 'Initialisation');
         file_put_contents($absPath . 'Initialisation/' . $fileName, 'DUMMY');
-        $registryMock = $this->getMock(\TYPO3\CMS\Core\Registry::class, array('get', 'set'));
+        $registryMock = $this->getMockBuilder(\TYPO3\CMS\Core\Registry::class)
+            ->setMethods(array('get', 'set'))
+            ->getMock();
         $registryMock
             ->expects($this->any())
             ->method('get')
@@ -357,7 +359,7 @@ class InstallUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             '',
             false
         );
-        $dependencyUtility = $this->getMock(\TYPO3\CMS\Extensionmanager\Utility\DependencyUtility::class);
+        $dependencyUtility = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Utility\DependencyUtility::class)->getMock();
         $installMock->_set('dependencyUtility', $dependencyUtility);
         $installMock->_set('registry', $registryMock);
         $installMock->expects($this->never())->method('getImportExportUtility');
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Utility/ListUtilityTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Utility/ListUtilityTest.php
index e7968a2d715992768b51e31541f9e9aeb35ac0c2..5b80f8b7d3ab86eb58d0078a0cc2be95b0368db4 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Utility/ListUtilityTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Utility/ListUtilityTest.php
@@ -30,16 +30,18 @@ class ListUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     protected function setUp()
     {
-        $this->subject = $this->getMock(\TYPO3\CMS\Extensionmanager\Utility\ListUtility::class, array('emitPackagesMayHaveChangedSignal'));
-        $packageManagerMock = $this->getMock(\TYPO3\CMS\Core\Package\PackageManager::class);
+        $this->subject = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Utility\ListUtility::class)
+            ->setMethods(array('emitPackagesMayHaveChangedSignal'))
+            ->getMock();
+        $packageManagerMock = $this->getMockBuilder(\TYPO3\CMS\Core\Package\PackageManager::class)->getMock();
         $packageManagerMock
                 ->expects($this->any())
                 ->method('getActivePackages')
                 ->will($this->returnValue(array(
-                    'lang' => $this->getMock(\TYPO3\CMS\Core\Package::class, array(), array(), '', false),
-                    'news' => $this->getMock(\TYPO3\CMS\Core\Package::class, array(), array(), '', false),
-                    'saltedpasswords' => $this->getMock(\TYPO3\CMS\Core\Package::class, array(), array(), '', false),
-                    'rsaauth' => $this->getMock(\TYPO3\CMS\Core\Package::class, array(), array(), '', false),
+                    'lang' => $this->getMockBuilder(\TYPO3\CMS\Core\Package::class)->disableOriginalConstructor()->getMock(),
+                    'news' => $this->getMockBuilder(\TYPO3\CMS\Core\Package::class)->disableOriginalConstructor()->getMock(),
+                    'saltedpasswords' => $this->getMockBuilder(\TYPO3\CMS\Core\Package::class)->disableOriginalConstructor()->getMock(),
+                    'rsaauth' => $this->getMockBuilder(\TYPO3\CMS\Core\Package::class)->disableOriginalConstructor()->getMock(),
                 )));
         $this->inject($this->subject, 'packageManager', $packageManagerMock);
     }
@@ -164,7 +166,7 @@ class ListUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function enrichExtensionsWithEmConfInformation($extensions, $emConf, $expectedResult)
     {
         $this->inject($this->subject, 'extensionRepository', $this->getAccessibleMock(\TYPO3\CMS\Extensionmanager\Domain\Repository\ExtensionRepository::class, array('findOneByExtensionKeyAndVersion', 'findHighestAvailableVersion'), array(), '', false));
-        $emConfUtilityMock = $this->getMock(\TYPO3\CMS\Extensionmanager\Utility\EmConfUtility::class);
+        $emConfUtilityMock = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Utility\EmConfUtility::class)->getMock();
         $emConfUtilityMock->expects($this->any())->method('includeEmConf')->will($this->returnValue($emConf));
         $this->inject($this->subject, 'emConfUtility', $emConfUtilityMock);
         $this->assertEquals($expectedResult, $this->subject->enrichExtensionsWithEmConfAndTerInformation($extensions));
diff --git a/typo3/sysext/felogin/Tests/Unit/Controller/FrontendLoginControllerTest.php b/typo3/sysext/felogin/Tests/Unit/Controller/FrontendLoginControllerTest.php
index 3edb460dfb96ad5c3fbeae8cc6b8596cc407ed3b..314b4045e93c9feb552a2b0944b897b39041c86a 100644
--- a/typo3/sysext/felogin/Tests/Unit/Controller/FrontendLoginControllerTest.php
+++ b/typo3/sysext/felogin/Tests/Unit/Controller/FrontendLoginControllerTest.php
@@ -60,8 +60,8 @@ class FrontendLoginControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->testHostName = 'hostname.tld';
         $this->testSitePath = '/';
         $this->accessibleFixture = $this->getAccessibleMock(\TYPO3\CMS\Felogin\Controller\FrontendLoginController::class, array('dummy'));
-        $this->accessibleFixture->cObj = $this->getMock(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class);
-        $this->accessibleFixture->_set('frontendController', $this->getMock(\TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController::class, array(), array(), '', false));
+        $this->accessibleFixture->cObj = $this->createMock(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class);
+        $this->accessibleFixture->_set('frontendController', $this->createMock(\TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController::class));
         $this->setUpFakeSitePathAndHost();
     }
 
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/Cache/FluidTemplateCacheTest.php b/typo3/sysext/fluid/Tests/Unit/Core/Cache/FluidTemplateCacheTest.php
index 7318ff371bbe8fa814feb21e68a04d78eb0bbb6e..70a99188620f374c30c0ae1cb0c97fb9d8849491 100644
--- a/typo3/sysext/fluid/Tests/Unit/Core/Cache/FluidTemplateCacheTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/Core/Cache/FluidTemplateCacheTest.php
@@ -27,7 +27,7 @@ class FluidTemplateCacheTest extends UnitTestCase
      */
     public function flushCallsFlushOnBackend()
     {
-        $backend = $this->getMock(PhpCapableBackendInterface::class);
+        $backend = $this->createMock(PhpCapableBackendInterface::class);
         $backend->expects($this->once())->method('flush');
         $instance = new FluidTemplateCache('dummy', $backend);
         $instance->flush();
@@ -38,7 +38,10 @@ class FluidTemplateCacheTest extends UnitTestCase
      */
     public function getDelegatesToRequireOnce()
     {
-        $instance = $this->getMock(FluidTemplateCache::class, array('requireOnce'), array(), '', false);
+        $instance = $this->getMockBuilder(FluidTemplateCache::class)
+            ->setMethods(array('requireOnce'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $instance->expects($this->once())->method('requireOnce')->with('foobar');
         $instance->get('foobar');
     }
@@ -48,7 +51,7 @@ class FluidTemplateCacheTest extends UnitTestCase
      */
     public function setCallsSetOnBackend()
     {
-        $backend = $this->getMock(PhpCapableBackendInterface::class);
+        $backend = $this->createMock(PhpCapableBackendInterface::class);
         $backend->expects($this->once())->method('set')->with(
             'test',
             '<?php' . LF . 'test' . LF . '#',
@@ -64,7 +67,7 @@ class FluidTemplateCacheTest extends UnitTestCase
      */
     public function setRemovesLeadingPhpTagBeforeCallingParentWhichAddsLeadingPhpTag()
     {
-        $backend = $this->getMock(PhpCapableBackendInterface::class);
+        $backend = $this->createMock(PhpCapableBackendInterface::class);
         $backend->expects($this->once())->method('set')->with(
             'test',
             '<?php' . LF . 'test' . LF . '#',
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/Parser/PreProcessor/XmlnsNamespaceTemplatePreProcessorTest.php b/typo3/sysext/fluid/Tests/Unit/Core/Parser/PreProcessor/XmlnsNamespaceTemplatePreProcessorTest.php
index ac0e8c9faf785e09fe1633cd40863eea8e97aaf2..e24238b4fad1388da302ea07561f3d43d93baa3d 100644
--- a/typo3/sysext/fluid/Tests/Unit/Core/Parser/PreProcessor/XmlnsNamespaceTemplatePreProcessorTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/Core/Parser/PreProcessor/XmlnsNamespaceTemplatePreProcessorTest.php
@@ -34,8 +34,12 @@ class XmlnsNamespaceTemplatePreProcessorTest extends UnitTestCase
     public function preProcessSourceExtractsNamespacesAndRemovesTagsAndAttributes($source, array $expectedNamespaces, $expectedSource)
     {
         $subject = new XmlnsNamespaceTemplatePreProcessor();
-        $resolver = $this->getMock(ViewHelperResolver::class, array('addNamespace'));
-        $context = $this->getMock(RenderingContextFixture::class, array('getViewHelperResolver'));
+        $resolver = $this->getMockBuilder(ViewHelperResolver::class)
+            ->setMethods(array('addNamespace'))
+            ->getMock();
+        $context = $this->getMockBuilder(RenderingContextFixture::class)
+            ->setMethods(array('getViewHelperResolver'))
+            ->getMock();
         if (empty($expectedNamespaces)) {
             $context->expects($this->never())->method('getViewHelperResolver');
             $resolver->expects($this->never())->method('addNamespace');
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/Parser/SyntaxTree/LegacyNamespaceExpressionNodeTest.php b/typo3/sysext/fluid/Tests/Unit/Core/Parser/SyntaxTree/LegacyNamespaceExpressionNodeTest.php
index 2de770212eab551f4a6ff4f04373d22e8ff1bdaf..b23b331a1951ece5c94edf42b9e9a3a00741f57d 100644
--- a/typo3/sysext/fluid/Tests/Unit/Core/Parser/SyntaxTree/LegacyNamespaceExpressionNodeTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/Core/Parser/SyntaxTree/LegacyNamespaceExpressionNodeTest.php
@@ -30,9 +30,13 @@ class LegacyNamespaceExpressionNodeTest extends UnitTestCase
      */
     public function evaluateExpressionExtractsNamespaces(array $matches, array $expected)
     {
-        $resolver = $this->getMock('TYPO3Fluid\\Fluid\\Core\\ViewHelper\\ViewHelperResolver', array('addNamespace'));
+        $resolver = $this->getMockBuilder('TYPO3Fluid\\Fluid\\Core\\ViewHelper\\ViewHelperResolver')
+            ->setMethods(array('addNamespace'))
+            ->getMock();
         $resolver->expects($this->once())->method('addNamespace')->with($expected[0], $expected[1]);
-        $context = $this->getMock(RenderingContextFixture::class, array('getViewHelperResolver'));
+        $context = $this->getMockBuilder(RenderingContextFixture::class)
+            ->setMethods(array('getViewHelperResolver'))
+            ->getMock();
         $context->expects($this->once())->method('getViewHelperResolver')->willReturn($resolver);
         LegacyNamespaceExpressionNode::evaluateExpression($context, $matches[0], $matches);
     }
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/Rendering/RenderingContextTest.php b/typo3/sysext/fluid/Tests/Unit/Core/Rendering/RenderingContextTest.php
index 1ed9d939e50647d6c52da865379055a5bcdca955..239b02cc739f5dc15849a30907f4e99b9a302a1f 100644
--- a/typo3/sysext/fluid/Tests/Unit/Core/Rendering/RenderingContextTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/Core/Rendering/RenderingContextTest.php
@@ -47,11 +47,17 @@ class RenderingContextTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function setControllerContextWithSubpackageKeySetsExpectedControllerContext()
     {
-        $renderingContext = $this->getMock(RenderingContextFixture::class, array('setControllerAction', 'setControllerName'));
-        $request = $this->getMock(Request::class, array('getControllerActionName', 'getControllerSubpackageKey', 'getControllerName'));
+        $renderingContext = $this->getMockBuilder(RenderingContextFixture::class)
+            ->setMethods(array('setControllerAction', 'setControllerName'))
+            ->getMock();
+        $request = $this->getMockBuilder(Request::class)
+            ->setMethods(array('getControllerActionName', 'getControllerSubpackageKey', 'getControllerName'))
+            ->getMock();
         $request->expects($this->exactly(2))->method('getControllerSubpackageKey')->willReturn('test1');
         $request->expects($this->once())->method('getControllerName')->willReturn('test2');
-        $controllerContext = $this->getMock(ControllerContext::class, array('getRequest'));
+        $controllerContext = $this->getMockBuilder(ControllerContext::class)
+            ->setMethods(array('getRequest'))
+            ->getMock();
         $controllerContext->expects($this->once())->method('getRequest')->willReturn($request);
         $renderingContext->expects($this->once())->method('setControllerName')->with('test1\\test2');
         $renderingContext->setControllerContext($controllerContext);
@@ -62,7 +68,7 @@ class RenderingContextTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function templateVariableContainerCanBeReadCorrectly()
     {
-        $templateVariableContainer = $this->getMock(\TYPO3\CMS\Fluid\Core\ViewHelper\TemplateVariableContainer::class);
+        $templateVariableContainer = $this->createMock(\TYPO3\CMS\Fluid\Core\ViewHelper\TemplateVariableContainer::class);
         $this->renderingContext->setVariableProvider($templateVariableContainer);
         $this->assertSame($this->renderingContext->getTemplateVariableContainer(), $templateVariableContainer, 'Template Variable Container could not be read out again.');
     }
@@ -72,11 +78,11 @@ class RenderingContextTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function controllerContextCanBeReadCorrectly()
     {
-        $controllerContext = $this->getMock(
-            \TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext::class,
-            array('getRequest'), array(), '', false
-        );
-        $controllerContext->expects($this->atLeastOnce())->method('getRequest')->willReturn($this->getMock(Request::class));
+        $controllerContext = $this->getMockBuilder(\TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext::class)
+            ->setMethods(array('getRequest'))
+            ->disableOriginalConstructor()
+            ->getMock();
+        $controllerContext->expects($this->atLeastOnce())->method('getRequest')->willReturn($this->createMock(Request::class));
         $this->renderingContext->setControllerContext($controllerContext);
         $this->assertSame($this->renderingContext->getControllerContext(), $controllerContext);
     }
@@ -86,7 +92,7 @@ class RenderingContextTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function viewHelperVariableContainerCanBeReadCorrectly()
     {
-        $viewHelperVariableContainer = $this->getMock(\TYPO3\CMS\Fluid\Core\ViewHelper\ViewHelperVariableContainer::class);
+        $viewHelperVariableContainer = $this->createMock(\TYPO3\CMS\Fluid\Core\ViewHelper\ViewHelperVariableContainer::class);
         $this->renderingContext->_set('viewHelperVariableContainer', $viewHelperVariableContainer);
         $this->assertSame($viewHelperVariableContainer, $this->renderingContext->getViewHelperVariableContainer());
     }
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/AbstractViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/AbstractViewHelperTest.php
index f48d2336f815a3e6fb8329af7a7522fa5265fccf..4534d1390a6c5bf3741dee94556a204ce5283bbb 100644
--- a/typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/AbstractViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/AbstractViewHelperTest.php
@@ -68,7 +68,7 @@ class AbstractViewHelperTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 
     protected function setUp()
     {
-        $this->mockReflectionService = $this->getMock(\TYPO3\CMS\Extbase\Reflection\ReflectionService::class, array(), array(), '', false);
+        $this->mockReflectionService = $this->createMock(\TYPO3\CMS\Extbase\Reflection\ReflectionService::class);
     }
 
     /**
@@ -79,7 +79,9 @@ class AbstractViewHelperTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function registerRenderMethodArgumentsThrowsExceptionOnMissingType(array $arguments, $expectsException = false)
     {
-        $reflectionService = $this->getMock(ReflectionService::class, array('getMethodParameters', 'getMethodTagsValues'));
+        $reflectionService = $this->getMockBuilder(ReflectionService::class)
+            ->setMethods(array('getMethodParameters', 'getMethodTagsValues'))
+            ->getMock();
         $reflectionService->expects($this->once())->method('getMethodParameters')->willReturn(
             array(
                 'param1' => array(
@@ -105,7 +107,9 @@ class AbstractViewHelperTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function callRenderMethodBehavesAsExpected(array $arguments, $expectsException = false)
     {
-        $reflectionService = $this->getMock(ReflectionService::class, array('getMethodParameters', 'getMethodTagsValues'));
+        $reflectionService = $this->getMockBuilder(ReflectionService::class)
+            ->setMethods(array('getMethodParameters', 'getMethodTagsValues'))
+            ->getMock();
         $reflectionService->expects($this->once())->method('getMethodParameters')->willReturn(
             array(
                 'param1' => array(
@@ -258,7 +262,7 @@ class AbstractViewHelperTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function prepareArgumentsRegistersAnnotationBasedArgumentsWithDescriptionIfDebugModeIsEnabled()
     {
-        $dataCacheMock = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\VariableFrontend::class, array(), array(), '', false);
+        $dataCacheMock = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\VariableFrontend::class);
         $dataCacheMock->expects($this->any())->method('has')->will($this->returnValue(true));
         $dataCacheMock->expects($this->any())->method('get')->will($this->returnValue(array()));
 
@@ -359,10 +363,13 @@ class AbstractViewHelperTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function setRenderingContextShouldSetInnerVariables()
     {
-        $templateVariableContainer = $this->getMock(\TYPO3\CMS\Fluid\Core\ViewHelper\TemplateVariableContainer::class);
-        $viewHelperVariableContainer = $this->getMock(\TYPO3\CMS\Fluid\Core\ViewHelper\ViewHelperVariableContainer::class);
-        $controllerContext = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext::class, array('getRequest'), array(), '', false);
-        $controllerContext->expects($this->atLeastOnce())->method('getRequest')->willReturn($this->getMock(Request::class));
+        $templateVariableContainer = $this->createMock(\TYPO3\CMS\Fluid\Core\ViewHelper\TemplateVariableContainer::class);
+        $viewHelperVariableContainer = $this->createMock(\TYPO3\CMS\Fluid\Core\ViewHelper\ViewHelperVariableContainer::class);
+        $controllerContext = $this->getMockBuilder(\TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext::class)
+            ->setMethods(array('getRequest'))
+            ->disableOriginalConstructor()
+            ->getMock();
+        $controllerContext->expects($this->atLeastOnce())->method('getRequest')->willReturn($this->createMock(Request::class));
 
         $renderingContext = $this->getAccessibleMock(RenderingContextFixture::class, array('getControllerContext'));
         $renderingContext->expects($this->any())->method('getControllerContext')->willReturn($controllerContext);
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/ViewHelperResolverTest.php b/typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/ViewHelperResolverTest.php
index 7be28d1745364240ac998e8b4242488cf9c5e55c..a22ae8f1c1e217c4e113104d477f9bf9e72ebf8c 100644
--- a/typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/ViewHelperResolverTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/Core/ViewHelper/ViewHelperResolverTest.php
@@ -29,9 +29,14 @@ class ViewHelperResolverTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function createViewHelperInstanceCreatesViewHelperInstanceUsingObjectManager()
     {
-        $objectManager = $this->getMock(ObjectManager::class, array('get'), array(), '', false);
+        $objectManager = $this->getMockBuilder(ObjectManager::class)
+            ->setMethods(array('get'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $objectManager->expects($this->once())->method('get')->with('x')->willReturn('y');
-        $resolver = $this->getMock(ViewHelperResolver::class, array('getObjectManager'));
+        $resolver = $this->getMockBuilder(ViewHelperResolver::class)
+            ->setMethods(array('getObjectManager'))
+            ->getMock();
         $resolver->expects($this->once())->method('getObjectManager')->willReturn($objectManager);
         $this->assertEquals('y', $resolver->createViewHelperInstanceFromClassName('x'));
     }
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/Widget/AbstractWidgetControllerTest.php b/typo3/sysext/fluid/Tests/Unit/Core/Widget/AbstractWidgetControllerTest.php
index 6ca03b2e0a85380bff966a9f29bf297bf6eb6f9e..78708d856764dad82647d4d18c11f604435595b7 100644
--- a/typo3/sysext/fluid/Tests/Unit/Core/Widget/AbstractWidgetControllerTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/Core/Widget/AbstractWidgetControllerTest.php
@@ -33,9 +33,15 @@ class AbstractWidgetControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function canHandleWidgetRequest()
     {
         /** @var WidgetRequest|\PHPUnit_Framework_MockObject_MockObject $request */
-        $request = $this->getMock(\TYPO3\CMS\Fluid\Core\Widget\WidgetRequest::class, array('dummy'), array(), '', false);
+        $request = $this->getMockBuilder(\TYPO3\CMS\Fluid\Core\Widget\WidgetRequest::class)
+            ->setMethods(array('dummy'))
+            ->disableOriginalConstructor()
+            ->getMock();
         /** @var AbstractWidgetController|\PHPUnit_Framework_MockObject_MockObject $abstractWidgetController */
-        $abstractWidgetController = $this->getMock(\TYPO3\CMS\Fluid\Core\Widget\AbstractWidgetController::class, array('dummy'), array(), '', false);
+        $abstractWidgetController = $this->getMockBuilder(\TYPO3\CMS\Fluid\Core\Widget\AbstractWidgetController::class)
+            ->setMethods(array('dummy'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->assertTrue($abstractWidgetController->canProcessRequest($request));
     }
 
@@ -44,20 +50,20 @@ class AbstractWidgetControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function processRequestSetsWidgetConfiguration()
     {
-        $widgetContext = $this->getMock(\TYPO3\CMS\Fluid\Core\Widget\WidgetContext::class);
+        $widgetContext = $this->createMock(\TYPO3\CMS\Fluid\Core\Widget\WidgetContext::class);
         $widgetContext->expects($this->once())->method('getWidgetConfiguration')->will($this->returnValue('myConfiguration'));
         /** @var WidgetRequest|\PHPUnit_Framework_MockObject_MockObject $request */
-        $request = $this->getMock(\TYPO3\CMS\Fluid\Core\Widget\WidgetRequest::class, array(), array(), '', false);
+        $request = $this->createMock(\TYPO3\CMS\Fluid\Core\Widget\WidgetRequest::class);
         $request->expects($this->once())->method('getWidgetContext')->will($this->returnValue($widgetContext));
         /** @var ResponseInterface|\PHPUnit_Framework_MockObject_MockObject $response */
-        $response = $this->getMock(\TYPO3\CMS\Extbase\Mvc\ResponseInterface::class);
+        $response = $this->createMock(\TYPO3\CMS\Extbase\Mvc\ResponseInterface::class);
         /** @var AbstractWidgetController|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface $abstractWidgetController */
         $abstractWidgetController = $this->getAccessibleMock(\TYPO3\CMS\Fluid\Core\Widget\AbstractWidgetController::class, array('resolveActionMethodName', 'initializeActionMethodArguments', 'initializeActionMethodValidators', 'initializeAction', 'checkRequestHash', 'mapRequestArgumentsToControllerArguments', 'buildControllerContext', 'resolveView', 'callActionMethod'), array(), '', false);
-        $mockUriBuilder = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder::class);
-        $objectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
+        $mockUriBuilder = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder::class);
+        $objectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
         $objectManager->expects($this->any())->method('get')->with(\TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder::class)->will($this->returnValue($mockUriBuilder));
 
-        $configurationService = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Controller\MvcPropertyMappingConfigurationService::class);
+        $configurationService = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Controller\MvcPropertyMappingConfigurationService::class);
         $abstractWidgetController->_set('mvcPropertyMappingConfigurationService', $configurationService);
         $abstractWidgetController->_set('arguments', new Arguments());
 
@@ -76,7 +82,7 @@ class AbstractWidgetControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function setViewConfigurationPerformsExpectedInitialization(array $parent, $widget, array $expected)
     {
-        $configurationManager = $this->getMock(ConfigurationManagerInterface::class);
+        $configurationManager = $this->createMock(ConfigurationManagerInterface::class);
         $configurationManager->expects($this->once())->method('getConfiguration')->willReturn(array(
             'view' => array(
                 'widget' => array(
@@ -84,16 +90,26 @@ class AbstractWidgetControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                 )
             )
         ));
-        $parentRequest = $this->getMock(Request::class, array('getControllerExtensionKey'));
+        $parentRequest = $this->getMockBuilder(Request::class)
+            ->setMethods(array('getControllerExtensionKey'))
+            ->getMock();
         $parentRequest->expects($this->once())->method('getControllerExtensionKey')->willReturn(null);
-        $controllerContext = $this->getMock(ControllerContext::class, array('getRequest'));
+        $controllerContext = $this->getMockBuilder(ControllerContext::class)
+            ->setMethods(array('getRequest'))
+            ->getMock();
         $controllerContext->expects($this->once())->method('getRequest')->willReturn($parentRequest);
-        $templatePaths = $this->getMock(TemplatePaths::class, array('fillFromConfigurationArray', 'toArray'));
+        $templatePaths = $this->getMockBuilder(TemplatePaths::class)
+            ->setMethods(array('fillFromConfigurationArray', 'toArray'))
+            ->getMock();
         $templatePaths->expects($this->once())->method('fillFromConfigurationArray')->with($expected);
         $templatePaths->expects($this->any())->method('toArray')->willReturn($parent);
-        $widgetContext = $this->getMock(WidgetContext::class, array('getWidgetViewHelperClassName'));
+        $widgetContext = $this->getMockBuilder(WidgetContext::class)
+            ->setMethods(array('getWidgetViewHelperClassName'))
+            ->getMock();
         $widgetContext->expects($this->once())->method('getWidgetViewHelperClassName')->willReturn('foobarClassName');
-        $request = $this->getMock(Request::class, array('getWidgetContext'));
+        $request = $this->getMockBuilder(Request::class)
+            ->setMethods(array('getWidgetContext'))
+            ->getMock();
         $request->expects($this->once())->method('getWidgetContext')->willReturn($widgetContext);
 
         $view = $this->getAccessibleMock(TemplateView::class, array('getTemplatePaths', 'toArray'), array(), '', false);
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/Widget/AbstractWidgetViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/Core/Widget/AbstractWidgetViewHelperTest.php
index a38e3ba6e949a162d5e409f7b7e2818b93bea021..3f700298ec2cd89f1ee7f88583db26bf910d8e5a 100644
--- a/typo3/sysext/fluid/Tests/Unit/Core/Widget/AbstractWidgetViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/Core/Widget/AbstractWidgetViewHelperTest.php
@@ -64,18 +64,20 @@ class AbstractWidgetViewHelperTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     protected function setUp()
     {
         $this->viewHelper = $this->getAccessibleMock(\TYPO3\CMS\Fluid\Core\Widget\AbstractWidgetViewHelper::class, array('validateArguments', 'initialize', 'callRenderMethod', 'getWidgetConfiguration', 'getRenderingContext'));
-        $this->mockExtensionService = $this->getMock(\TYPO3\CMS\Extbase\Service\ExtensionService::class);
+        $this->mockExtensionService = $this->createMock(\TYPO3\CMS\Extbase\Service\ExtensionService::class);
         $this->viewHelper->_set('extensionService', $this->mockExtensionService);
-        $this->ajaxWidgetContextHolder = $this->getMock(\TYPO3\CMS\Fluid\Core\Widget\AjaxWidgetContextHolder::class, array(), array(), '', false);
+        $this->ajaxWidgetContextHolder = $this->createMock(\TYPO3\CMS\Fluid\Core\Widget\AjaxWidgetContextHolder::class);
         $this->viewHelper->injectAjaxWidgetContextHolder($this->ajaxWidgetContextHolder);
-        $this->widgetContext = $this->getMock(\TYPO3\CMS\Fluid\Core\Widget\WidgetContext::class);
-        $this->objectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
+        $this->widgetContext = $this->createMock(\TYPO3\CMS\Fluid\Core\Widget\WidgetContext::class);
+        $this->objectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
         $this->objectManager->expects($this->at(0))->method('get')->with(\TYPO3\CMS\Fluid\Core\Widget\WidgetContext::class)->will($this->returnValue($this->widgetContext));
         $this->viewHelper->injectObjectManager($this->objectManager);
-        $this->request = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Web\Request::class);
-        $this->controllerContext = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext::class, array(), array(), '', false);
+        $this->request = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Web\Request::class);
+        $this->controllerContext = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext::class);
         $this->controllerContext->expects($this->any())->method('getRequest')->will($this->returnValue($this->request));
-        $this->renderingContext = $this->getMock(\TYPO3\CMS\Fluid\Tests\Unit\Core\Rendering\RenderingContextFixture::class, array('getControllerContext'));
+        $this->renderingContext = $this->getMockBuilder(\TYPO3\CMS\Fluid\Tests\Unit\Core\Rendering\RenderingContextFixture::class)
+            ->setMethods(array('getControllerContext'))
+            ->getMock();
         $this->renderingContext->expects($this->any())->method('getControllerContext')->willReturn($this->controllerContext);
         $this->viewHelper->_set('renderingContext', $this->renderingContext);
     }
@@ -105,9 +107,9 @@ class AbstractWidgetViewHelperTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function callViewHelper()
     {
-        $mockViewHelperVariableContainer = $this->getMock(\TYPO3\CMS\Fluid\Core\ViewHelper\ViewHelperVariableContainer::class);
+        $mockViewHelperVariableContainer = $this->createMock(\TYPO3\CMS\Fluid\Core\ViewHelper\ViewHelperVariableContainer::class);
         $mockViewHelperVariableContainer->expects($this->any())->method('get')->willReturnArgument(2);
-        $mockRenderingContext = $this->getMock(\TYPO3\CMS\Fluid\Tests\Unit\Core\Rendering\RenderingContextFixture::class);
+        $mockRenderingContext = $this->createMock(\TYPO3\CMS\Fluid\Tests\Unit\Core\Rendering\RenderingContextFixture::class);
         $mockRenderingContext->expects($this->atLeastOnce())->method('getViewHelperVariableContainer')->will($this->returnValue($mockViewHelperVariableContainer));
         $mockRenderingContext->expects($this->any())->method('getControllerContext')->willReturn($this->controllerContext);
         $this->viewHelper->setRenderingContext($mockRenderingContext);
@@ -129,15 +131,15 @@ class AbstractWidgetViewHelperTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function setChildNodesAddsChildNodesToWidgetContext()
     {
-        $node1 = $this->getMock(\TYPO3Fluid\Fluid\Core\Parser\SyntaxTree\AbstractNode::class);
-        $node2 = $this->getMock(\TYPO3Fluid\Fluid\Core\Parser\SyntaxTree\TextNode::class, array(), array(), '', false);
-        $node3 = $this->getMock(\TYPO3Fluid\Fluid\Core\Parser\SyntaxTree\AbstractNode::class);
-        $rootNode = $this->getMock(\TYPO3Fluid\Fluid\Core\Parser\SyntaxTree\RootNode::class);
+        $node1 = $this->createMock(\TYPO3Fluid\Fluid\Core\Parser\SyntaxTree\AbstractNode::class);
+        $node2 = $this->createMock(\TYPO3Fluid\Fluid\Core\Parser\SyntaxTree\TextNode::class);
+        $node3 = $this->createMock(\TYPO3Fluid\Fluid\Core\Parser\SyntaxTree\AbstractNode::class);
+        $rootNode = $this->createMock(\TYPO3Fluid\Fluid\Core\Parser\SyntaxTree\RootNode::class);
         $rootNode->expects($this->at(0))->method('addChildNode')->with($node1);
         $rootNode->expects($this->at(1))->method('addChildNode')->with($node2);
         $rootNode->expects($this->at(2))->method('addChildNode')->with($node3);
         $this->objectManager->expects($this->once())->method('get')->with(\TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\RootNode::class)->will($this->returnValue($rootNode));
-        $renderingContext = $this->getMock(\TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface::class);
+        $renderingContext = $this->createMock(\TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface::class);
         $this->viewHelper->_set('renderingContext', $renderingContext);
         $this->widgetContext->expects($this->once())->method('setViewHelperChildNodes')->with($rootNode, $renderingContext);
         $this->viewHelper->setChildNodes(array($node1, $node2, $node3));
@@ -148,7 +150,7 @@ class AbstractWidgetViewHelperTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function initiateSubRequestThrowsExceptionIfControllerIsNoWidgetController()
     {
-        $controller = $this->getMock(AbstractWidgetViewHelper::class);
+        $controller = $this->createMock(AbstractWidgetViewHelper::class);
 
         $this->expectException(MissingControllerException::class);
         $this->expectExceptionCode(1289422564);
@@ -162,11 +164,11 @@ class AbstractWidgetViewHelperTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function initiateSubRequestBuildsRequestProperly()
     {
-        $controller = $this->getMock(\TYPO3\CMS\Fluid\Core\Widget\AbstractWidgetController::class, array(), array(), '', false);
+        $controller = $this->createMock(\TYPO3\CMS\Fluid\Core\Widget\AbstractWidgetController::class);
         $this->viewHelper->_set('controller', $controller);
         // Initial Setup
-        $widgetRequest = $this->getMock(\TYPO3\CMS\Fluid\Core\Widget\WidgetRequest::class);
-        $response = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Web\Response::class);
+        $widgetRequest = $this->createMock(\TYPO3\CMS\Fluid\Core\Widget\WidgetRequest::class);
+        $response = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Web\Response::class);
         $this->objectManager->expects($this->at(0))->method('get')->with(\TYPO3\CMS\Fluid\Core\Widget\WidgetRequest::class)->will($this->returnValue($widgetRequest));
         $this->objectManager->expects($this->at(1))->method('get')->with(\TYPO3\CMS\Extbase\Mvc\Web\Response::class)->will($this->returnValue($response));
         // Widget Context is set
@@ -200,7 +202,9 @@ class AbstractWidgetViewHelperTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function getWidgetConfigurationReturnsArgumentsProperty()
     {
-        $viewHelper = $this->getMock(AbstractWidgetViewHelper::class, array('dummy'));
+        $viewHelper = $this->getMockBuilder(AbstractWidgetViewHelper::class)
+            ->setMethods(array('dummy'))
+            ->getMock();
         $viewHelper->setArguments(array('foo' => 'bar'));
         $this->assertEquals(array('foo' => 'bar'), $this->callInaccessibleMethod($viewHelper, 'getWidgetConfiguration'));
     }
@@ -210,9 +214,16 @@ class AbstractWidgetViewHelperTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function compileDisablesTemplateCompiler()
     {
-        $viewHelper = $this->getMock(AbstractWidgetViewHelper::class, array('dummy'));
-        $node = $this->getMock(ViewHelperNode::class, array('dummy'), array(), '', false);
-        $compiler = $this->getMock(TemplateCompiler::class, array('disable'));
+        $viewHelper = $this->getMockBuilder(AbstractWidgetViewHelper::class)
+            ->setMethods(array('dummy'))
+            ->getMock();
+        $node = $this->getMockBuilder(ViewHelperNode::class)
+            ->setMethods(array('dummy'))
+            ->disableOriginalConstructor()
+            ->getMock();
+        $compiler = $this->getMockBuilder(TemplateCompiler::class)
+            ->setMethods(array('disable'))
+            ->getMock();
         $compiler->expects($this->once())->method('disable');
         $code = ''; // referenced
         $result = $viewHelper->compile('', '', $code, $node, $compiler);
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/Widget/AjaxWidgetContextHolderTest.php b/typo3/sysext/fluid/Tests/Unit/Core/Widget/AjaxWidgetContextHolderTest.php
index 2a8e971f5c76cfd6f5543d27f1aa677cfe351c4c..4fbef7b5fc0e85d279a298233fb3b295daedb604 100644
--- a/typo3/sysext/fluid/Tests/Unit/Core/Widget/AjaxWidgetContextHolderTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/Core/Widget/AjaxWidgetContextHolderTest.php
@@ -26,7 +26,10 @@ class AjaxWidgetContextHolderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function getThrowsExceptionIfWidgetContextIsNotFound()
     {
         /** @var \TYPO3\CMS\Fluid\Core\Widget\AjaxWidgetContextHolder $ajaxWidgetContextHolder */
-        $ajaxWidgetContextHolder = $this->getMock(\TYPO3\CMS\Fluid\Core\Widget\AjaxWidgetContextHolder::class, array('dummy'), array(), '', false);
+        $ajaxWidgetContextHolder = $this->getMockBuilder(\TYPO3\CMS\Fluid\Core\Widget\AjaxWidgetContextHolder::class)
+            ->setMethods(array('dummy'))
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $this->expectException(WidgetContextNotFoundException::class);
         $this->expectExceptionCode(1284793775);
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetContextTest.php b/typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetContextTest.php
index 2fae49da75a9d83e9b1b07a07d216855575cd9f1..84bf6f5ba0b729da1a1f49ba257979d90fe47c16 100644
--- a/typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetContextTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetContextTest.php
@@ -115,8 +115,8 @@ class WidgetContextTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function viewHelperChildNodesCanBeReadAgain()
     {
-        $viewHelperChildNodes = $this->getMock(\TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\RootNode::class);
-        $renderingContext = $this->getMock(\TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface::class);
+        $viewHelperChildNodes = $this->createMock(\TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\RootNode::class);
+        $renderingContext = $this->createMock(\TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface::class);
         $this->widgetContext->setViewHelperChildNodes($viewHelperChildNodes, $renderingContext);
         $this->assertSame($viewHelperChildNodes, $this->widgetContext->getViewHelperChildNodes());
         $this->assertSame($renderingContext, $this->widgetContext->getViewHelperChildNodeRenderingContext());
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetRequestBuilderTest.php b/typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetRequestBuilderTest.php
index 7107d58791617eff85215473023f0e272e5bc737..e663e83861286d016e49293b264b485ced83d69f 100644
--- a/typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetRequestBuilderTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetRequestBuilderTest.php
@@ -47,12 +47,12 @@ class WidgetRequestBuilderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     protected function setUp()
     {
         $this->widgetRequestBuilder = $this->getAccessibleMock(\TYPO3\CMS\Fluid\Core\Widget\WidgetRequestBuilder::class, array('setArgumentsFromRawRequestData'));
-        $this->mockWidgetRequest = $this->getMock(\TYPO3\CMS\Fluid\Core\Widget\WidgetRequest::class);
-        $this->mockObjectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
+        $this->mockWidgetRequest = $this->createMock(\TYPO3\CMS\Fluid\Core\Widget\WidgetRequest::class);
+        $this->mockObjectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
         $this->mockObjectManager->expects($this->once())->method('get')->with(\TYPO3\CMS\Fluid\Core\Widget\WidgetRequest::class)->will($this->returnValue($this->mockWidgetRequest));
         $this->widgetRequestBuilder->_set('objectManager', $this->mockObjectManager);
-        $this->mockWidgetContext = $this->getMock(\TYPO3\CMS\Fluid\Core\Widget\WidgetContext::class);
-        $this->mockAjaxWidgetContextHolder = $this->getMock(\TYPO3\CMS\Fluid\Core\Widget\AjaxWidgetContextHolder::class, array(), array(), '', false);
+        $this->mockWidgetContext = $this->createMock(\TYPO3\CMS\Fluid\Core\Widget\WidgetContext::class);
+        $this->mockAjaxWidgetContextHolder = $this->createMock(\TYPO3\CMS\Fluid\Core\Widget\AjaxWidgetContextHolder::class);
         $this->widgetRequestBuilder->injectAjaxWidgetContextHolder($this->mockAjaxWidgetContextHolder);
         $this->mockAjaxWidgetContextHolder->expects($this->once())->method('get')->will($this->returnValue($this->mockWidgetContext));
     }
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetRequestHandlerTest.php b/typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetRequestHandlerTest.php
index ca14dc48a5cfdaf57b3101c6bdee88eafbbcdbbb..d1f2b868de2a7ff8a1434fc4c8f1afcf208a3a45 100644
--- a/typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetRequestHandlerTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetRequestHandlerTest.php
@@ -61,7 +61,10 @@ class WidgetRequestHandlerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function priorityIsHigherThanDefaultRequestHandler()
     {
-        $defaultWebRequestHandler = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Web\AbstractRequestHandler::class, array('handleRequest'), array(), '', false);
+        $defaultWebRequestHandler = $this->getMockBuilder(\TYPO3\CMS\Extbase\Mvc\Web\AbstractRequestHandler::class)
+            ->setMethods(array('handleRequest'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->assertTrue($this->widgetRequestHandler->getPriority() > $defaultWebRequestHandler->getPriority());
     }
 
@@ -71,12 +74,17 @@ class WidgetRequestHandlerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function handleRequestCallsExpectedMethods()
     {
         $handler = new WidgetRequestHandler();
-        $request = $this->getMock(Request::class);
-        $requestBuilder = $this->getMock(WidgetRequestBuilder::class, array('build'));
+        $request = $this->createMock(Request::class);
+        $requestBuilder = $this->getMockBuilder(WidgetRequestBuilder::class)
+            ->setMethods(array('build'))
+            ->getMock();
         $requestBuilder->expects($this->once())->method('build')->willReturn($request);
-        $objectManager = $this->getMock(ObjectManagerInterface::class);
-        $objectManager->expects($this->once())->method('get')->willReturn($this->getMock(Response::class));
-        $requestDispatcher = $this->getMock(Dispatcher::class, array('dispatch'), array(), '', false);
+        $objectManager = $this->createMock(ObjectManagerInterface::class);
+        $objectManager->expects($this->once())->method('get')->willReturn($this->createMock(Response::class));
+        $requestDispatcher = $this->getMockBuilder(Dispatcher::class)
+            ->setMethods(array('dispatch'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $requestDispatcher->expects($this->once())->method('dispatch')->with($request);
         $this->inject($handler, 'widgetRequestBuilder', $requestBuilder);
         $this->inject($handler, 'dispatcher', $requestDispatcher);
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetRequestTest.php b/typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetRequestTest.php
index 58c5e86862dd682c68126c70767773feb86054b5..d65d17914f6054358499d7492e13fcb19670d4bd 100644
--- a/typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetRequestTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetRequestTest.php
@@ -24,9 +24,13 @@ class WidgetRequestTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function setWidgetContextAlsoSetsControllerObjectName()
     {
-        $widgetContext = $this->getMock(\TYPO3\CMS\Fluid\Core\Widget\WidgetContext::class, array('getControllerObjectName'));
+        $widgetContext = $this->getMockBuilder(\TYPO3\CMS\Fluid\Core\Widget\WidgetContext::class)
+            ->setMethods(array('getControllerObjectName'))
+            ->getMock();
         $widgetContext->expects($this->once())->method('getControllerObjectName')->will($this->returnValue('Tx_Fluid_ControllerObjectName'));
-        $widgetRequest = $this->getMock(\TYPO3\CMS\Fluid\Core\Widget\WidgetRequest::class, array('setControllerObjectName'));
+        $widgetRequest = $this->getMockBuilder(\TYPO3\CMS\Fluid\Core\Widget\WidgetRequest::class)
+            ->setMethods(array('setControllerObjectName'))
+            ->getMock();
         $widgetRequest->expects($this->once())->method('setControllerObjectName')->with('Tx_Fluid_ControllerObjectName');
         $widgetRequest->setWidgetContext($widgetContext);
     }
@@ -36,7 +40,9 @@ class WidgetRequestTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function getArgumentPrefixReadsVariablesFromWidgetContext()
     {
-        $widgetContext = $this->getMock(\TYPO3\CMS\Fluid\Core\Widget\WidgetContext::class, array('getParentPluginNamespace', 'getWidgetIdentifier'));
+        $widgetContext = $this->getMockBuilder(\TYPO3\CMS\Fluid\Core\Widget\WidgetContext::class)
+            ->setMethods(array('getParentPluginNamespace', 'getWidgetIdentifier'))
+            ->getMock();
         $widgetContext->expects($this->once())->method('getParentPluginNamespace')->will($this->returnValue('foo'));
         $widgetContext->expects($this->once())->method('getWidgetIdentifier')->will($this->returnValue('bar'));
         $widgetRequest = $this->getAccessibleMock(\TYPO3\CMS\Fluid\Core\Widget\WidgetRequest::class, array('dummy'));
@@ -49,8 +55,10 @@ class WidgetRequestTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function widgetContextCanBeReadAgain()
     {
-        $widgetContext = $this->getMock(\TYPO3\CMS\Fluid\Core\Widget\WidgetContext::class);
-        $widgetRequest = $this->getMock(\TYPO3\CMS\Fluid\Core\Widget\WidgetRequest::class, array('setControllerObjectName'));
+        $widgetContext = $this->createMock(\TYPO3\CMS\Fluid\Core\Widget\WidgetContext::class);
+        $widgetRequest = $this->getMockBuilder(\TYPO3\CMS\Fluid\Core\Widget\WidgetRequest::class)
+            ->setMethods(array('setControllerObjectName'))
+            ->getMock();
         $widgetRequest->setWidgetContext($widgetContext);
         $this->assertSame($widgetContext, $widgetRequest->getWidgetContext());
     }
diff --git a/typo3/sysext/fluid/Tests/Unit/View/AbstractTemplateViewTest.php b/typo3/sysext/fluid/Tests/Unit/View/AbstractTemplateViewTest.php
index 9f184f215800e2b99199c66513ba105c6b66ca3d..877b07104e91fff3975dd8f79fa7e54da11ec750 100644
--- a/typo3/sysext/fluid/Tests/Unit/View/AbstractTemplateViewTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/View/AbstractTemplateViewTest.php
@@ -46,8 +46,12 @@ class AbstractTemplateViewTest extends UnitTestCase
      */
     protected function setUp()
     {
-        $this->viewHelperVariableContainer = $this->getMock(ViewHelperVariableContainer::class, array('setView'));
-        $this->renderingContext = $this->getMock(\TYPO3\CMS\Fluid\Tests\Unit\Core\Rendering\RenderingContextFixture::class, array('getViewHelperVariableContainer'));
+        $this->viewHelperVariableContainer = $this->getMockBuilder(ViewHelperVariableContainer::class)
+            ->setMethods(array('setView'))
+            ->getMock();
+        $this->renderingContext = $this->getMockBuilder(\TYPO3\CMS\Fluid\Tests\Unit\Core\Rendering\RenderingContextFixture::class)
+            ->setMethods(array('getViewHelperVariableContainer'))
+            ->getMock();
         $this->renderingContext->expects($this->any())->method('getViewHelperVariableContainer')->will($this->returnValue($this->viewHelperVariableContainer));
         $this->view = $this->getAccessibleMock(AbstractTemplateView::class, array('dummy'), array(), '', false);
         $this->view->setRenderingContext($this->renderingContext);
diff --git a/typo3/sysext/fluid/Tests/Unit/View/StandaloneViewTest.php b/typo3/sysext/fluid/Tests/Unit/View/StandaloneViewTest.php
index b4dbe21b9b8691345133374630a6533287aacf72..42833fa33cfc7347e66aa49899c76d8cef731a6a 100644
--- a/typo3/sysext/fluid/Tests/Unit/View/StandaloneViewTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/View/StandaloneViewTest.php
@@ -111,17 +111,17 @@ class StandaloneViewTest extends UnitTestCase
             \TYPO3\CMS\Fluid\View\StandaloneView::class,
             array('testFileExistence', 'buildParserConfiguration', 'getOrParseAndStoreTemplate'), array(), '', false
         );
-        $this->mockConfigurationManager = $this->getMock(ConfigurationManagerInterface::class);
-        $this->mockObjectManager = $this->getMock(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
+        $this->mockConfigurationManager = $this->createMock(ConfigurationManagerInterface::class);
+        $this->mockObjectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
         $this->mockObjectManager->expects($this->any())->method('get')->will($this->returnCallback(array($this, 'objectManagerCallback')));
-        $this->mockRequest = $this->getMock(Request::class);
-        $this->mockUriBuilder = $this->getMock(UriBuilder::class);
-        $this->mockContentObject = $this->getMock(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class);
-        $this->mockControllerContext = $this->getMock(ControllerContext::class);
+        $this->mockRequest = $this->createMock(Request::class);
+        $this->mockUriBuilder = $this->createMock(UriBuilder::class);
+        $this->mockContentObject = $this->createMock(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class);
+        $this->mockControllerContext = $this->createMock(ControllerContext::class);
         $this->mockControllerContext->expects($this->any())->method('getRequest')->will($this->returnValue($this->mockRequest));
-        $this->mockTemplatePaths = $this->getMock(TemplatePaths::class);
-        $this->mockViewHelperVariableContainer = $this->getMock(ViewHelperVariableContainer::class);
-        $this->mockRenderingContext = $this->getMock(\TYPO3\CMS\Fluid\Tests\Unit\Core\Rendering\RenderingContextFixture::class);
+        $this->mockTemplatePaths = $this->createMock(TemplatePaths::class);
+        $this->mockViewHelperVariableContainer = $this->createMock(ViewHelperVariableContainer::class);
+        $this->mockRenderingContext = $this->createMock(\TYPO3\CMS\Fluid\Tests\Unit\Core\Rendering\RenderingContextFixture::class);
         $this->mockRenderingContext->expects($this->any())->method('getControllerContext')->will($this->returnValue($this->mockControllerContext));
         $this->mockRenderingContext->expects($this->any())->method('getViewHelperVariableContainer')->will($this->returnValue($this->mockViewHelperVariableContainer));
         $this->mockRenderingContext->expects($this->any())->method('getVariableProvider')->willReturn($this->mockVariableProvider);
@@ -133,8 +133,8 @@ class StandaloneViewTest extends UnitTestCase
         GeneralUtility::setSingletonInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class, $this->mockObjectManager);
         GeneralUtility::addInstance(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class, $this->mockContentObject);
 
-        $this->mockCacheManager = $this->getMock(\TYPO3\CMS\Core\Cache\CacheManager::class, array(), array(), '', false);
-        $mockCache = $this->getMock(\TYPO3Fluid\Fluid\Core\Cache\FluidCacheInterface::class, array(), array(), '', false);
+        $this->mockCacheManager = $this->createMock(\TYPO3\CMS\Core\Cache\CacheManager::class);
+        $mockCache = $this->createMock(\TYPO3Fluid\Fluid\Core\Cache\FluidCacheInterface::class);
         $this->mockCacheManager->expects($this->any())->method('getCache')->will($this->returnValue($mockCache));
         GeneralUtility::setSingletonInstance(\TYPO3\CMS\Core\Cache\CacheManager::class, $this->mockCacheManager);
     }
@@ -185,7 +185,7 @@ class StandaloneViewTest extends UnitTestCase
      */
     public function constructorSetsSpecifiedContentObject()
     {
-        $mockContentObject = $this->getMock(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class);
+        $mockContentObject = $this->createMock(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class);
         $this->mockConfigurationManager->expects($this->once())->method('setContentObject')->with($this->identicalTo($mockContentObject));
         new StandaloneView($mockContentObject);
     }
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/FlashMessagesViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/FlashMessagesViewHelperTest.php
index 6ac46f3855bf2a92f57eb97c6c4b7a5dc51e88ee..5c0fdba19b838ea9465ed300eae305c178e4a940 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/FlashMessagesViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/FlashMessagesViewHelperTest.php
@@ -43,13 +43,16 @@ class FlashMessagesViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelper
     {
         parent::setUp();
         /** @var \TYPO3\CMS\Core\Messaging\FlashMessageQueue|\PHPUnit_Framework_MockObject_MockObject $mockFlashMessagingQueue */
-        $mockFlashMessagingQueue = $this->getMock(\TYPO3\CMS\Core\Messaging\FlashMessageQueue::class, array('getAllMessagesAndFlush'), array('foo'));
+        $mockFlashMessagingQueue = $this->getMockBuilder(\TYPO3\CMS\Core\Messaging\FlashMessageQueue::class)
+            ->setMethods(array('getAllMessagesAndFlush'))
+            ->setConstructorArgs(array('foo'))
+            ->getMock();
         $mockFlashMessagingQueue->expects($this->once())->method('getAllMessagesAndFlush')->will($this->returnValue(array()));
         $this->mockFlashMessagingQueue = $mockFlashMessagingQueue;
 
         $this->controllerContext->expects($this->any())->method('getFlashMessageQueue')->will($this->returnValue($mockFlashMessagingQueue));
 
-        $this->mockTagBuilder = $this->getMock(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class);
+        $this->mockTagBuilder = $this->createMock(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class);
         $this->viewHelper = $this->getAccessibleMock(\TYPO3\CMS\Fluid\ViewHelpers\FlashMessagesViewHelper::class, array('dummy'));
         $this->viewHelper->_set('tag', $this->mockTagBuilder);
         $this->viewHelper->setRenderingContext($this->renderingContext);
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/ButtonViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/ButtonViewHelperTest.php
index e87131ebd8caa7b5a0dc72d2a654011a436689ee..bea372cacbf79cbd6cc7abff75ecb94c7f8c0e92 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/ButtonViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/ButtonViewHelperTest.php
@@ -38,7 +38,9 @@ class ButtonViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form\
      */
     public function renderCorrectlySetsTagNameAndDefaultAttributes()
     {
-        $mockTagBuilder = $this->getMock(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class, array('setTagName', 'addAttribute', 'setContent'));
+        $mockTagBuilder = $this->getMockBuilder(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class)
+            ->setMethods(array('setTagName', 'addAttribute', 'setContent'))
+            ->getMock();
         $mockTagBuilder->expects($this->once())->method('setTagName')->with('button');
         $mockTagBuilder->expects($this->at(1))->method('addAttribute')->with('type', 'submit');
         $mockTagBuilder->expects($this->at(2))->method('addAttribute')->with('name', '');
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/CheckboxViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/CheckboxViewHelperTest.php
index 61e649493919a6768dd820439668191321d53961..c3d7e1ae23e33dd279675eac5aaf42d0184190f3 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/CheckboxViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/CheckboxViewHelperTest.php
@@ -41,7 +41,9 @@ class CheckboxViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\For
      */
     public function renderCorrectlySetsTagNameAndDefaultAttributes()
     {
-        $mockTagBuilder = $this->getMock(TagBuilder::class, array('setTagName', 'addAttribute'));
+        $mockTagBuilder = $this->getMockBuilder(TagBuilder::class)
+            ->setMethods(array('setTagName', 'addAttribute'))
+            ->getMock();
         $mockTagBuilder->expects($this->once())->method('setTagName')->with('input');
         $mockTagBuilder->expects($this->at(1))->method('addAttribute')->with('type', 'checkbox');
         $mockTagBuilder->expects($this->at(2))->method('addAttribute')->with('name', 'foo');
@@ -61,7 +63,9 @@ class CheckboxViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\For
      */
     public function renderSetsCheckedAttributeIfSpecified()
     {
-        $mockTagBuilder = $this->getMock(TagBuilder::class, array('setTagName', 'addAttribute'));
+        $mockTagBuilder = $this->getMockBuilder(TagBuilder::class)
+            ->setMethods(array('setTagName', 'addAttribute'))
+            ->getMock();
         $mockTagBuilder->expects($this->at(1))->method('addAttribute')->with('type', 'checkbox');
         $mockTagBuilder->expects($this->at(2))->method('addAttribute')->with('name', 'foo');
         $mockTagBuilder->expects($this->at(3))->method('addAttribute')->with('value', 'bar');
@@ -80,7 +84,9 @@ class CheckboxViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\For
      */
     public function renderIgnoresValueOfBoundPropertyIfCheckedIsSet()
     {
-        $mockTagBuilder = $this->getMock(TagBuilder::class, array('setTagName', 'addAttribute'));
+        $mockTagBuilder = $this->getMockBuilder(TagBuilder::class)
+            ->setMethods(array('setTagName', 'addAttribute'))
+            ->getMock();
         $mockTagBuilder->expects($this->at(1))->method('addAttribute')->with('type', 'checkbox');
         $mockTagBuilder->expects($this->at(2))->method('addAttribute')->with('name', 'foo');
         $mockTagBuilder->expects($this->at(3))->method('addAttribute')->with('value', 'bar');
@@ -101,7 +107,9 @@ class CheckboxViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\For
      */
     public function renderCorrectlySetsCheckedAttributeIfCheckboxIsBoundToAPropertyOfTypeBoolean()
     {
-        $mockTagBuilder = $this->getMock(TagBuilder::class, array('setTagName', 'addAttribute'));
+        $mockTagBuilder = $this->getMockBuilder(TagBuilder::class)
+            ->setMethods(array('setTagName', 'addAttribute'))
+            ->getMock();
         $mockTagBuilder->expects($this->at(1))->method('addAttribute')->with('type', 'checkbox');
         $mockTagBuilder->expects($this->at(2))->method('addAttribute')->with('name', 'foo');
         $mockTagBuilder->expects($this->at(3))->method('addAttribute')->with('value', 'bar');
@@ -122,7 +130,9 @@ class CheckboxViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\For
      */
     public function renderAppendsSquareBracketsToNameAttributeIfBoundToAPropertyOfTypeArray()
     {
-        $mockTagBuilder = $this->getMock(TagBuilder::class, array('setTagName', 'addAttribute'));
+        $mockTagBuilder = $this->getMockBuilder(TagBuilder::class)
+            ->setMethods(array('setTagName', 'addAttribute'))
+            ->getMock();
         $mockTagBuilder->expects($this->at(1))->method('addAttribute')->with('type', 'checkbox');
         $mockTagBuilder->expects($this->at(2))->method('addAttribute')->with('name', 'foo[]');
         $this->viewHelper->expects($this->once())->method('registerFieldNameForFormTokenGeneration')->with('foo[]');
@@ -143,7 +153,9 @@ class CheckboxViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\For
      */
     public function renderCorrectlySetsCheckedAttributeIfCheckboxIsBoundToAPropertyOfTypeArray()
     {
-        $mockTagBuilder = $this->getMock(TagBuilder::class, array('setTagName', 'addAttribute'));
+        $mockTagBuilder = $this->getMockBuilder(TagBuilder::class)
+            ->setMethods(array('setTagName', 'addAttribute'))
+            ->getMock();
         $mockTagBuilder->expects($this->at(1))->method('addAttribute')->with('type', 'checkbox');
         $mockTagBuilder->expects($this->at(2))->method('addAttribute')->with('name', 'foo[]');
         $mockTagBuilder->expects($this->at(3))->method('addAttribute')->with('value', 'bar');
@@ -164,7 +176,9 @@ class CheckboxViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\For
      */
     public function renderCorrectlySetsCheckedAttributeIfCheckboxIsBoundToAPropertyOfTypeArrayObject()
     {
-        $mockTagBuilder = $this->getMock(TagBuilder::class, array('setTagName', 'addAttribute'));
+        $mockTagBuilder = $this->getMockBuilder(TagBuilder::class)
+            ->setMethods(array('setTagName', 'addAttribute'))
+            ->getMock();
         $mockTagBuilder->expects($this->at(1))->method('addAttribute')->with('type', 'checkbox');
         $mockTagBuilder->expects($this->at(2))->method('addAttribute')->with('name', 'foo[]');
         $mockTagBuilder->expects($this->at(3))->method('addAttribute')->with('value', 'bar');
@@ -185,7 +199,9 @@ class CheckboxViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\For
      */
     public function renderSetsCheckedAttributeIfBoundPropertyIsNotNull()
     {
-        $mockTagBuilder = $this->getMock(TagBuilder::class, array('setTagName', 'addAttribute'));
+        $mockTagBuilder = $this->getMockBuilder(TagBuilder::class)
+            ->setMethods(array('setTagName', 'addAttribute'))
+            ->getMock();
         $mockTagBuilder->expects($this->at(1))->method('addAttribute')->with('type', 'checkbox');
         $mockTagBuilder->expects($this->at(2))->method('addAttribute')->with('name', 'foo');
         $mockTagBuilder->expects($this->at(3))->method('addAttribute')->with('value', 'bar');
@@ -206,7 +222,9 @@ class CheckboxViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\For
      */
     public function renderSetsCheckedAttributeForListOfObjects()
     {
-        $mockTagBuilder = $this->getMock(TagBuilder::class, array('setTagName', 'addAttribute'));
+        $mockTagBuilder = $this->getMockBuilder(TagBuilder::class)
+            ->setMethods(array('setTagName', 'addAttribute'))
+            ->getMock();
         $mockTagBuilder->expects($this->at(1))->method('addAttribute')->with('type', 'checkbox');
         $mockTagBuilder->expects($this->at(2))->method('addAttribute')->with('name', 'foo[]');
         $mockTagBuilder->expects($this->at(3))->method('addAttribute')->with('value', 2);
@@ -222,7 +240,7 @@ class CheckboxViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\For
         $this->viewHelper->expects($this->any())->method('getPropertyValue')->willReturn(array($object1, $object2, $object3));
         $this->viewHelper->_set('tag', $mockTagBuilder);
 
-        $mockPersistenceManager = $this->getMock(PersistenceManagerInterface::class);
+        $mockPersistenceManager = $this->createMock(PersistenceManagerInterface::class);
         $mockPersistenceManager->expects($this->any())->method('getIdentifierByObject')->will($this->returnValueMap(array(
             array($object1, 1),
             array($object2, 2),
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/FormFieldViewHelperBaseTestcase.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/FormFieldViewHelperBaseTestcase.php
index a4c76f680d759ecb6e0524cfd93dfed215ac0156..636cee058b894582b8e682406b2298568a7ffd6c 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/FormFieldViewHelperBaseTestcase.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/FormFieldViewHelperBaseTestcase.php
@@ -31,7 +31,7 @@ abstract class FormFieldViewHelperBaseTestcase extends \TYPO3\CMS\Fluid\Tests\Un
     protected function setUp()
     {
         parent::setUp();
-        $this->mockConfigurationManager = $this->getMock(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::class);
+        $this->mockConfigurationManager = $this->createMock(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::class);
     }
 
     /**
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/HiddenViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/HiddenViewHelperTest.php
index eccf3fc33ad8b399618ede2ae9251562eb544e11..7dae3fe3cca3eb8f4f2eca58a8bf709292187b63 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/HiddenViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/HiddenViewHelperTest.php
@@ -38,7 +38,9 @@ class HiddenViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form\
      */
     public function renderCorrectlySetsTagNameAndDefaultAttributes()
     {
-        $mockTagBuilder = $this->getMock(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class, array('setTagName', 'addAttribute'));
+        $mockTagBuilder = $this->getMockBuilder(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class)
+            ->setMethods(array('setTagName', 'addAttribute'))
+            ->getMock();
         $mockTagBuilder->expects($this->once())->method('setTagName')->with('input');
         $mockTagBuilder->expects($this->at(1))->method('addAttribute')->with('type', 'hidden');
         $mockTagBuilder->expects($this->at(2))->method('addAttribute')->with('name', 'foo');
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/PasswordViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/PasswordViewHelperTest.php
index 8c5a30655a5f9145d6c484d8f5ff3b91902d4180..d2d6212f2e6abdeeea49230025a34fd63d3099e1 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/PasswordViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/PasswordViewHelperTest.php
@@ -38,7 +38,10 @@ class PasswordViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\For
      */
     public function renderCorrectlySetsTagName()
     {
-        $mockTagBuilder = $this->getMock(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class, array('setTagName'), array(), '', false);
+        $mockTagBuilder = $this->getMockBuilder(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class)
+            ->setMethods(array('setTagName'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockTagBuilder->expects($this->once())->method('setTagName')->with('input');
         $this->viewHelper->_set('tag', $mockTagBuilder);
 
@@ -51,7 +54,10 @@ class PasswordViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\For
      */
     public function renderCorrectlySetsTypeNameAndValueAttributes()
     {
-        $mockTagBuilder = $this->getMock(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class, array('addAttribute', 'setContent', 'render'), array(), '', false);
+        $mockTagBuilder = $this->getMockBuilder(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class)
+            ->setMethods(array('addAttribute', 'setContent', 'render'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockTagBuilder->expects($this->at(0))->method('addAttribute')->with('type', 'password');
         $mockTagBuilder->expects($this->at(1))->method('addAttribute')->with('name', 'NameOfTextbox');
         $this->viewHelper->expects($this->once())->method('registerFieldNameForFormTokenGeneration')->with('NameOfTextbox');
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/RadioViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/RadioViewHelperTest.php
index 3cad1113785ffba91bda32278a57f9c93af5856b..aa480bb758386be9df92f1a37a65d1b967c05cc0 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/RadioViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/RadioViewHelperTest.php
@@ -38,7 +38,9 @@ class RadioViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form\F
      */
     public function renderCorrectlySetsTagNameAndDefaultAttributes()
     {
-        $mockTagBuilder = $this->getMock(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class, array('setTagName', 'addAttribute'));
+        $mockTagBuilder = $this->getMockBuilder(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class)
+            ->setMethods(array('setTagName', 'addAttribute'))
+            ->getMock();
         $mockTagBuilder->expects($this->once())->method('setTagName')->with('input');
         $mockTagBuilder->expects($this->at(1))->method('addAttribute')->with('type', 'radio');
         $mockTagBuilder->expects($this->at(2))->method('addAttribute')->with('name', 'foo');
@@ -58,7 +60,9 @@ class RadioViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form\F
      */
     public function renderSetsCheckedAttributeIfSpecified()
     {
-        $mockTagBuilder = $this->getMock(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class, array('setTagName', 'addAttribute'));
+        $mockTagBuilder = $this->getMockBuilder(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class)
+            ->setMethods(array('setTagName', 'addAttribute'))
+            ->getMock();
         $mockTagBuilder->expects($this->at(1))->method('addAttribute')->with('type', 'radio');
         $mockTagBuilder->expects($this->at(2))->method('addAttribute')->with('name', 'foo');
         $this->viewHelper->expects($this->once())->method('registerFieldNameForFormTokenGeneration')->with('foo');
@@ -78,7 +82,9 @@ class RadioViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form\F
      */
     public function renderIgnoresBoundPropertyIfCheckedIsSet()
     {
-        $mockTagBuilder = $this->getMock(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class, array('setTagName', 'addAttribute'));
+        $mockTagBuilder = $this->getMockBuilder(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class)
+            ->setMethods(array('setTagName', 'addAttribute'))
+            ->getMock();
         $mockTagBuilder->expects($this->at(1))->method('addAttribute')->with('type', 'radio');
         $mockTagBuilder->expects($this->at(2))->method('addAttribute')->with('name', 'foo');
         $mockTagBuilder->expects($this->at(3))->method('addAttribute')->with('value', 'bar');
@@ -99,7 +105,9 @@ class RadioViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form\F
      */
     public function renderCorrectlySetsCheckedAttributeIfCheckboxIsBoundToAPropertyOfTypeBoolean()
     {
-        $mockTagBuilder = $this->getMock(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class, array('setTagName', 'addAttribute'));
+        $mockTagBuilder = $this->getMockBuilder(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class)
+            ->setMethods(array('setTagName', 'addAttribute'))
+            ->getMock();
         $mockTagBuilder->expects($this->at(1))->method('addAttribute')->with('type', 'radio');
         $mockTagBuilder->expects($this->at(2))->method('addAttribute')->with('name', 'foo');
         $this->viewHelper->expects($this->once())->method('registerFieldNameForFormTokenGeneration')->with('foo');
@@ -121,7 +129,9 @@ class RadioViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form\F
      */
     public function renderDoesNotAppendSquareBracketsToNameAttributeIfBoundToAPropertyOfTypeArray()
     {
-        $mockTagBuilder = $this->getMock(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class, array('setTagName', 'addAttribute'));
+        $mockTagBuilder = $this->getMockBuilder(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class)
+            ->setMethods(array('setTagName', 'addAttribute'))
+            ->getMock();
         $mockTagBuilder->expects($this->at(1))->method('addAttribute')->with('type', 'radio');
         $mockTagBuilder->expects($this->at(2))->method('addAttribute')->with('name', 'foo');
         $this->viewHelper->expects($this->once())->method('registerFieldNameForFormTokenGeneration')->with('foo');
@@ -142,7 +152,9 @@ class RadioViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form\F
      */
     public function renderCorrectlySetsCheckedAttributeIfCheckboxIsBoundToAPropertyOfTypeString()
     {
-        $mockTagBuilder = $this->getMock(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class, array('setTagName', 'addAttribute'));
+        $mockTagBuilder = $this->getMockBuilder(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class)
+            ->setMethods(array('setTagName', 'addAttribute'))
+            ->getMock();
         $mockTagBuilder->expects($this->at(1))->method('addAttribute')->with('type', 'radio');
         $mockTagBuilder->expects($this->at(2))->method('addAttribute')->with('name', 'foo');
         $this->viewHelper->expects($this->once())->method('registerFieldNameForFormTokenGeneration')->with('foo');
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/SelectViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/SelectViewHelperTest.php
index 8474cdc76c342df64f4705c2e4e53017fe4da2e1..8953afc37d6e53764ca150266c4d9dcedbe30f42 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/SelectViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/SelectViewHelperTest.php
@@ -333,7 +333,7 @@ class SelectViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form\
      */
     public function selectOnDomainObjectsCreatesExpectedOptions()
     {
-        $mockPersistenceManager = $this->getMock(\TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface::class);
+        $mockPersistenceManager = $this->createMock(\TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface::class);
         $mockPersistenceManager->expects($this->any())->method('getIdentifierByObject')->will($this->returnValue(2));
         $this->viewHelper->_set('persistenceManager', $mockPersistenceManager);
 
@@ -403,7 +403,7 @@ class SelectViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form\
     public function multipleSelectOnDomainObjectsCreatesExpectedOptionsWithoutOptionValueField()
     {
         /** @var $mockPersistenceManager \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface */
-        $mockPersistenceManager = $this->getMock(\TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface::class);
+        $mockPersistenceManager = $this->createMock(\TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface::class);
         $mockPersistenceManager->expects($this->any())->method('getIdentifierByObject')->will($this->returnCallback(
             function ($object) {
                 return $object->getId();
@@ -443,7 +443,7 @@ class SelectViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form\
      */
     public function selectWithoutFurtherConfigurationOnDomainObjectsUsesUuidForValueAndLabel()
     {
-        $mockPersistenceManager = $this->getMock(\TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface::class);
+        $mockPersistenceManager = $this->createMock(\TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface::class);
         $mockPersistenceManager->expects($this->any())->method('getIdentifierByObject')->will($this->returnValue('fakeUID'));
         $this->viewHelper->_set('persistenceManager', $mockPersistenceManager);
 
@@ -469,7 +469,7 @@ class SelectViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form\
      */
     public function selectWithoutFurtherConfigurationOnDomainObjectsUsesToStringForLabelIfAvailable()
     {
-        $mockPersistenceManager = $this->getMock(\TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface::class);
+        $mockPersistenceManager = $this->createMock(\TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface::class);
         $mockPersistenceManager->expects($this->any())->method('getIdentifierByObject')->will($this->returnValue('fakeUID'));
         $this->viewHelper->_set('persistenceManager', $mockPersistenceManager);
 
@@ -478,7 +478,10 @@ class SelectViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form\
         $this->tagBuilder->expects($this->once())->method('setContent')->with('<option value="fakeUID">toStringResult</option>' . chr(10));
         $this->tagBuilder->expects($this->once())->method('render');
 
-        $user = $this->getMock(\TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form\Fixtures\UserDomainClass::class, array('__toString'), array(1, 'Ingmar', 'Schlecht'));
+        $user = $this->getMockBuilder(\TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form\Fixtures\UserDomainClass::class)
+            ->setMethods(array('__toString'))
+            ->setConstructorArgs(array(1, 'Ingmar', 'Schlecht'))
+            ->getMock();
         $user->expects($this->atLeastOnce())->method('__toString')->will($this->returnValue('toStringResult'));
 
         $this->arguments['options'] = array(
@@ -496,7 +499,7 @@ class SelectViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form\
      */
     public function selectOnDomainObjectsThrowsExceptionIfNoValueCanBeFound()
     {
-        $mockPersistenceManager = $this->getMock(\TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface::class);
+        $mockPersistenceManager = $this->createMock(\TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface::class);
         $mockPersistenceManager->expects($this->any())->method('getIdentifierByObject')->will($this->returnValue(null));
         $this->viewHelper->_set('persistenceManager', $mockPersistenceManager);
 
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/SubmitViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/SubmitViewHelperTest.php
index 594ef6a904d00313bc3accd155f715f027e23f04..56fcd0a368cf947f5b0b8ca0eb5cb70b0e2ca27f 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/SubmitViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/SubmitViewHelperTest.php
@@ -38,7 +38,9 @@ class SubmitViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form\
      */
     public function renderCorrectlySetsTagNameAndDefaultAttributes()
     {
-        $mockTagBuilder = $this->getMock(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class, array('setTagName', 'addAttribute'));
+        $mockTagBuilder = $this->getMockBuilder(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class)
+            ->setMethods(array('setTagName', 'addAttribute'))
+            ->getMock();
         $mockTagBuilder->expects($this->once())->method('setTagName')->with('input');
         $mockTagBuilder->expects($this->at(1))->method('addAttribute')->with('type', 'submit');
 
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/TextareaViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/TextareaViewHelperTest.php
index 0808ba3c267c095fdb8487a7e4b5dc6cc0021ff3..319b3bc75981e32d8500e2a4f6a48e71919f00a8 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/TextareaViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/TextareaViewHelperTest.php
@@ -38,7 +38,10 @@ class TextareaViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\For
      */
     public function renderCorrectlySetsTagName()
     {
-        $mockTagBuilder = $this->getMock(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class, array('setTagName'), array(), '', false);
+        $mockTagBuilder = $this->getMockBuilder(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class)
+            ->setMethods(array('setTagName'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockTagBuilder->expects($this->once())->method('setTagName')->with('textarea');
         $this->viewHelper->_set('tag', $mockTagBuilder);
 
@@ -51,7 +54,10 @@ class TextareaViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\For
      */
     public function renderCorrectlySetsNameAttributeAndContent()
     {
-        $mockTagBuilder = $this->getMock(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class, array('addAttribute', 'setContent', 'render'), array(), '', false);
+        $mockTagBuilder = $this->getMockBuilder(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class)
+            ->setMethods(array('addAttribute', 'setContent', 'render'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockTagBuilder->expects($this->once())->method('addAttribute')->with('name', 'NameOfTextarea');
         $this->viewHelper->expects($this->once())->method('registerFieldNameForFormTokenGeneration')->with('NameOfTextarea');
         $mockTagBuilder->expects($this->once())->method('setContent')->with('Current value');
@@ -83,7 +89,10 @@ class TextareaViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\For
      */
     public function renderEscapesTextareaContent()
     {
-        $mockTagBuilder = $this->getMock(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class, array('addAttribute', 'setContent', 'render'), array(), '', false);
+        $mockTagBuilder = $this->getMockBuilder(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class)
+            ->setMethods(array('addAttribute', 'setContent', 'render'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockTagBuilder->expects($this->once())->method('addAttribute')->with('name', 'NameOfTextarea');
         $this->viewHelper->expects($this->once())->method('registerFieldNameForFormTokenGeneration')->with('NameOfTextarea');
         $mockTagBuilder->expects($this->once())->method('setContent')->with('some &lt;tag&gt; &amp; &quot;quotes&quot;');
@@ -106,7 +115,10 @@ class TextareaViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\For
      */
     public function renderAddsPlaceholder()
     {
-        $mockTagBuilder = $this->getMock(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class, array('addAttribute', 'setContent', 'render'), array(), '', false);
+        $mockTagBuilder = $this->getMockBuilder(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class)
+            ->setMethods(array('addAttribute', 'setContent', 'render'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockTagBuilder->expects($this->at(0))->method('addAttribute')->with('placeholder', 'SomePlaceholder');
         $mockTagBuilder->expects($this->at(1))->method('addAttribute')->with('name', 'NameOfTextarea');
         $mockTagBuilder->expects($this->once())->method('render');
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/TextfieldViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/TextfieldViewHelperTest.php
index d9fe370bac7bade0983aa0c1fab612f9a0f02129..21fca11cde1eedc1de51fc55f71b5d5aaeb49136 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/TextfieldViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/TextfieldViewHelperTest.php
@@ -38,7 +38,10 @@ class TextfieldViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Fo
      */
     public function renderCorrectlySetsTagName()
     {
-        $mockTagBuilder = $this->getMock(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class, array('setTagName'), array(), '', false);
+        $mockTagBuilder = $this->getMockBuilder(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class)
+            ->setMethods(array('setTagName'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockTagBuilder->expects($this->once())->method('setTagName')->with('input');
         $this->viewHelper->_set('tag', $mockTagBuilder);
 
@@ -51,7 +54,10 @@ class TextfieldViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Fo
      */
     public function renderCorrectlySetsTypeNameAndValueAttributes()
     {
-        $mockTagBuilder = $this->getMock(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class, array('addAttribute', 'setContent', 'render'), array(), '', false);
+        $mockTagBuilder = $this->getMockBuilder(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class)
+            ->setMethods(array('addAttribute', 'setContent', 'render'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockTagBuilder->expects($this->at(0))->method('addAttribute')->with('type', 'text');
         $mockTagBuilder->expects($this->at(1))->method('addAttribute')->with('name', 'NameOfTextfield');
         $this->viewHelper->expects($this->once())->method('registerFieldNameForFormTokenGeneration')->with('NameOfTextfield');
@@ -84,7 +90,10 @@ class TextfieldViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Fo
      */
     public function renderAddsPlaceholder()
     {
-        $mockTagBuilder = $this->getMock(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class, array('addAttribute', 'setContent', 'render'), array(), '', false);
+        $mockTagBuilder = $this->getMockBuilder(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class)
+            ->setMethods(array('addAttribute', 'setContent', 'render'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockTagBuilder->expects($this->at(0))->method('addAttribute')->with('placeholder', 'SomePlaceholder');
         $mockTagBuilder->expects($this->at(1))->method('addAttribute')->with('type', 'text');
         $mockTagBuilder->expects($this->at(2))->method('addAttribute')->with('name', 'NameOfTextfield');
@@ -107,7 +116,10 @@ class TextfieldViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Fo
      */
     public function renderCorrectlySetsRequiredAttribute()
     {
-        $mockTagBuilder = $this->getMock(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class, array('addAttribute', 'setContent', 'render'), array(), '', false);
+        $mockTagBuilder = $this->getMockBuilder(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class)
+            ->setMethods(array('addAttribute', 'setContent', 'render'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockTagBuilder->expects($this->at(0))->method('addAttribute')->with('type', 'text');
         $mockTagBuilder->expects($this->at(1))->method('addAttribute')->with('name', 'NameOfTextfield');
         $this->viewHelper->expects($this->once())->method('registerFieldNameForFormTokenGeneration')->with('NameOfTextfield');
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/UploadViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/UploadViewHelperTest.php
index d395a90a7da6b31913571c6dc3f2332cadf5d62d..deae2cc20b1ed93c54766ef9e808e77c112a9326 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/UploadViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/UploadViewHelperTest.php
@@ -49,7 +49,10 @@ class UploadViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Form\
      */
     public function renderCorrectlySetsTypeNameAndValueAttributes()
     {
-        $mockTagBuilder = $this->getMock(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class, array('addAttribute', 'setContent', 'render'), array(), '', false);
+        $mockTagBuilder = $this->getMockBuilder(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class)
+            ->setMethods(array('addAttribute', 'setContent', 'render'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $mockTagBuilder->expects($this->at(0))->method('addAttribute')->with('type', 'file');
         $mockTagBuilder->expects($this->at(1))->method('addAttribute')->with('name', 'someName');
         $this->viewHelper->expects($this->at(0))->method('registerFieldNameForFormTokenGeneration')->with('someName[name]');
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/FormViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/FormViewHelperTest.php
index d6ac7c26835e88357ee857f022a3f55e916b3f05..e2e670347ffb666e4f91953ca1777340734d338e 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/FormViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/FormViewHelperTest.php
@@ -34,8 +34,8 @@ class FormViewHelperTest extends ViewHelperBaseTestcase
     protected function setUp()
     {
         parent::setUp();
-        $this->mockExtensionService = $this->getMock(\TYPO3\CMS\Extbase\Service\ExtensionService::class);
-        $this->mockConfigurationManager = $this->getMock(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::class);
+        $this->mockExtensionService = $this->createMock(\TYPO3\CMS\Extbase\Service\ExtensionService::class);
+        $this->mockConfigurationManager = $this->createMock(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::class);
     }
 
     /**
@@ -43,7 +43,9 @@ class FormViewHelperTest extends ViewHelperBaseTestcase
      */
     public function initializeArgumentsRegistersExpectedArguments()
     {
-        $viewHelper = $this->getMock(FormViewHelper::class, array('registerTagAttribute', 'registerUniversalTagAttributes'));
+        $viewHelper = $this->getMockBuilder(FormViewHelper::class)
+            ->setMethods(array('registerTagAttribute', 'registerUniversalTagAttributes'))
+            ->getMock();
         $viewHelper->expects($this->at(0))->method('registerTagAttribute')->with('enctype', 'string', $this->anything());
         $viewHelper->expects($this->at(1))->method('registerTagAttribute')->with('method', 'string', $this->anything());
         $viewHelper->expects($this->at(2))->method('registerTagAttribute')->with('name', 'string', $this->anything());
@@ -60,7 +62,9 @@ class FormViewHelperTest extends ViewHelperBaseTestcase
     {
         $viewHelper = $this->getAccessibleMock(FormViewHelper::class, array('hasArgument'));
         $viewHelper->expects($this->once())->method('hasArgument')->with('actionUri')->willReturn(true);
-        $tagBuilder = $this->getMock(TagBuilder::class, array('addAttribute'));
+        $tagBuilder = $this->getMockBuilder(TagBuilder::class)
+            ->setMethods(array('addAttribute'))
+            ->getMock();
         $tagBuilder->expects($this->once())->method('addAttribute')->with('action', 'foobar');
         $viewHelper->_set('tag', $tagBuilder);
         $viewHelper->setArguments(array('actionUri' => 'foobar'));
@@ -75,7 +79,9 @@ class FormViewHelperTest extends ViewHelperBaseTestcase
     {
         $viewHelper->_set('configurationManager', $this->mockConfigurationManager);
         parent::injectDependenciesIntoViewHelper($viewHelper);
-        $hashService = $this->getMock(\TYPO3\CMS\Extbase\Security\Cryptography\HashService::class, array('appendHmac'));
+        $hashService = $this->getMockBuilder(\TYPO3\CMS\Extbase\Security\Cryptography\HashService::class)
+            ->setMethods(array('appendHmac'))
+            ->getMock();
         $hashService->expects($this->any())->method('appendHmac')->will($this->returnValue(''));
         $this->mvcPropertyMapperConfigurationService->_set('hashService', $hashService);
         $viewHelper->_set('mvcPropertyMapperConfigurationService', $this->mvcPropertyMapperConfigurationService);
@@ -185,7 +191,10 @@ class FormViewHelperTest extends ViewHelperBaseTestcase
      */
     public function renderWrapsHiddenFieldsWithDivAndAnAdditionalClassForXhtmlCompatibilityWithRewrittenPropertyMapper()
     {
-        $viewHelper = $this->getMock($this->buildAccessibleProxy(\TYPO3\CMS\Fluid\ViewHelpers\FormViewHelper::class), array('renderChildren', 'renderHiddenIdentityField', 'renderAdditionalIdentityFields', 'renderHiddenReferrerFields', 'renderHiddenSecuredReferrerField', 'renderTrustedPropertiesField'), array(), '', false);
+        $viewHelper = $this->getMockBuilder($this->buildAccessibleProxy(\TYPO3\CMS\Fluid\ViewHelpers\FormViewHelper::class))
+            ->setMethods(array('renderChildren', 'renderHiddenIdentityField', 'renderAdditionalIdentityFields', 'renderHiddenReferrerFields', 'renderHiddenSecuredReferrerField', 'renderTrustedPropertiesField'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->mvcPropertyMapperConfigurationService->_set('hashService', new \TYPO3\CMS\Extbase\Security\Cryptography\HashService());
         $viewHelper->_set('mvcPropertyMapperConfigurationService', $this->mvcPropertyMapperConfigurationService);
         parent::injectDependenciesIntoViewHelper($viewHelper);
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/BytesViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/BytesViewHelperTest.php
index 7613ba8b632a627ec78759fb2839852a8b999d28..f9405ebbb3507618b5b2358bf1e6c4e78ac157c2 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/BytesViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/BytesViewHelperTest.php
@@ -34,9 +34,11 @@ class BytesViewHelperTest extends ViewHelperBaseTestcase
         $reflectionClass = new \ReflectionClass(\TYPO3\CMS\Extbase\Utility\LocalizationUtility::class);
         $property = $reflectionClass->getProperty('configurationManager');
         $property->setAccessible(true);
-        $property->setValue($this->getMock(ConfigurationManagerInterface::class));
+        $property->setValue($this->createMock(ConfigurationManagerInterface::class));
 
-        $this->viewHelper = $this->getMock(\TYPO3\CMS\Fluid\ViewHelpers\Format\BytesViewHelper::class, array('renderChildren'));
+        $this->viewHelper = $this->getMockBuilder(\TYPO3\CMS\Fluid\ViewHelpers\Format\BytesViewHelper::class)
+            ->setMethods(array('renderChildren'))
+            ->getMock();
         $this->injectDependenciesIntoViewHelper($this->viewHelper);
         $this->viewHelper->initializeArguments();
     }
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/CaseViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/CaseViewHelperTest.php
index 4f3750833892ec99026fca0d89c25d321ce4375f..e92087f64eefd211967fb2028c84e01df9c40cbc 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/CaseViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/CaseViewHelperTest.php
@@ -29,7 +29,9 @@ class CaseViewHelperTest extends ViewHelperBaseTestcase
     protected function setUp()
     {
         parent::setUp();
-        $this->subject = $this->getMock(CaseViewHelper::class, array('renderChildren'));
+        $this->subject = $this->getMockBuilder(CaseViewHelper::class)
+            ->setMethods(array('renderChildren'))
+            ->getMock();
         $this->injectDependenciesIntoViewHelper($this->subject);
     }
 
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/CropViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/CropViewHelperTest.php
index 13fd6fd223405ee36287c7ef9215b65607776912..3619a0db600c563c5a06ec1f659d7573adff86b9 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/CropViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/CropViewHelperTest.php
@@ -34,10 +34,12 @@ class CropViewHelperTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     protected function setUp()
     {
         parent::setUp();
-        $this->mockContentObject = $this->getMock(ContentObjectRenderer::class, array(), array(), '', false);
-        $this->viewHelper = $this->getMock(\TYPO3\CMS\Fluid\ViewHelpers\Format\CropViewHelper::class, array('renderChildren'));
+        $this->mockContentObject = $this->createMock(ContentObjectRenderer::class);
+        $this->viewHelper = $this->getMockBuilder(\TYPO3\CMS\Fluid\ViewHelpers\Format\CropViewHelper::class)
+            ->setMethods(array('renderChildren'))
+            ->getMock();
 
-        $renderingContext = $this->getMock(\TYPO3\CMS\Fluid\Tests\Unit\Core\Rendering\RenderingContextFixture::class);
+        $renderingContext = $this->createMock(\TYPO3\CMS\Fluid\Tests\Unit\Core\Rendering\RenderingContextFixture::class);
         $this->viewHelper->setRenderingContext($renderingContext);
         $this->viewHelper->expects($this->once())->method('renderChildren')->will($this->returnValue('Some Content'));
     }
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/CurrencyViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/CurrencyViewHelperTest.php
index 733af24458197ce83f41c260d6a4d4ceb5ef3498..312f5cd7e93c4f36e49a015c1b9d8d584d168d9c 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/CurrencyViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/CurrencyViewHelperTest.php
@@ -30,7 +30,7 @@ class CurrencyViewHelperTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $this->subject = $this->getAccessibleMock(CurrencyViewHelper::class, array('renderChildren'));
         /** @var RenderingContext $renderingContext */
-        $renderingContext = $this->getMock(\TYPO3\CMS\Fluid\Tests\Unit\Core\Rendering\RenderingContextFixture::class);
+        $renderingContext = $this->createMock(\TYPO3\CMS\Fluid\Tests\Unit\Core\Rendering\RenderingContextFixture::class);
         $this->subject->_set('renderingContext', $renderingContext);
     }
 
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/DateViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/DateViewHelperTest.php
index ef1db05246f30641e00ae17ef67950450a04c5dd..7f27bbdb8de5e899b0ccfdce235631e574f0d6e1 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/DateViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/DateViewHelperTest.php
@@ -51,7 +51,7 @@ class DateViewHelperTest extends UnitTestCase
         $GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy'] = 'Y-m-d';
         $this->subject = $this->getAccessibleMock(DateViewHelper::class, array('renderChildren'));
         /** @var RenderingContext $renderingContext */
-        $renderingContext = $this->getMock(\TYPO3\CMS\Fluid\Tests\Unit\Core\Rendering\RenderingContextFixture::class);
+        $renderingContext = $this->createMock(\TYPO3\CMS\Fluid\Tests\Unit\Core\Rendering\RenderingContextFixture::class);
         $this->subject->_set('renderingContext', $renderingContext);
     }
 
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/HtmlentitiesDecodeViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/HtmlentitiesDecodeViewHelperTest.php
index 90bdc06f37baeedce795167ccaf67d3c18152b66..9c772c9e39311318f2eb1566e7aaea27ee80168d 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/HtmlentitiesDecodeViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/HtmlentitiesDecodeViewHelperTest.php
@@ -29,10 +29,12 @@ class HtmlentitiesDecodeViewHelperTest extends UnitTestCase
 
     protected function setUp()
     {
-        $this->viewHelper = $this->getMock(HtmlentitiesDecodeViewHelper::class, array('renderChildren'));
+        $this->viewHelper = $this->getMockBuilder(HtmlentitiesDecodeViewHelper::class)
+            ->setMethods(array('renderChildren'))
+            ->getMock();
 
         /** @var RenderingContext $renderingContext */
-        $renderingContext = $this->getMock(\TYPO3\CMS\Fluid\Tests\Unit\Core\Rendering\RenderingContextFixture::class);
+        $renderingContext = $this->createMock(\TYPO3\CMS\Fluid\Tests\Unit\Core\Rendering\RenderingContextFixture::class);
         $this->viewHelper->setRenderingContext($renderingContext);
     }
 
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/HtmlentitiesViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/HtmlentitiesViewHelperTest.php
index 9b5a1cc730cf0c5a1d70f04080831b0ded2a7e3e..b9b328da02aa8c3ff30c171484ee2c78c03bff05 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/HtmlentitiesViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/HtmlentitiesViewHelperTest.php
@@ -26,7 +26,9 @@ class HtmlentitiesViewHelperTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
 
     protected function setUp()
     {
-        $this->viewHelper = $this->getMock(\TYPO3\CMS\Fluid\ViewHelpers\Format\HtmlentitiesViewHelper::class, array('renderChildren', 'resolveDefaultEncoding'));
+        $this->viewHelper = $this->getMockBuilder(\TYPO3\CMS\Fluid\ViewHelpers\Format\HtmlentitiesViewHelper::class)
+            ->setMethods(array('renderChildren', 'resolveDefaultEncoding'))
+            ->getMock();
         $this->viewHelper->expects($this->any())->method('resolveDefaultEncoding')->will($this->returnValue('UTF-8'));
     }
 
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/Nl2brViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/Nl2brViewHelperTest.php
index 263ff1fd409ab78d37730a7673f999861e6aadb6..bf93455aee40ce41f51cbbbb3e8f3b776033cec9 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/Nl2brViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/Nl2brViewHelperTest.php
@@ -29,7 +29,9 @@ class Nl2brViewHelperTest extends ViewHelperBaseTestcase
     protected function setUp()
     {
         parent::setUp();
-        $this->viewHelper = $this->getMock(Nl2brViewHelper::class, array('renderChildren'));
+        $this->viewHelper = $this->getMockBuilder(Nl2brViewHelper::class)
+            ->setMethods(array('renderChildren'))
+            ->getMock();
         $this->injectDependenciesIntoViewHelper($this->viewHelper);
         $this->viewHelper->initializeArguments();
     }
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/NumberViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/NumberViewHelperTest.php
index a04666018e6ae8120e380022dfc9094c9238fcbf..164824b4327256aa7506f6bf14152ef7e42ebd2a 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/NumberViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/NumberViewHelperTest.php
@@ -28,9 +28,11 @@ class NumberViewHelperTest extends UnitTestCase
 
     protected function setUp()
     {
-        $this->fixture = $this->getMock(NumberViewHelper::class, array('renderChildren'));
+        $this->fixture = $this->getMockBuilder(NumberViewHelper::class)
+            ->setMethods(array('renderChildren'))
+            ->getMock();
         $this->fixture->expects($this->once())->method('renderChildren')->will($this->returnValue(10000.0 / 3.0));
-        $renderingContext = $this->getMock(\TYPO3\CMS\Fluid\Tests\Unit\Core\Rendering\RenderingContextFixture::class);
+        $renderingContext = $this->createMock(\TYPO3\CMS\Fluid\Tests\Unit\Core\Rendering\RenderingContextFixture::class);
         $this->fixture->setRenderingContext($renderingContext);
     }
 
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/PaddingViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/PaddingViewHelperTest.php
index 679a8bf963b1c7b22e2f919786c4a7e672053692..e00f15eb2841b49d2f7d3535a7fa452512fe9e9e 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/PaddingViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/PaddingViewHelperTest.php
@@ -29,7 +29,9 @@ class PaddingViewHelperTest extends ViewHelperBaseTestcase
     protected function setUp()
     {
         parent::setUp();
-        $this->viewHelper = $this->getMock(PaddingViewHelper::class, array('renderChildren'));
+        $this->viewHelper = $this->getMockBuilder(PaddingViewHelper::class)
+            ->setMethods(array('renderChildren'))
+            ->getMock();
         $this->injectDependenciesIntoViewHelper($this->viewHelper);
         $this->viewHelper->initializeArguments();
     }
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/StripTagsViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/StripTagsViewHelperTest.php
index 241fdc8134199e5eebe3ce8c236f861cd5e5fa75..95f59832951c435909b06f217757af83f0741b20 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/StripTagsViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/StripTagsViewHelperTest.php
@@ -28,7 +28,9 @@ class StripTagsViewHelperTest extends ViewHelperBaseTestcase
     protected function setUp()
     {
         parent::setUp();
-        $this->viewHelper = $this->getMock(\TYPO3\CMS\Fluid\ViewHelpers\Format\StripTagsViewHelper::class, array('renderChildren'));
+        $this->viewHelper = $this->getMockBuilder(\TYPO3\CMS\Fluid\ViewHelpers\Format\StripTagsViewHelper::class)
+            ->setMethods(array('renderChildren'))
+            ->getMock();
         $this->injectDependenciesIntoViewHelper($this->viewHelper);
         $this->viewHelper->initializeArguments();
     }
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/UrlencodeViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/UrlencodeViewHelperTest.php
index 8a9fa9954e513c8abf6a8060b9d5c15baec39185..c38cc61b750ad43a8d6fc0813360e9e07f9bbc5c 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/UrlencodeViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/UrlencodeViewHelperTest.php
@@ -29,10 +29,12 @@ class UrlencodeViewHelperTest extends UnitTestCase
 
     protected function setUp()
     {
-        $this->viewHelper = $this->getMock(UrlencodeViewHelper::class, array('renderChildren'));
+        $this->viewHelper = $this->getMockBuilder(UrlencodeViewHelper::class)
+            ->setMethods(array('renderChildren'))
+            ->getMock();
 
         /** @var RenderingContext $renderingContext */
-        $renderingContext = $this->getMock(\TYPO3\CMS\Fluid\Tests\Unit\Core\Rendering\RenderingContextFixture::class);
+        $renderingContext = $this->createMock(\TYPO3\CMS\Fluid\Tests\Unit\Core\Rendering\RenderingContextFixture::class);
         $this->viewHelper->setRenderingContext($renderingContext);
     }
 
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/ImageViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/ImageViewHelperTest.php
index 3a130f8403d463a25039c83ff8ce61a9aaa5f93e..bed6f10464a9ae0fc2d9f0c62690193b850423a0 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/ImageViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/ImageViewHelperTest.php
@@ -28,7 +28,9 @@ class ImageViewHelperTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function registersExpectedArgumentsInInitializeArgumentsMethod()
     {
-        $mock = $this->getMock(ImageViewHelper::class, array('registerUniversalTagAttributes', 'registerTagAttribute'));
+        $mock = $this->getMockBuilder(ImageViewHelper::class)
+            ->setMethods(array('registerUniversalTagAttributes', 'registerTagAttribute'))
+            ->getMock();
         $mock->expects($this->at(0))->method('registerUniversalTagAttributes');
         $mock->expects($this->at(1))->method('registerTagAttribute')->with('alt', 'string', $this->anything(), false);
         $mock->expects($this->at(2))->method('registerTagAttribute')->with('ismap', 'string', $this->anything(), false);
@@ -44,7 +46,9 @@ class ImageViewHelperTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function renderMethodThrowsExceptionOnInvalidArguments(array $arguments)
     {
-        $mock = $this->getMock(ImageViewHelper::class, array('dummy'));
+        $mock = $this->getMockBuilder(ImageViewHelper::class)
+            ->setMethods(array('dummy'))
+            ->getMock();
         $mock->setArguments($arguments);
 
         $this->expectException(\TYPO3\CMS\Fluid\Core\ViewHelper\Exception::class);
@@ -84,7 +88,10 @@ class ImageViewHelperTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function renderMethodCreatesExpectedTag(array $arguments, array $expected)
     {
-        $image = $this->getMock(FileReference::class, array('getProperty'), array(), '', false);
+        $image = $this->getMockBuilder(FileReference::class)
+            ->setMethods(array('getProperty'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $image->expects($this->any())->method('getProperty')->willReturnMap(array(
             array('width', $arguments['width']),
             array('height', $arguments['height']),
@@ -92,11 +99,15 @@ class ImageViewHelperTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             array('title', 'title'),
             array('crop', 'crop')
         ));
-        $imageService = $this->getMock(ImageService::class, array('getImage', 'applyProcessingInstructions', 'getImageUri'));
+        $imageService = $this->getMockBuilder(ImageService::class)
+            ->setMethods(array('getImage', 'applyProcessingInstructions', 'getImageUri'))
+            ->getMock();
         $imageService->expects($this->once())->method('getImage')->willReturn($image);
         $imageService->expects($this->once())->method('applyProcessingInstructions')->with($image, $this->anything())->willReturn($image);
         $imageService->expects($this->once())->method('getImageUri')->with($image)->willReturn('test.png');
-        $tagBuilder = $this->getMock(TagBuilder::class, array('addAttribute', 'render'));
+        $tagBuilder = $this->getMockBuilder(TagBuilder::class)
+            ->setMethods(array('addAttribute', 'render'))
+            ->getMock();
         $index = -1;
         foreach ($expected as $expectedAttribute => $expectedValue) {
             $tagBuilder->expects($this->at(++ $index))->method('addAttribute')->with($expectedAttribute, $expectedValue);
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/EmailViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/EmailViewHelperTest.php
index d6657a94c8273a92df5b40eab6c192d5ae011497..df05afb4528f06583e44de3fc4fef8bc7f9fed30 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/EmailViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/EmailViewHelperTest.php
@@ -33,8 +33,10 @@ class EmailViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\ViewHe
     {
         parent::setUp();
         $GLOBALS['TSFE'] = new \stdClass();
-        $GLOBALS['TSFE']->cObj = $this->getMock(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class, array(), array(), '', false);
-        $this->viewHelper = $this->getMock($this->buildAccessibleProxy(\TYPO3\CMS\Fluid\ViewHelpers\Link\EmailViewHelper::class), array('renderChildren'));
+        $GLOBALS['TSFE']->cObj = $this->createMock(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class);
+        $this->viewHelper = $this->getMockBuilder($this->buildAccessibleProxy(\TYPO3\CMS\Fluid\ViewHelpers\Link\EmailViewHelper::class))
+            ->setMethods(array('renderChildren'))
+            ->getMock();
         $this->injectDependenciesIntoViewHelper($this->viewHelper);
         $this->viewHelper->initializeArguments();
     }
@@ -44,7 +46,9 @@ class EmailViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\ViewHe
      */
     public function renderCorrectlySetsTagNameAndAttributesAndContent()
     {
-        $mockTagBuilder = $this->getMock(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class, array('setTagName', 'addAttribute', 'setContent'));
+        $mockTagBuilder = $this->getMockBuilder(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class)
+            ->setMethods(array('setTagName', 'addAttribute', 'setContent'))
+            ->getMock();
         $mockTagBuilder->expects($this->once())->method('setTagName')->with('a');
         $mockTagBuilder->expects($this->once())->method('addAttribute')->with('href', 'mailto:some@email.tld');
         $mockTagBuilder->expects($this->once())->method('setContent')->with('some content');
@@ -59,7 +63,9 @@ class EmailViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\ViewHe
      */
     public function renderSetsTagContentToEmailIfRenderChildrenReturnNull()
     {
-        $mockTagBuilder = $this->getMock(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class, array('setTagName', 'addAttribute', 'setContent'));
+        $mockTagBuilder = $this->getMockBuilder(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class)
+            ->setMethods(array('setTagName', 'addAttribute', 'setContent'))
+            ->getMock();
         $mockTagBuilder->expects($this->once())->method('setContent')->with('some@email.tld');
         $this->viewHelper->_set('tag', $mockTagBuilder);
         $this->viewHelper->expects($this->any())->method('renderChildren')->will($this->returnValue(null));
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/ExternalViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/ExternalViewHelperTest.php
index a5f0ce8b5acaa201a79e3ada3694819ac9c4eb05..de85f3425f0d3af25ecb5b35bceeb05909f67615 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/ExternalViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/ExternalViewHelperTest.php
@@ -37,7 +37,9 @@ class ExternalViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Vie
      */
     public function renderCorrectlySetsTagNameAndAttributesAndContent()
     {
-        $mockTagBuilder = $this->getMock(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class, array('setTagName', 'addAttribute', 'setContent'));
+        $mockTagBuilder = $this->getMockBuilder(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class)
+            ->setMethods(array('setTagName', 'addAttribute', 'setContent'))
+            ->getMock();
         $mockTagBuilder->expects($this->once())->method('setTagName')->with('a');
         $mockTagBuilder->expects($this->once())->method('addAttribute')->with('href', 'http://www.some-domain.tld');
         $mockTagBuilder->expects($this->once())->method('setContent')->with('some content');
@@ -54,7 +56,9 @@ class ExternalViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Vie
      */
     public function renderAddsHttpPrefixIfSpecifiedUriDoesNotContainScheme()
     {
-        $mockTagBuilder = $this->getMock(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class, array('setTagName', 'addAttribute', 'setContent'));
+        $mockTagBuilder = $this->getMockBuilder(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class)
+            ->setMethods(array('setTagName', 'addAttribute', 'setContent'))
+            ->getMock();
         $mockTagBuilder->expects($this->once())->method('setTagName')->with('a');
         $mockTagBuilder->expects($this->once())->method('addAttribute')->with('href', 'http://www.some-domain.tld');
         $mockTagBuilder->expects($this->once())->method('setContent')->with('some content');
@@ -71,7 +75,9 @@ class ExternalViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Vie
      */
     public function renderAddsSpecifiedSchemeIfUriDoesNotContainScheme()
     {
-        $mockTagBuilder = $this->getMock(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class, array('setTagName', 'addAttribute', 'setContent'));
+        $mockTagBuilder = $this->getMockBuilder(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class)
+            ->setMethods(array('setTagName', 'addAttribute', 'setContent'))
+            ->getMock();
         $mockTagBuilder->expects($this->once())->method('setTagName')->with('a');
         $mockTagBuilder->expects($this->once())->method('addAttribute')->with('href', 'ftp://some-domain.tld');
         $mockTagBuilder->expects($this->once())->method('setContent')->with('some content');
@@ -88,7 +94,9 @@ class ExternalViewHelperTest extends \TYPO3\CMS\Fluid\Tests\Unit\ViewHelpers\Vie
      */
     public function renderDoesNotAddEmptyScheme()
     {
-        $mockTagBuilder = $this->getMock(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class, array('setTagName', 'addAttribute', 'setContent'));
+        $mockTagBuilder = $this->getMockBuilder(\TYPO3\CMS\Fluid\Core\ViewHelper\TagBuilder::class)
+            ->setMethods(array('setTagName', 'addAttribute', 'setContent'))
+            ->getMock();
         $mockTagBuilder->expects($this->once())->method('setTagName')->with('a');
         $mockTagBuilder->expects($this->once())->method('addAttribute')->with('href', 'some-domain.tld');
         $mockTagBuilder->expects($this->once())->method('setContent')->with('some content');
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/TypolinkViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/TypolinkViewHelperTest.php
index 4c1c7ca0aaa3989e8f81069cd27de0465f744624..816a435e1cc6c5a9db3d33d6a93ba2dcbd7138d1 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/TypolinkViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/TypolinkViewHelperTest.php
@@ -36,7 +36,7 @@ class TypolinkViewHelperTest extends ViewHelperBaseTestcase
     {
         $this->subject = $this->getAccessibleMock(TypolinkViewHelper::class, array('renderChildren'));
         /** @var RenderingContext  $renderingContext */
-        $renderingContext = $this->getMock(\TYPO3\CMS\Fluid\Tests\Unit\Core\Rendering\RenderingContextFixture::class);
+        $renderingContext = $this->createMock(\TYPO3\CMS\Fluid\Tests\Unit\Core\Rendering\RenderingContextFixture::class);
         $this->subject->setRenderingContext($renderingContext);
     }
 
@@ -46,7 +46,7 @@ class TypolinkViewHelperTest extends ViewHelperBaseTestcase
     public function renderReturnsResultOfContentObjectRenderer()
     {
         $this->subject->expects($this->any())->method('renderChildren')->will($this->returnValue('innerContent'));
-        $contentObjectRendererMock = $this->getMock(ContentObjectRenderer::class, array(), array(), '', false);
+        $contentObjectRendererMock = $this->createMock(ContentObjectRenderer::class);
         $contentObjectRendererMock->expects($this->once())->method('stdWrap')->will($this->returnValue('foo'));
         GeneralUtility::addInstance(ContentObjectRenderer::class, $contentObjectRendererMock);
         $this->assertEquals('foo', $this->subject->render('42'));
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Uri/EmailViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Uri/EmailViewHelperTest.php
index 70d99531deab474d0c9b9c9dce378fdb6b2715d7..f7ba6a4a655cb821268a3bb7d85ed08b1fa9473a 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Uri/EmailViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Uri/EmailViewHelperTest.php
@@ -31,7 +31,7 @@ class EmailViewHelperTest extends ViewHelperBaseTestcase
     {
         parent::setUp();
         $GLOBALS['TSFE'] = new \stdClass();
-        $GLOBALS['TSFE']->cObj = $this->getMock(ContentObjectRenderer::class, array(), array(), '', false);
+        $GLOBALS['TSFE']->cObj = $this->createMock(ContentObjectRenderer::class);
         $this->viewHelper = new EmailViewHelper();
         $this->injectDependenciesIntoViewHelper($this->viewHelper);
         $this->viewHelper->initializeArguments();
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/ViewHelperBaseTestcase.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/ViewHelperBaseTestcase.php
index 6ac7ddf2e0fdc51908755f92905431077cf0fccb..bfa534a1191964af3abc0dfcc48d21d66a5ff9a7 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/ViewHelperBaseTestcase.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/ViewHelperBaseTestcase.php
@@ -72,9 +72,9 @@ abstract class ViewHelperBaseTestcase extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     protected function setUp()
     {
-        $this->viewHelperVariableContainer = $this->getMock(\TYPO3\CMS\Fluid\Core\ViewHelper\ViewHelperVariableContainer::class);
-        $this->templateVariableContainer = $this->getMock(CmsVariableProvider::class);
-        $this->uriBuilder = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder::class);
+        $this->viewHelperVariableContainer = $this->createMock(\TYPO3\CMS\Fluid\Core\ViewHelper\ViewHelperVariableContainer::class);
+        $this->templateVariableContainer = $this->createMock(CmsVariableProvider::class);
+        $this->uriBuilder = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder::class);
         $this->uriBuilder->expects($this->any())->method('reset')->will($this->returnValue($this->uriBuilder));
         $this->uriBuilder->expects($this->any())->method('setArguments')->will($this->returnValue($this->uriBuilder));
         $this->uriBuilder->expects($this->any())->method('setSection')->will($this->returnValue($this->uriBuilder));
@@ -88,11 +88,11 @@ abstract class ViewHelperBaseTestcase extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->uriBuilder->expects($this->any())->method('setNoCache')->will($this->returnValue($this->uriBuilder));
         $this->uriBuilder->expects($this->any())->method('setUseCacheHash')->will($this->returnValue($this->uriBuilder));
         $this->uriBuilder->expects($this->any())->method('setAddQueryStringMethod')->will($this->returnValue($this->uriBuilder));
-        $this->request = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Web\Request::class);
-        $this->controllerContext = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext::class, array(), array(), '', false);
+        $this->request = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Web\Request::class);
+        $this->controllerContext = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext::class);
         $this->controllerContext->expects($this->any())->method('getUriBuilder')->will($this->returnValue($this->uriBuilder));
         $this->controllerContext->expects($this->any())->method('getRequest')->will($this->returnValue($this->request));
-        $this->tagBuilder = $this->getMock(\TYPO3Fluid\Fluid\Core\ViewHelper\TagBuilder::class);
+        $this->tagBuilder = $this->createMock(\TYPO3Fluid\Fluid\Core\ViewHelper\TagBuilder::class);
         $this->arguments = array();
         $this->renderingContext = $this->getAccessibleMock(\TYPO3\CMS\Fluid\Tests\Unit\Core\Rendering\RenderingContextFixture::class, array('getControllerContext'));
         $this->renderingContext->expects($this->any())->method('getControllerContext')->willReturn($this->controllerContext);
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Widget/Controller/PaginateControllerTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Widget/Controller/PaginateControllerTest.php
index 271d775503275246176da3b6e44bc346cebeba64..444459509c9c0bd197c13ad6c3d11dcd6f3e301d 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Widget/Controller/PaginateControllerTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Widget/Controller/PaginateControllerTest.php
@@ -58,16 +58,16 @@ class PaginateControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     protected function setUp()
     {
         $this->query = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Persistence\Generic\Query::class, array('dummy'), array('someType'));
-        $this->querySettings = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface::class);
+        $this->querySettings = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface::class);
         $this->query->_set('querySettings', $this->querySettings);
-        $this->persistenceManager = $this->getMock(\TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface::class);
-        $this->backend = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface::class);
+        $this->persistenceManager = $this->createMock(\TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface::class);
+        $this->backend = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface::class);
         $this->query->_set('persistenceManager', $this->persistenceManager);
-        $this->dataMapper = $this->getMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapper::class);
+        $this->dataMapper = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapper::class);
         $this->query->_set('dataMapper', $this->dataMapper);
         $this->controller = $this->getAccessibleMock(\TYPO3\CMS\Fluid\ViewHelpers\Widget\Controller\PaginateController::class,
             array('dummy'), array(), '', false);
-        $this->controller->_set('view', $this->getMock(\TYPO3\CMS\Extbase\Mvc\View\ViewInterface::class));
+        $this->controller->_set('view', $this->createMock(\TYPO3\CMS\Extbase\Mvc\View\ViewInterface::class));
     }
 
     /**
@@ -153,8 +153,8 @@ class PaginateControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function acceptQueryResultInterfaceAsObjects()
     {
-        $mockQueryResult = $this->getMock(\TYPO3\CMS\Extbase\Persistence\QueryResultInterface::class);
-        $mockQuery = $this->getMock(\TYPO3\CMS\Extbase\Persistence\QueryInterface::class);
+        $mockQueryResult = $this->createMock(\TYPO3\CMS\Extbase\Persistence\QueryResultInterface::class);
+        $mockQuery = $this->createMock(\TYPO3\CMS\Extbase\Persistence\QueryInterface::class);
         $mockQueryResult->expects($this->any())->method('getQuery')->will($this->returnValue($mockQuery));
         $this->controller->_set('objects', $mockQueryResult);
         $this->controller->indexAction();
diff --git a/typo3/sysext/form/Tests/Unit/Utility/TypoScriptToJsonConverterTest.php b/typo3/sysext/form/Tests/Unit/Utility/TypoScriptToJsonConverterTest.php
index 105f53bf9c19c8e0a13354c80808b854ded9ae4c..3b641ba061162fd046a6708a24e0090a8e77b925 100644
--- a/typo3/sysext/form/Tests/Unit/Utility/TypoScriptToJsonConverterTest.php
+++ b/typo3/sysext/form/Tests/Unit/Utility/TypoScriptToJsonConverterTest.php
@@ -36,7 +36,9 @@ class TypoScriptToJsonConverterTest extends UnitTestCase
     public function getChildElementsByIntegerKeyCallsAddElement(array $typoScript, $methodCount)
     {
         /** @var FormJsonElement|\PHPUnit_Framework_MockObject_MockObject $mockSubject */
-        $parentElement = $this->getMock(FormJsonElement::class, ['addElement']);
+        $parentElement = $this->getMockBuilder(FormJsonElement::class)
+            ->setMethods(['addElement'])
+            ->getMock();
         // check if method gets called exactly X times
         $parentElement->expects($this->exactly($methodCount))->method('addElement');
 
diff --git a/typo3/sysext/form/Tests/Unit/Validator/AbstractValidatorTest.php b/typo3/sysext/form/Tests/Unit/Validator/AbstractValidatorTest.php
index ea64c376a07ff5da3baffb61f4d589e952782c80..b934c76de3e511f892c96a65c1185c574ad1652f 100644
--- a/typo3/sysext/form/Tests/Unit/Validator/AbstractValidatorTest.php
+++ b/typo3/sysext/form/Tests/Unit/Validator/AbstractValidatorTest.php
@@ -37,14 +37,13 @@ abstract class AbstractValidatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     protected function createSubject(array $options)
     {
         /** @var AbstractValidator $subject */
-        $subject = $this->getMock(
-            $this->subjectClassName,
-            ['getLocalLanguageLabel', 'humanReadableDateFormat'],
-            ['options' => $options]
-        );
+        $subject = $this->getMockBuilder($this->subjectClassName)
+            ->setMethods(['getLocalLanguageLabel', 'humanReadableDateFormat'])
+            ->setConstructorArgs(['options' => $options])
+            ->getMock();
 
         /** @var FormUtility $formUtilityMock */
-        $formUtilityMock = $this->getMock(FormUtility::class, [], [], '', false);
+        $formUtilityMock = $this->createMock(FormUtility::class);
         $subject->setFormUtility($formUtilityMock);
 
         return $subject;
diff --git a/typo3/sysext/frontend/Tests/Functional/ContentObject/FluidTemplateContentObjectTest.php b/typo3/sysext/frontend/Tests/Functional/ContentObject/FluidTemplateContentObjectTest.php
index c79ce6f0c4fa4a48b1769dcfa24d89fcc751beb5..a42f6754b0c5ca5e2f5080d02ea9bdedf87aa967 100644
--- a/typo3/sysext/frontend/Tests/Functional/ContentObject/FluidTemplateContentObjectTest.php
+++ b/typo3/sysext/frontend/Tests/Functional/ContentObject/FluidTemplateContentObjectTest.php
@@ -29,7 +29,7 @@ class FluidTemplateContentObjectTest extends \TYPO3\CMS\Core\Tests\FunctionalTes
     public function renderWorksWithNestedFluidtemplate()
     {
         /** @var $tsfe \TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController */
-        $tsfe = $this->getMock(\TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController::class, array(), array(), '', false);
+        $tsfe = $this->createMock(\TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController::class);
         $GLOBALS['TSFE'] = $tsfe;
 
         $configuration = array(
diff --git a/typo3/sysext/frontend/Tests/Functional/Controller/TypoScriptFrontendControllerTest.php b/typo3/sysext/frontend/Tests/Functional/Controller/TypoScriptFrontendControllerTest.php
index ce806809c1d5af04abe28f762bbb27158f9c291a..7e05588718316daae7825db8c59d8cceba96adc8 100644
--- a/typo3/sysext/frontend/Tests/Functional/Controller/TypoScriptFrontendControllerTest.php
+++ b/typo3/sysext/frontend/Tests/Functional/Controller/TypoScriptFrontendControllerTest.php
@@ -40,7 +40,7 @@ class TypoScriptFrontendControllerTest extends FunctionalTestCase
             false
         );
 
-        $pageContextMock = $this->getMock(\TYPO3\CMS\Frontend\Page\PageRepository::class);
+        $pageContextMock = $this->getMockBuilder(\TYPO3\CMS\Frontend\Page\PageRepository::class)->getMock();
         $this->tsFrontendController->_set('sys_page', $pageContextMock);
     }
 
diff --git a/typo3/sysext/frontend/Tests/Unit/ContentObject/CaseContentObjectTest.php b/typo3/sysext/frontend/Tests/Unit/ContentObject/CaseContentObjectTest.php
index cb9701471b5efe63636180669591bde6c8576f06..0df13309ac69bf6c62eff75988f6523d8dcac76d 100644
--- a/typo3/sysext/frontend/Tests/Unit/ContentObject/CaseContentObjectTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/ContentObject/CaseContentObjectTest.php
@@ -37,11 +37,18 @@ class CaseContentObjectTest extends UnitTestCase
     protected function setUp()
     {
         /** @var TypoScriptFrontendController $tsfe */
-        $tsfe = $this->getMock(TypoScriptFrontendController::class, array('dummy'), array(), '', false);
-        $tsfe->tmpl = $this->getMock(TemplateService::class, array('dummy'));
+        $tsfe = $this->getMockBuilder(TypoScriptFrontendController::class)
+            ->setMethods(array('dummy'))
+            ->disableOriginalConstructor()
+            ->getMock();
+        $tsfe->tmpl = $this->getMockBuilder(TemplateService::class)
+            ->setMethods(array('dummy'))
+            ->getMock();
         $tsfe->config = array();
         $tsfe->page = array();
-        $tsfe->sys_page = $this->getMock(PageRepository::class, array('getRawRecord'));
+        $tsfe->sys_page = $this->getMockBuilder(PageRepository::class)
+            ->setMethods(array('getRawRecord'))
+            ->getMock();
         $GLOBALS['TSFE'] = $tsfe;
 
         $contentObjectRenderer = new ContentObjectRenderer();
diff --git a/typo3/sysext/frontend/Tests/Unit/ContentObject/ContentObjectRendererTest.php b/typo3/sysext/frontend/Tests/Unit/ContentObject/ContentObjectRendererTest.php
old mode 100755
new mode 100644
index 710533bdb8d99dcdc0fe0504eaf2e759777525b6..944aef6f08e227f5d666b288de6798130877f61e
--- a/typo3/sysext/frontend/Tests/Unit/ContentObject/ContentObjectRendererTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/ContentObject/ContentObjectRendererTest.php
@@ -95,8 +95,12 @@ class ContentObjectRendererTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->singletonInstances = \TYPO3\CMS\Core\Utility\GeneralUtility::getSingletonInstances();
         $this->createMockedLoggerAndLogManager();
 
-        $this->templateServiceMock = $this->getMock(TemplateService::class, array('getFileName', 'linkData'));
-        $pageRepositoryMock = $this->getMock(PageRepositoryFixture::class, array('getRawRecord', 'getMountPointInfo'));
+        $this->templateServiceMock = $this->getMockBuilder(TemplateService::class)
+            ->setMethods(array('getFileName', 'linkData'))
+            ->getMock();
+        $pageRepositoryMock = $this->getMockBuilder(PageRepositoryFixture::class)
+            ->setMethods(array('getRawRecord', 'getMountPointInfo'))
+            ->getMock();
 
         $this->typoScriptFrontendControllerMock = $this->getAccessibleMock(TypoScriptFrontendController::class, array('dummy'), array(), '', false);
         $this->typoScriptFrontendControllerMock->tmpl = $this->templateServiceMock;
@@ -104,7 +108,7 @@ class ContentObjectRendererTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->typoScriptFrontendControllerMock->page = array();
         $this->typoScriptFrontendControllerMock->sys_page = $pageRepositoryMock;
         $GLOBALS['TSFE'] = $this->typoScriptFrontendControllerMock;
-        $GLOBALS['TYPO3_DB'] = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array());
+        $GLOBALS['TYPO3_DB'] = $this->getMockBuilder(\TYPO3\CMS\Core\Database\DatabaseConnection::class)->getMock();
 
         $this->subject = $this->getAccessibleMock(
             \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class,
@@ -131,8 +135,8 @@ class ContentObjectRendererTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     protected function createMockedLoggerAndLogManager()
     {
-        $logManagerMock = $this->getMock(LogManager::class);
-        $loggerMock = $this->getMock(LoggerInterface::class);
+        $logManagerMock = $this->getMockBuilder(LogManager::class)->getMock();
+        $loggerMock = $this->getMockBuilder(LoggerInterface::class)->getMock();
         $logManagerMock->expects($this->any())
             ->method('getLogger')
             ->willReturn($loggerMock);
@@ -166,11 +170,14 @@ class ContentObjectRendererTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             ->with('typo3/clear.gif')
             ->will($this->returnValue('typo3/clear.gif'));
 
-        $resourceFactory = $this->getMock(\TYPO3\CMS\Core\Resource\ResourceFactory::class, array(), array(), '', false);
+        $resourceFactory = $this->createMock(\TYPO3\CMS\Core\Resource\ResourceFactory::class);
         $this->subject->expects($this->any())->method('getResourceFactory')->will($this->returnValue($resourceFactory));
 
         $className = $this->getUniqueId('tx_coretest');
-        $getImgResourceHookMock = $this->getMock(\TYPO3\CMS\Frontend\ContentObject\ContentObjectGetImageResourceHookInterface::class, array('getImgResourcePostProcess'), array(), $className);
+        $getImgResourceHookMock = $this->getMockBuilder(\TYPO3\CMS\Frontend\ContentObject\ContentObjectGetImageResourceHookInterface::class)
+            ->setMethods(array('getImgResourcePostProcess'))
+            ->setMockClassName($className)
+            ->getMock();
         $getImgResourceHookMock
             ->expects($this->once())
             ->method('getImgResourcePostProcess')
@@ -220,7 +227,7 @@ class ContentObjectRendererTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function getContentObjectCallsMakeInstanceForNewContentObjectInstance($name, $fullClassName)
     {
-        $contentObjectInstance = $this->getMock($fullClassName, array(), array(), '', false);
+        $contentObjectInstance = $this->createMock($fullClassName);
         \TYPO3\CMS\Core\Utility\GeneralUtility::addInstance($fullClassName, $contentObjectInstance);
         $this->assertSame($contentObjectInstance, $this->subject->getContentObject($name));
     }
@@ -2031,10 +2038,9 @@ class ContentObjectRendererTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function stdWrap_ageCallsCalcAgeWithSubtractedTimestampAndSubPartOfArray()
     {
-        $subject = $this->getMock(
-            \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class,
-            array('calcAge')
-        );
+        $subject = $this->getMockBuilder(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class)
+            ->setMethods(array('calcAge'))
+            ->getMock();
         // Set exec_time to a hard timestamp
         $GLOBALS['EXEC_TIME'] = 10;
         $subject->expects($this->once())->method('calcAge')->with(1, 'Min| Hrs| Days| Yrs');
@@ -3578,7 +3584,7 @@ class ContentObjectRendererTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function getDataWithTypeFileReturnsUidOfFileObject()
     {
         $uid = $this->getUniqueId();
-        $file = $this->getMock(\TYPO3\CMS\Core\Resource\File::class, array(), array(), '', false);
+        $file = $this->createMock(\TYPO3\CMS\Core\Resource\File::class);
         $file->expects($this->once())->method('getUid')->will($this->returnValue($uid));
         $this->subject->setCurrentFile($file);
         $this->assertEquals($uid, $this->subject->getData('file:current:uid'));
@@ -4160,10 +4166,10 @@ class ContentObjectRendererTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function getImageSourceCollectionRendersDefinedSources()
     {
         /** @var $cObj \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer */
-        $cObj = $this->getMock(
-            \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class,
-            array('stdWrap', 'getImgResource')
-        );
+        $cObj = $this->getMockBuilder(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class)
+            ->setMethods(array('stdWrap', 'getImgResource'))
+            ->getMock();
+
         $cObj->start(array(), 'tt_content');
 
         $layoutKey = 'test';
@@ -4258,10 +4264,10 @@ class ContentObjectRendererTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function getImageSourceCollectionRendersDefinedLayoutKeyDefault($layoutKey, $configuration)
     {
         /** @var $cObj \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer */
-        $cObj = $this->getMock(
-            \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class,
-            array('stdWrap', 'getImgResource')
-        );
+        $cObj = $this->getMockBuilder(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class)
+            ->setMethods(array('stdWrap', 'getImgResource'))
+            ->getMock();
+
         $cObj->start(array(), 'tt_content');
 
         $file = 'testImageName';
@@ -4381,10 +4387,10 @@ class ContentObjectRendererTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function getImageSourceCollectionRendersDefinedLayoutKeyData($layoutKey, $configuration, $xhtmlDoctype, $expectedHtml)
     {
         /** @var $cObj \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer */
-        $cObj = $this->getMock(
-            \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class,
-            array('stdWrap', 'getImgResource')
-        );
+        $cObj = $this->getMockBuilder(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class)
+            ->setMethods(array('stdWrap', 'getImgResource'))
+            ->getMock();
+
         $cObj->start(array(), 'tt_content');
 
         $file = 'testImageName';
@@ -4431,11 +4437,14 @@ class ContentObjectRendererTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             ->method('getImgResource')
             ->will($this->returnValue(array(100, 100, null, 'bar-file.jpg')));
 
-        $resourceFactory = $this->getMock(\TYPO3\CMS\Core\Resource\ResourceFactory::class, array(), array(), '', false);
+        $resourceFactory = $this->createMock(\TYPO3\CMS\Core\Resource\ResourceFactory::class);
         $this->subject->expects($this->any())->method('getResourceFactory')->will($this->returnValue($resourceFactory));
 
         $className = $this->getUniqueId('tx_coretest_getImageSourceCollectionHookCalled');
-        $getImageSourceCollectionHookMock = $this->getMock(\TYPO3\CMS\Frontend\ContentObject\ContentObjectOneSourceCollectionHookInterface::class, array('getOneSourceCollection'), array(), $className);
+        $getImageSourceCollectionHookMock = $this->getMockBuilder(\TYPO3\CMS\Frontend\ContentObject\ContentObjectOneSourceCollectionHookInterface::class)
+            ->setMethods(array('getOneSourceCollection'))
+            ->setMockClassName($className)
+            ->getMock();
         GeneralUtility::addInstance($className, $getImageSourceCollectionHookMock);
         $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/class.tslib_content.php']['getImageSourceCollection'][] = $className;
 
@@ -4716,7 +4725,9 @@ class ContentObjectRendererTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     protected function createContentObjectThrowingExceptionFixture()
     {
-        $contentObjectFixture = $this->getMock(AbstractContentObject::class, array(), array($this->subject));
+        $contentObjectFixture = $this->getMockBuilder(AbstractContentObject::class)
+            ->setConstructorArgs(array($this->subject))
+            ->getMock();
         $contentObjectFixture->expects($this->once())
             ->method('render')
             ->willReturnCallback(function () {
@@ -5064,14 +5075,16 @@ class ContentObjectRendererTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function detectLinkTypeFromLinkParameter($linkParameter, $expectedResult)
     {
         /** @var TemplateService|\PHPUnit_Framework_MockObject_MockObject $templateServiceObjectMock */
-        $templateServiceObjectMock = $this->getMock(TemplateService::class, array('dummy'));
+        $templateServiceObjectMock = $this->getMockBuilder(TemplateService::class)
+            ->setMethods(array('dummy'))
+            ->getMock();
         $templateServiceObjectMock->setup = array(
             'lib.' => array(
                 'parseFunc.' => $this->getLibParseFunc(),
             ),
         );
         /** @var TypoScriptFrontendController|\PHPUnit_Framework_MockObject_MockObject $typoScriptFrontendControllerMockObject */
-        $typoScriptFrontendControllerMockObject = $this->getMock(TypoScriptFrontendController::class, array(), array(), '', false);
+        $typoScriptFrontendControllerMockObject = $this->createMock(TypoScriptFrontendController::class);
         $typoScriptFrontendControllerMockObject->config = array(
             'config' => array(),
             'mainScript' => 'index.php',
@@ -5176,13 +5189,15 @@ class ContentObjectRendererTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function typolinkReturnsCorrectLinksForEmailsAndUrls($linkText, $configuration, $expectedResult)
     {
-        $templateServiceObjectMock = $this->getMock(TemplateService::class, array('dummy'));
+        $templateServiceObjectMock = $this->getMockBuilder(TemplateService::class)
+            ->setMethods(array('dummy'))
+            ->getMock();
         $templateServiceObjectMock->setup = array(
             'lib.' => array(
                 'parseFunc.' => $this->getLibParseFunc(),
             ),
         );
-        $typoScriptFrontendControllerMockObject = $this->getMock(TypoScriptFrontendController::class, array(), array(), '', false);
+        $typoScriptFrontendControllerMockObject = $this->createMock(TypoScriptFrontendController::class);
         $typoScriptFrontendControllerMockObject->config = array(
             'config' => array(),
             'mainScript' => 'index.php',
@@ -5398,15 +5413,19 @@ class ContentObjectRendererTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function typolinkReturnsCorrectLinksForPages($linkText, $configuration, $pageArray, $expectedResult)
     {
-        $pageRepositoryMockObject = $this->getMock(\TYPO3\CMS\Frontend\Page\PageRepository::class, array('getPage'));
+        $pageRepositoryMockObject = $this->getMockBuilder(\TYPO3\CMS\Frontend\Page\PageRepository::class)
+            ->setMethods(array('getPage'))
+            ->getMock();
         $pageRepositoryMockObject->expects($this->any())->method('getPage')->willReturn($pageArray);
-        $templateServiceObjectMock = $this->getMock(TemplateService::class, array('dummy'));
+        $templateServiceObjectMock = $this->getMockBuilder(TemplateService::class)
+            ->setMethods(array('dummy'))
+            ->getMock();
         $templateServiceObjectMock->setup = array(
             'lib.' => array(
                 'parseFunc.' => $this->getLibParseFunc(),
             ),
         );
-        $typoScriptFrontendControllerMockObject = $this->getMock(TypoScriptFrontendController::class, array(), array(), '', false);
+        $typoScriptFrontendControllerMockObject = $this->createMock(TypoScriptFrontendController::class);
         $typoScriptFrontendControllerMockObject->config = array(
             'config' => array(),
             'mainScript' => 'index.php',
@@ -5475,13 +5494,15 @@ class ContentObjectRendererTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function typolinkReturnsCorrectLinksFiles($linkText, $configuration, $expectedResult)
     {
-        $templateServiceObjectMock = $this->getMock(TemplateService::class, array('dummy'));
+        $templateServiceObjectMock = $this->getMockBuilder(TemplateService::class)
+            ->setMethods(array('dummy'))
+            ->getMock();
         $templateServiceObjectMock->setup = array(
             'lib.' => array(
                 'parseFunc.' => $this->getLibParseFunc(),
             ),
         );
-        $typoScriptFrontendControllerMockObject = $this->getMock(TypoScriptFrontendController::class, array(), array(), '', false);
+        $typoScriptFrontendControllerMockObject = $this->createMock(TypoScriptFrontendController::class);
         $typoScriptFrontendControllerMockObject->config = array(
             'config' => array(),
             'mainScript' => 'index.php',
@@ -5623,13 +5644,15 @@ class ContentObjectRendererTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function typolinkReturnsCorrectLinksForFilesWithAbsRefPrefix($linkText, $configuration, $absRefPrefix, $expectedResult)
     {
-        $templateServiceObjectMock = $this->getMock(TemplateService::class, array('dummy'));
+        $templateServiceObjectMock = $this->getMockBuilder(TemplateService::class)
+            ->setMethods(array('dummy'))
+            ->getMock();
         $templateServiceObjectMock->setup = array(
             'lib.' => array(
                 'parseFunc.' => $this->getLibParseFunc(),
             ),
         );
-        $typoScriptFrontendControllerMockObject = $this->getMock(TypoScriptFrontendController::class, array(), array(), '', false);
+        $typoScriptFrontendControllerMockObject = $this->createMock(TypoScriptFrontendController::class);
         $typoScriptFrontendControllerMockObject->config = array(
             'config' => array(),
             'mainScript' => 'index.php',
@@ -5748,7 +5771,9 @@ class ContentObjectRendererTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $GLOBALS['SIM_ACCESS_TIME'] = '4242';
         $GLOBALS['TSFE']->sys_language_content = 13;
         /** @var \PHPUnit_Framework_MockObject_MockObject|ContentObjectRenderer $contentObjectRenderer */
-        $contentObjectRenderer = $this->getMock(ContentObjectRenderer::class, array('checkPidArray'));
+        $contentObjectRenderer = $this->getMockBuilder(ContentObjectRenderer::class)
+            ->setMethods(array('checkPidArray'))
+            ->getMock();
         $contentObjectRenderer->expects($this->any())->method('checkPidArray')->willReturn(explode(',', $configuration['pidInList']));
         $this->assertEquals($expectedResult, $contentObjectRenderer->getWhere($table, $configuration));
     }
diff --git a/typo3/sysext/frontend/Tests/Unit/ContentObject/FilesContentObjectTest.php b/typo3/sysext/frontend/Tests/Unit/ContentObject/FilesContentObjectTest.php
index a32bcaa35b17cdc80317df53f9e06eb8d87fd0a1..d57dde102b426af01b8c446cb5cced43f3327998 100644
--- a/typo3/sysext/frontend/Tests/Unit/ContentObject/FilesContentObjectTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/ContentObject/FilesContentObjectTest.php
@@ -47,12 +47,19 @@ class FilesContentObjectTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     protected function setUp()
     {
-        $templateService = $this->getMock(TemplateService::class, array('getFileName', 'linkData'));
-        $this->tsfe = $this->getMock(TypoScriptFrontendController::class, array('dummy'), array(), '', false);
+        $templateService = $this->getMockBuilder(TemplateService::class)
+            ->setMethods(array('getFileName', 'linkData'))
+            ->getMock();
+        $this->tsfe = $this->getMockBuilder(TypoScriptFrontendController::class)
+            ->setMethods(array('dummy'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->tsfe->tmpl = $templateService;
         $this->tsfe->config = array();
         $this->tsfe->page = array();
-        $sysPageMock = $this->getMock(PageRepository::class, array('getRawRecord'));
+        $sysPageMock = $this->getMockBuilder(PageRepository::class)
+            ->setMethods(array('getRawRecord'))
+            ->getMock();
         $this->tsfe->sys_page = $sysPageMock;
         $GLOBALS['TSFE'] = $this->tsfe;
 
@@ -61,7 +68,10 @@ class FilesContentObjectTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             'FILES' => FilesContentObject::class,
             'TEXT' => TextContentObject::class,
         ));
-        $this->subject = $this->getMock(FilesContentObject::class, array('getFileCollector'), array($contentObjectRenderer));
+        $this->subject = $this->getMockBuilder(FilesContentObject::class)
+            ->setMethods(array('getFileCollector'))
+            ->setConstructorArgs(array($contentObjectRenderer))
+            ->getMock();
     }
 
     /**
@@ -211,7 +221,7 @@ class FilesContentObjectTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $fileReferenceMap = array();
         for ($i = 1; $i < 4; $i++) {
-            $fileReference = $this->getMock(FileReference::class, array(), array(), '', false);
+            $fileReference = $this->createMock(FileReference::class);
             $fileReference->expects($this->any())
                 ->method('getName')
                 ->will($this->returnValue('File ' . $i));
@@ -227,11 +237,13 @@ class FilesContentObjectTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             $fileReferenceMap[] = array($i, $fileReference);
         }
 
-        $fileRepository = $this->getMock(\TYPO3\CMS\Core\Resource\FileRepository::class);
+        $fileRepository = $this->getMockBuilder(\TYPO3\CMS\Core\Resource\FileRepository::class)->getMock();
         $fileRepository->expects($this->any())
             ->method('findFileReferenceByUid')
             ->will($this->returnValueMap($fileReferenceMap));
-        $fileCollector = $this->getMock(FileCollector::class, array('getFileRepository'));
+        $fileCollector = $this->getMockBuilder(FileCollector::class)
+            ->setMethods(array('getFileRepository'))
+            ->getMock();
         $fileCollector->expects($this->any())
             ->method('getFileRepository')
             ->will($this->returnValue($fileRepository));
@@ -390,7 +402,7 @@ class FilesContentObjectTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $fileMap = array();
         for ($i = 1; $i < 4; $i++) {
-            $file = $this->getMock(File::class, array(), array(), '', false);
+            $file = $this->createMock(File::class);
             $file->expects($this->any())
                 ->method('getName')
                 ->will($this->returnValue('File ' . $i));
@@ -406,11 +418,13 @@ class FilesContentObjectTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             $fileMap[] = array($i, array(), $file);
         }
 
-        $resourceFactory = $this->getMock(ResourceFactory::class);
+        $resourceFactory = $this->getMockBuilder(ResourceFactory::class)->getMock();
         $resourceFactory->expects($this->any())
             ->method('getFileObject')
             ->will($this->returnValueMap($fileMap));
-        $fileCollector = $this->getMock(FileCollector::class, array('getResourceFactory'));
+        $fileCollector = $this->getMockBuilder(FileCollector::class)
+            ->setMethods(array('getResourceFactory'))
+            ->getMock();
         $fileCollector->expects($this->any())
             ->method('getResourceFactory')
             ->will($this->returnValue($resourceFactory));
@@ -609,7 +623,7 @@ class FilesContentObjectTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         for ($i = 1; $i < 4; $i++) {
             $fileReferenceArray = array();
             for ($j = 1; $j < 4; $j++) {
-                $fileReference = $this->getMock(FileReference::class, array(), array(), '', false);
+                $fileReference = $this->createMock(FileReference::class);
                 $fileReference->expects($this->any())
                     ->method('getName')
                     ->will($this->returnValue('File ' . $fileCount));
@@ -626,7 +640,7 @@ class FilesContentObjectTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                 $fileCount++;
             }
 
-            $collection = $this->getMock(StaticFileCollection::class, array(), array(), '', false);
+            $collection = $this->createMock(StaticFileCollection::class);
             $collection->expects($this->any())
                 ->method('getItems')
                 ->will($this->returnValue($fileReferenceArray));
@@ -634,11 +648,13 @@ class FilesContentObjectTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             $collectionMap[] = array($i, $collection);
         }
 
-        $collectionRepository = $this->getMock(FileCollectionRepository::class);
+        $collectionRepository = $this->getMockBuilder(FileCollectionRepository::class)->getMock();
         $collectionRepository->expects($this->any())
             ->method('findByUid')
             ->will($this->returnValueMap($collectionMap));
-        $fileCollector = $this->getMock(FileCollector::class, array('getFileCollectionRepository'));
+        $fileCollector = $this->getMockBuilder(FileCollector::class)
+            ->setMethods(array('getFileCollectionRepository'))
+            ->getMock();
         $fileCollector->expects($this->any())
             ->method('getFileCollectionRepository')
             ->will($this->returnValue($collectionRepository));
@@ -869,7 +885,7 @@ class FilesContentObjectTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         for ($i = 1; $i < 4; $i++) {
             $filesArrayForFolder[$i] = [];
             for ($j = 1; $j < 4; $j++) {
-                $file = $this->getMock(File::class, [], [], '', false);
+                $file = $this->createMock(File::class);
                 $file->expects($this->any())
                     ->method('getName')
                     ->will($this->returnValue('File ' . $fileCount));
@@ -886,7 +902,7 @@ class FilesContentObjectTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
                 $fileCount++;
             }
 
-            $folder = $this->getMock(Folder::class, array(), array(), '', false);
+            $folder = $this->createMock(Folder::class);
 
             if ($recursive) {
                 if ($i < 3) {
@@ -915,11 +931,13 @@ class FilesContentObjectTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             }
         }
 
-        $resourceFactory = $this->getMock(ResourceFactory::class);
+        $resourceFactory = $this->getMockBuilder(ResourceFactory::class)->getMock();
         $resourceFactory->expects($this->any())
             ->method('getFolderObjectFromCombinedIdentifier')
             ->will($this->returnValueMap($folderMap));
-        $fileCollector = $this->getMock(FileCollector::class, array('getResourceFactory'));
+        $fileCollector = $this->getMockBuilder(FileCollector::class)
+            ->setMethods(array('getResourceFactory'))
+            ->getMock();
         $fileCollector->expects($this->any())
             ->method('getResourceFactory')
             ->will($this->returnValue($resourceFactory));
diff --git a/typo3/sysext/frontend/Tests/Unit/ContentObject/FluidTemplateContentObjectTest.php b/typo3/sysext/frontend/Tests/Unit/ContentObject/FluidTemplateContentObjectTest.php
index 90c19d393bd2eb82eb43c8ab34b8764bdbc8dc2d..9c59684baf759ed18fd593bb418f31af129bc494 100644
--- a/typo3/sysext/frontend/Tests/Unit/ContentObject/FluidTemplateContentObjectTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/ContentObject/FluidTemplateContentObjectTest.php
@@ -57,17 +57,17 @@ class FluidTemplateContentObjectTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     protected function setUp()
     {
         $this->singletonInstances = GeneralUtility::getSingletonInstances();
-        $this->contentObjectRenderer = $this->getMock(
+        $this->contentObjectRenderer = $this->getMockBuilder(
             \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class
-        );
+        )->getMock();
         $this->subject = $this->getAccessibleMock(
             \TYPO3\CMS\Frontend\ContentObject\FluidTemplateContentObject::class,
             array('initializeStandaloneViewInstance'),
             array($this->contentObjectRenderer)
         );
         /** @var $tsfe \TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController */
-        $tsfe = $this->getMock(\TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController::class, array(), array(), '', false);
-        $tsfe->tmpl = $this->getMock(\TYPO3\CMS\Core\TypoScript\TemplateService::class);
+        $tsfe = $this->createMock(\TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController::class);
+        $tsfe->tmpl = $this->getMockBuilder(\TYPO3\CMS\Core\TypoScript\TemplateService::class)->getMock();
         $GLOBALS['TSFE'] = $tsfe;
     }
 
@@ -85,8 +85,8 @@ class FluidTemplateContentObjectTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     protected function addMockViewToSubject()
     {
-        $this->standaloneView = $this->getMock(\TYPO3\CMS\Fluid\View\StandaloneView::class, array(), array(), '', false);
-        $this->request = $this->getMock(\TYPO3\CMS\Extbase\Mvc\Request::class);
+        $this->standaloneView = $this->createMock(\TYPO3\CMS\Fluid\View\StandaloneView::class);
+        $this->request = $this->getMockBuilder(\TYPO3\CMS\Extbase\Mvc\Request::class)->getMock();
         $this->standaloneView
             ->expects($this->any())
             ->method('getRequest')
@@ -630,7 +630,7 @@ class FluidTemplateContentObjectTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         );
 
         /** @var TypoScriptService|\PHPUnit_Framework_MockObject_MockObject $typoScriptServiceMock */
-        $typoScriptServiceMock = $this->getMock(\TYPO3\CMS\Extbase\Service\TypoScriptService::class);
+        $typoScriptServiceMock = $this->getMockBuilder(\TYPO3\CMS\Extbase\Service\TypoScriptService::class)->getMock();
         $typoScriptServiceMock
             ->expects($this->once())
             ->method('convertTypoScriptArrayToPlainArray')
diff --git a/typo3/sysext/frontend/Tests/Unit/ContentObject/Menu/AbstractMenuContentObjectTest.php b/typo3/sysext/frontend/Tests/Unit/ContentObject/Menu/AbstractMenuContentObjectTest.php
index ba38577246c076379cf1d428a04cc0e03f038b56..b0dec9d2b3c93f18e303f8bf2472fb7c7163bcd9 100644
--- a/typo3/sysext/frontend/Tests/Unit/ContentObject/Menu/AbstractMenuContentObjectTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/ContentObject/Menu/AbstractMenuContentObjectTest.php
@@ -32,8 +32,10 @@ class AbstractMenuContentObjectTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $proxyClassName = $this->buildAccessibleProxy(\TYPO3\CMS\Frontend\ContentObject\Menu\AbstractMenuContentObject::class);
         $this->subject = $this->getMockForAbstractClass($proxyClassName);
-        $GLOBALS['TYPO3_DB'] = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class);
-        $GLOBALS['TSFE'] = $this->getMock(\TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController::class, array(), array($GLOBALS['TYPO3_CONF_VARS'], 1, 1));
+        $GLOBALS['TYPO3_DB'] = $this->getMockBuilder(\TYPO3\CMS\Core\Database\DatabaseConnection::class)->getMock();
+        $GLOBALS['TSFE'] = $this->getMockBuilder(\TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController::class)
+            ->setConstructorArgs(array($GLOBALS['TYPO3_CONF_VARS'], 1, 1))
+            ->getMock();
         $GLOBALS['TSFE']->cObj = new \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer();
         $GLOBALS['TSFE']->page = array();
     }
@@ -48,8 +50,8 @@ class AbstractMenuContentObjectTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     protected function prepareSectionIndexTest()
     {
-        $this->subject->sys_page = $this->getMock(\TYPO3\CMS\Frontend\Page\PageRepository::class);
-        $this->subject->parent_cObj = $this->getMock(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class);
+        $this->subject->sys_page = $this->getMockBuilder(\TYPO3\CMS\Frontend\Page\PageRepository::class)->getMock();
+        $this->subject->parent_cObj = $this->getMockBuilder(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class)->getMock();
     }
 
     /**
@@ -264,7 +266,7 @@ class AbstractMenuContentObjectTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         }
 
         $this->prepareSectionIndexTest();
-        $this->subject->parent_cObj = $this->getMock(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class, array());
+        $this->subject->parent_cObj = $this->getMockBuilder(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class)->getMock();
 
         $this->subject->sys_page->expects($this->once())->method('getMenu')->will($this->returnValue($menu));
         $this->subject->menuArr = array(
diff --git a/typo3/sysext/frontend/Tests/Unit/Controller/TypoScriptFrontendControllerTest.php b/typo3/sysext/frontend/Tests/Unit/Controller/TypoScriptFrontendControllerTest.php
index 32baa22d0bb3b814b168251c900ee9219a9e3f22..4335405a3e7e9eebf514a1d0bf2664b03b0c5598 100644
--- a/typo3/sysext/frontend/Tests/Unit/Controller/TypoScriptFrontendControllerTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/Controller/TypoScriptFrontendControllerTest.php
@@ -37,7 +37,7 @@ class TypoScriptFrontendControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
         $this->subject->TYPO3_CONF_VARS = $GLOBALS['TYPO3_CONF_VARS'];
         $this->subject->TYPO3_CONF_VARS['SYS']['encryptionKey'] = '170928423746123078941623042360abceb12341234231';
 
-        $pageRepository = $this->getMock(PageRepository::class);
+        $pageRepository = $this->getMockBuilder(PageRepository::class)->getMock();
         $this->subject->sys_page = $pageRepository;
     }
 
@@ -74,12 +74,14 @@ class TypoScriptFrontendControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
     protected function setupTsfeMockForHeaderFooterReplacementCheck()
     {
         /** @var \PHPUnit_Framework_MockObject_MockObject|TypoScriptFrontendController $tsfe */
-        $tsfe = $this->getMock(TypoScriptFrontendController::class, array(
-            'INTincScript_process',
-            'INTincScript_loadJSCode',
-            'setAbsRefPrefix',
-            'regeneratePageTitle'
-        ), array(), '', false);
+        $tsfe = $this->getMockBuilder(TypoScriptFrontendController::class)
+            ->setMethods(array(
+                'INTincScript_process',
+                'INTincScript_loadJSCode',
+                'setAbsRefPrefix',
+                'regeneratePageTitle'
+            ))->disableOriginalConstructor()
+            ->getMock();
         $tsfe->expects($this->exactly(2))->method('INTincScript_process')->will($this->returnCallback(array($this, 'INTincScript_processCallback')));
         $tsfe->content = file_get_contents(__DIR__ . '/Fixtures/renderedPage.html');
         $tsfe->config['INTincScript_ext']['divKey'] = '679b52796e75d474ccbbed486b6837ab';
@@ -151,7 +153,9 @@ class TypoScriptFrontendControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
                 'forced' => 0,
             ),
         );
-        $GLOBALS['TYPO3_DB'] = $this->getMock(DatabaseConnection::class, array('exec_SELECTgetRows'));
+        $GLOBALS['TYPO3_DB'] = $this->getMockBuilder(DatabaseConnection::class)
+            ->setMethods(array('exec_SELECTgetRows'))
+            ->getMock();
         $GLOBALS['TYPO3_DB']->expects($this->any())->method('exec_SELECTgetRows')->willReturn($domainRecords);
         GeneralUtility::makeInstance(CacheManager::class)->getCache('cache_runtime')->flush();
         $expectedResult = array(
@@ -188,7 +192,9 @@ class TypoScriptFrontendControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
                 'forced' => 0,
             ),
         );
-        $GLOBALS['TYPO3_DB'] = $this->getMock(DatabaseConnection::class, array('exec_SELECTgetRows'));
+        $GLOBALS['TYPO3_DB'] = $this->getMockBuilder(DatabaseConnection::class)
+            ->setMethods(array('exec_SELECTgetRows'))
+            ->getMock();
         $GLOBALS['TYPO3_DB']->expects($this->any())->method('exec_SELECTgetRows')->willReturn($domainRecords);
         GeneralUtility::makeInstance(CacheManager::class)->getCache('cache_runtime')->flush();
         $expectedResult = array(
diff --git a/typo3/sysext/frontend/Tests/Unit/Page/CacheHashCalculatorTest.php b/typo3/sysext/frontend/Tests/Unit/Page/CacheHashCalculatorTest.php
index 4871f9f3959c2c4e02d9850251ef3ffa539570d7..3fb4efe639deca1cd93af399ec4cdad737f87661 100644
--- a/typo3/sysext/frontend/Tests/Unit/Page/CacheHashCalculatorTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/Page/CacheHashCalculatorTest.php
@@ -35,7 +35,9 @@ class CacheHashCalculatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             'encryptionKey' => $GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey']
         );
         $GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'] = 't3lib_cacheHashTest';
-        $this->subject = $this->getMock(\TYPO3\CMS\Frontend\Page\CacheHashCalculator::class, array('foo'));
+        $this->subject = $this->getMockBuilder(\TYPO3\CMS\Frontend\Page\CacheHashCalculator::class)
+            ->setMethods(array('foo'))
+            ->getMock();
         $this->subject->setConfiguration(array(
             'excludedParameters' => array('exclude1', 'exclude2'),
             'cachedParametersWhiteList' => array(),
diff --git a/typo3/sysext/frontend/Tests/Unit/Page/PageRepositoryTest.php b/typo3/sysext/frontend/Tests/Unit/Page/PageRepositoryTest.php
index e589c0c947f8646be669b9e2314ae0353971b9b3..dc90c59c151745011ffeed86b410212167ad5f66 100644
--- a/typo3/sysext/frontend/Tests/Unit/Page/PageRepositoryTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/Page/PageRepositoryTest.php
@@ -49,7 +49,9 @@ class PageRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     protected function setUp()
     {
-        $GLOBALS['TYPO3_DB'] = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array('exec_SELECTquery', 'sql_fetch_assoc', 'sql_free_result', 'exec_SELECTgetSingleRow'));
+        $GLOBALS['TYPO3_DB'] = $this->getMockBuilder(\TYPO3\CMS\Core\Database\DatabaseConnection::class)
+            ->setMethods(array('exec_SELECTquery', 'sql_fetch_assoc', 'sql_free_result', 'exec_SELECTgetSingleRow'))
+            ->getMock();
         $this->pageSelectObject = $this->getAccessibleMock(\TYPO3\CMS\Frontend\Page\PageRepository::class, array('getMultipleGroupsWhereClause'));
         $this->pageSelectObject->expects($this->any())->method('getMultipleGroupsWhereClause')->will($this->returnValue(' AND 1=1'));
     }
@@ -63,7 +65,10 @@ class PageRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         // Create a hook mock object
         $className = $this->getUniqueId('tx_coretest');
-        $getPageHookMock = $this->getMock(\TYPO3\CMS\Frontend\Page\PageRepositoryGetPageHookInterface::class, array('getPage_preProcess'), array(), $className);
+        $getPageHookMock = $this->getMockBuilder(\TYPO3\CMS\Frontend\Page\PageRepositoryGetPageHookInterface::class)
+            ->setMethods(array('getPage_preProcess'))
+            ->setMockClassName($className)
+            ->getMock();
         // Register hook mock object
         GeneralUtility::addInstance($className, $getPageHookMock);
         $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_page.php']['getPage'][] = $className;
diff --git a/typo3/sysext/frontend/Tests/Unit/Processor/GalleryProcessorTest.php b/typo3/sysext/frontend/Tests/Unit/Processor/GalleryProcessorTest.php
index 80d6b19925dfe4c0aae8201701dd026f6796aafa..60a458f4d6b5d2f78546de0ac6170fbc1c998df0 100644
--- a/typo3/sysext/frontend/Tests/Unit/Processor/GalleryProcessorTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/Processor/GalleryProcessorTest.php
@@ -34,10 +34,9 @@ class GalleryProcessorTest extends UnitTestCase
      */
     protected function setUp()
     {
-        $this->contentObjectRenderer = $this->getMock(
-            ContentObjectRenderer::class,
-            ['dummy']
-        );
+        $this->contentObjectRenderer = $this->getMockBuilder(ContentObjectRenderer::class)
+            ->setMethods(['dummy'])
+            ->getMock();
     }
 
     /**
@@ -255,7 +254,7 @@ class GalleryProcessorTest extends UnitTestCase
     {
         $files = [];
         for ($i = 0; $i < $numberOfFiles; $i++) {
-            $files[] = $this->getMock(FileReference::class, array(), array(), '', false);
+            $files[] = $this->createMock(FileReference::class);
         }
         $this->contentObjectRenderer->data = $data;
         $processor = new GalleryProcessor();
@@ -442,7 +441,7 @@ class GalleryProcessorTest extends UnitTestCase
     {
         $files = [];
         foreach ($testFiles as $fileConfig) {
-            $fileReference = $this->getMock(FileReference::class, array(), array(), '', false);
+            $fileReference = $this->createMock(FileReference::class);
             $fileReference->expects($this->any())
                 ->method('getProperty')
                 ->will($this->returnValueMap([
diff --git a/typo3/sysext/frontend/Tests/Unit/View/AdminPanelViewTest.php b/typo3/sysext/frontend/Tests/Unit/View/AdminPanelViewTest.php
index 9c7bcd0732f49198b8b5013c5a27eb077f0403cc..b4276c80bd67cb0466ca7ca8bc3c702c13d35ac7 100644
--- a/typo3/sysext/frontend/Tests/Unit/View/AdminPanelViewTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/View/AdminPanelViewTest.php
@@ -25,7 +25,7 @@ class AdminPanelViewTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     protected function setUp()
     {
-        $GLOBALS['LANG'] = $this->getMock(\TYPO3\CMS\Lang\LanguageService::class, array(), array(), '', false);
+        $GLOBALS['LANG'] = $this->createMock(\TYPO3\CMS\Lang\LanguageService::class);
     }
 
     /**
@@ -36,13 +36,16 @@ class AdminPanelViewTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $strTime = '2013-01-01 01:00:00';
         $timestamp = strtotime($strTime);
 
-        $backendUser = $this->getMock(\TYPO3\CMS\Core\Authentication\BackendUserAuthentication::class);
+        $backendUser = $this->getMockBuilder(\TYPO3\CMS\Core\Authentication\BackendUserAuthentication::class)->getMock();
         $backendUser->uc['TSFE_adminConfig']['preview_simulateDate'] = $timestamp;
         unset($backendUser->extAdminConfig['override.']['preview.']);
         unset($backendUser->extAdminConfig['override.']['preview']);
         $GLOBALS['BE_USER'] = $backendUser;
 
-        $adminPanelMock = $this->getMock(\TYPO3\CMS\Frontend\View\AdminPanelView::class, array('isAdminModuleEnabled', 'isAdminModuleOpen'), array(), '', false);
+        $adminPanelMock = $this->getMockBuilder(\TYPO3\CMS\Frontend\View\AdminPanelView::class)
+            ->setMethods(array('isAdminModuleEnabled', 'isAdminModuleOpen'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $adminPanelMock->expects($this->any())->method('isAdminModuleEnabled')->will($this->returnValue(true));
         $adminPanelMock->expects($this->any())->method('isAdminModuleOpen')->will($this->returnValue(true));
 
@@ -63,7 +66,10 @@ class AdminPanelViewTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->expectExceptionCode(1311942539);
         $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/class.tslib_adminpanel.php']['extendAdminPanel'][] = \TYPO3\CMS\Frontend\Tests\Unit\Fixtures\AdminPanelHookWithoutInterfaceFixture::class;
         /** @var $adminPanelMock \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Frontend\View\AdminPanelView */
-        $adminPanelMock = $this->getMock(\TYPO3\CMS\Frontend\View\AdminPanelView::class, array('dummy'), array(), '', false);
+        $adminPanelMock = $this->getMockBuilder(\TYPO3\CMS\Frontend\View\AdminPanelView::class)
+            ->setMethods(array('dummy'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $adminPanelMock->display();
     }
 
@@ -73,11 +79,16 @@ class AdminPanelViewTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     public function extendAdminPanelHookCallsExtendAdminPanelMethodOfHook()
     {
         $hookClass = $this->getUniqueId('tx_coretest');
-        $hookMock = $this->getMock(\TYPO3\CMS\Frontend\View\AdminPanelViewHookInterface::class, array(), array(), $hookClass);
+        $hookMock = $this->getMockBuilder(\TYPO3\CMS\Frontend\View\AdminPanelViewHookInterface::class)
+            ->setMockClassName($hookClass)
+            ->getMock();
         GeneralUtility::addInstance($hookClass, $hookMock);
         $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/class.tslib_adminpanel.php']['extendAdminPanel'][] = $hookClass;
         /** @var $adminPanelMock \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Frontend\View\AdminPanelView */
-        $adminPanelMock = $this->getMock(\TYPO3\CMS\Frontend\View\AdminPanelView::class, array('extGetLL'), array(), '', false);
+        $adminPanelMock = $this->getMockBuilder(\TYPO3\CMS\Frontend\View\AdminPanelView::class)
+            ->setMethods(array('extGetLL'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $hookMock->expects($this->once())->method('extendAdminPanel')->with($this->isType('string'), $this->isInstanceOf(\TYPO3\CMS\Frontend\View\AdminPanelView::class));
         $adminPanelMock->display();
     }
diff --git a/typo3/sysext/indexed_search/Tests/Unit/IndexerTest.php b/typo3/sysext/indexed_search/Tests/Unit/IndexerTest.php
index 5bcad4e15a02f2cc3c5429d9f1a99f6403ca2381..6d7935f3c1978ccde53e12a64e3ff8a1b52bc7df 100644
--- a/typo3/sysext/indexed_search/Tests/Unit/IndexerTest.php
+++ b/typo3/sysext/indexed_search/Tests/Unit/IndexerTest.php
@@ -31,7 +31,9 @@ class IndexerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     protected function setUp()
     {
-        $this->subject = $this->getMock(\TYPO3\CMS\IndexedSearch\Indexer::class, array('dummy'));
+        $this->subject = $this->getMockBuilder(\TYPO3\CMS\IndexedSearch\Indexer::class)
+            ->setMethods(array('dummy'))
+            ->getMock();
     }
 
     /**
@@ -103,7 +105,7 @@ class IndexerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $absRefPrefix = '/' . $this->getUniqueId();
         $html = 'test <a href="' . $absRefPrefix . 'index.php">test</a> test';
-        $GLOBALS['TSFE'] = $this->getMock(\TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController::class, array(), array(), '', false);
+        $GLOBALS['TSFE'] = $this->createMock(\TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController::class);
         $GLOBALS['TSFE']->config['config']['absRefPrefix'] = $absRefPrefix;
         $result = $this->subject->extractHyperLinks($html);
         $this->assertEquals(1, count($result));
diff --git a/typo3/sysext/indexed_search/Tests/Unit/Utility/LikeWildcardTest.php b/typo3/sysext/indexed_search/Tests/Unit/Utility/LikeWildcardTest.php
index 747c44bd5e1ae4118d4351a9e68e8eadeb0238de..1a095567defc4d47132c70662daffe254b6bc809 100644
--- a/typo3/sysext/indexed_search/Tests/Unit/Utility/LikeWildcardTest.php
+++ b/typo3/sysext/indexed_search/Tests/Unit/Utility/LikeWildcardTest.php
@@ -26,7 +26,9 @@ class LikeWildcardTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     protected function setUp()
     {
         /** @var $databaseConnectionMock \TYPO3\CMS\Core\Database\DatabaseConnection|\PHPUnit_Framework_MockObject_MockObject */
-        $databaseConnectionMock = $this->getMock(\TYPO3\CMS\Core\Database\DatabaseConnection::class, array('quoteStr'));
+        $databaseConnectionMock = $this->getMockBuilder(\TYPO3\CMS\Core\Database\DatabaseConnection::class)
+            ->setMethods(array('quoteStr'))
+            ->getMock();
         $databaseConnectionMock->method('quoteStr')
             ->will($this->returnArgument(0));
         $GLOBALS['TYPO3_DB'] = $databaseConnectionMock;
diff --git a/typo3/sysext/install/Tests/Unit/Controller/Action/Ajax/ExtensionCompatibilityTesterTest.php b/typo3/sysext/install/Tests/Unit/Controller/Action/Ajax/ExtensionCompatibilityTesterTest.php
index 60c50ec3723f6c647a10fb35446b3f7aa6af55fe..5a81f022b0612db451c543f11671c3ba87ba5ab9 100644
--- a/typo3/sysext/install/Tests/Unit/Controller/Action/Ajax/ExtensionCompatibilityTesterTest.php
+++ b/typo3/sysext/install/Tests/Unit/Controller/Action/Ajax/ExtensionCompatibilityTesterTest.php
@@ -128,7 +128,7 @@ class ExtensionCompatibilityTesterTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
         // tryToLoadExtLocalconfAndExtTablesOfExtensions() triggers a call to ExtensionManagementUtility::loadBaseTca
         // that works on our UnitTestPackageManager to do things. This package manager needs to be mocked here to
         // not trigger unwanted side effects.
-        $packageManager = $this->getMock(\TYPO3\CMS\Core\Package\PackageManager::class, array(), array(), '', false);
+        $packageManager = $this->createMock(\TYPO3\CMS\Core\Package\PackageManager::class);
         $packageManager->expects($this->any())->method('getActivePackages')->will($this->returnValue(array()));
         ExtensionManagementUtility::setPackageManager($packageManager);
 
@@ -151,7 +151,7 @@ class ExtensionCompatibilityTesterTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
         // tryToLoadExtLocalconfAndExtTablesOfExtensions() triggers a call to ExtensionManagementUtility::loadBaseTca
         // that works on our UnitTestPackageManager to do things. This package manager needs to be mocked here to
         // not trigger unwanted side effects.
-        $packageManager = $this->getMock(\TYPO3\CMS\Core\Package\PackageManager::class, array(), array(), '', false);
+        $packageManager = $this->createMock(\TYPO3\CMS\Core\Package\PackageManager::class);
         $packageManager->expects($this->any())->method('getActivePackages')->will($this->returnValue(array()));
         ExtensionManagementUtility::setPackageManager($packageManager);
 
@@ -192,7 +192,7 @@ class ExtensionCompatibilityTesterTest extends \TYPO3\CMS\Core\Tests\UnitTestCas
         // tryToLoadExtLocalconfAndExtTablesOfExtensions() triggers a call to ExtensionManagementUtility::loadBaseTca
         // that works on our UnitTestPackageManager to do things. This package manager needs to be mocked here to
         // not trigger unwanted side effects.
-        $packageManager = $this->getMock(\TYPO3\CMS\Core\Package\PackageManager::class, array(), array(), '', false);
+        $packageManager = $this->createMock(\TYPO3\CMS\Core\Package\PackageManager::class);
         $packageManager->expects($this->any())->method('getActivePackages')->will($this->returnValue(array()));
         ExtensionManagementUtility::setPackageManager($packageManager);
 
diff --git a/typo3/sysext/install/Tests/Unit/FolderStructure/AbstractNodeTest.php b/typo3/sysext/install/Tests/Unit/FolderStructure/AbstractNodeTest.php
index 0a0bedb0624e8ac0a76e9c53ea84a8a3cfe6941e..8d71d252bab3fdc841cebf06eda7a2bf07b952e0 100644
--- a/typo3/sysext/install/Tests/Unit/FolderStructure/AbstractNodeTest.php
+++ b/typo3/sysext/install/Tests/Unit/FolderStructure/AbstractNodeTest.php
@@ -64,7 +64,7 @@ class AbstractNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTest
     {
         /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\AbstractNode::class, array('dummy'), array(), '', false);
-        $parent = $this->getMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class, array(), array(), '', false);
+        $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class);
         $node->_set('parent', $parent);
         $this->assertSame($parent, $node->_call('getParent'));
     }
@@ -76,7 +76,7 @@ class AbstractNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTest
     {
         /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\AbstractNode::class, array('dummy'), array(), '', false);
-        $parent = $this->getMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class, array(), array(), '', false);
+        $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class);
         $parentPath = '/foo/bar';
         $parent->expects($this->once())->method('getAbsolutePath')->will($this->returnValue($parentPath));
         $name = $this->getUniqueId('test_');
@@ -92,7 +92,7 @@ class AbstractNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTest
     {
         /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\AbstractNode::class, array('dummy'), array(), '', false);
-        $parentMock = $this->getMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class, array(), array(), '', false);
+        $parentMock = $this->createMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class);
         $parentMock->expects($this->once())->method('isWritable');
         $node->_set('parent', $parentMock);
         $node->isWritable();
@@ -105,7 +105,7 @@ class AbstractNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTest
     {
         /** @var $node \TYPO3\CMS\Install\FolderStructure\AbstractNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\AbstractNode::class, array('dummy'), array(), '', false);
-        $parentMock = $this->getMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class, array(), array(), '', false);
+        $parentMock = $this->createMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class);
         $parentMock->expects($this->once())->method('isWritable')->will($this->returnValue(true));
         $node->_set('parent', $parentMock);
         $this->assertTrue($node->isWritable());
diff --git a/typo3/sysext/install/Tests/Unit/FolderStructure/DirectoryNodeTest.php b/typo3/sysext/install/Tests/Unit/FolderStructure/DirectoryNodeTest.php
index 2d30b9f17fe40a13ae2f11e8336eac157a9245af..c31345fbaa13161c84ffb36baffb85c275a8e1f5 100644
--- a/typo3/sysext/install/Tests/Unit/FolderStructure/DirectoryNodeTest.php
+++ b/typo3/sysext/install/Tests/Unit/FolderStructure/DirectoryNodeTest.php
@@ -40,7 +40,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTes
     {
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionCode(1366226639);
-        $parent = $this->getMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class, array(), array(), '', false);
+        $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class);
         /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\DirectoryNode::class, array('dummy'), array(), '', false);
         $structure = array(
@@ -54,7 +54,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTes
      */
     public function constructorCallsCreateChildrenIfChildrenAreSet()
     {
-        $parent = $this->getMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class, array(), array(), '', false);
+        $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class);
         /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(
             \TYPO3\CMS\Install\FolderStructure\DirectoryNode::class,
@@ -79,7 +79,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTes
      */
     public function constructorSetsParent()
     {
-        $parent = $this->getMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class, array(), array(), '', false);
+        $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class);
         /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\DirectoryNode::class, array('dummy'), array(), '', false);
         $structure = array(
@@ -94,7 +94,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTes
      */
     public function constructorSetsTargetPermission()
     {
-        $parent = $this->getMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class, array(), array(), '', false);
+        $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class);
         /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\DirectoryNode::class, array('dummy'), array(), '', false);
         $targetPermission = '2550';
@@ -113,7 +113,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTes
     {
         /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\DirectoryNode::class, array('dummy'), array(), '', false);
-        $parent = $this->getMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class, array(), array(), '', false);
+        $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class);
         $name = $this->getUniqueId('test_');
         $node->__construct(array('name' => $name), $parent);
         $this->assertSame($name, $node->getName());
@@ -293,9 +293,9 @@ class DirectoryNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTes
         $node->expects($this->any())->method('isDirectory')->will($this->returnValue(true));
         $node->expects($this->any())->method('isPermissionCorrect')->will($this->returnValue(true));
         $node->expects($this->any())->method('isWritable')->will($this->returnValue(true));
-        $childMock1 = $this->getMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class, array(), array(), '', false);
+        $childMock1 = $this->createMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class);
         $childMock1->expects($this->once())->method('getStatus')->will($this->returnValue(array()));
-        $childMock2 = $this->getMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class, array(), array(), '', false);
+        $childMock2 = $this->createMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class);
         $childMock2->expects($this->once())->method('getStatus')->will($this->returnValue(array()));
         $node->_set('children', array($childMock1, $childMock2));
         $node->getStatus();
@@ -318,8 +318,8 @@ class DirectoryNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTes
         $node->expects($this->any())->method('isDirectory')->will($this->returnValue(true));
         $node->expects($this->any())->method('isPermissionCorrect')->will($this->returnValue(true));
         $node->expects($this->any())->method('isWritable')->will($this->returnValue(true));
-        $childMock = $this->getMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class, array(), array(), '', false);
-        $childStatusMock = $this->getMock(\TYPO3\CMS\Install\Status\ErrorStatus::class, array(), array(), '', false);
+        $childMock = $this->createMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class);
+        $childStatusMock = $this->createMock(\TYPO3\CMS\Install\Status\ErrorStatus::class);
         $childMock->expects($this->once())->method('getStatus')->will($this->returnValue(array($childStatusMock)));
         $node->_set('children', array($childMock));
         $status = $node->getStatus();
@@ -357,11 +357,11 @@ class DirectoryNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTes
         $uniqueReturnSelf = $this->getUniqueId('foo_');
         $node->expects($this->once())->method('fixSelf')->will($this->returnValue(array($uniqueReturnSelf)));
 
-        $childMock1 = $this->getMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class, array(), array(), '', false);
+        $childMock1 = $this->createMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class);
         $uniqueReturnChild1 = $this->getUniqueId('foo_');
         $childMock1->expects($this->once())->method('fix')->will($this->returnValue(array($uniqueReturnChild1)));
 
-        $childMock2 = $this->getMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class, array(), array(), '', false);
+        $childMock2 = $this->createMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class);
         $uniqueReturnChild2 = $this->getUniqueId('foo_');
         $childMock2->expects($this->once())->method('fix')->will($this->returnValue(array($uniqueReturnChild2)));
 
@@ -553,7 +553,7 @@ class DirectoryNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTes
     {
         /** @var $node \TYPO3\CMS\Install\FolderStructure\DirectoryNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\DirectoryNode::class, array('dummy'), array(), '', false);
-        $parent = $this->getMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class, array(), array(), '', false);
+        $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class);
         $childName = $this->getUniqueId('test_');
         $structure = array(
             'name' => 'foo',
diff --git a/typo3/sysext/install/Tests/Unit/FolderStructure/FileNodeTest.php b/typo3/sysext/install/Tests/Unit/FolderStructure/FileNodeTest.php
index 018be2ef15b4584c729aa61c6ae089594a291879..30f266f6b9c76995f7177b7e8c4b2e2e9d4da21b 100644
--- a/typo3/sysext/install/Tests/Unit/FolderStructure/FileNodeTest.php
+++ b/typo3/sysext/install/Tests/Unit/FolderStructure/FileNodeTest.php
@@ -40,7 +40,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
     {
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionCode(1366222207);
-        $parent = $this->getMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class, array(), array(), '', false);
+        $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class);
         /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, array('dummy'), array(), '', false);
         $structure = array(
@@ -54,7 +54,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
      */
     public function constructorSetsParent()
     {
-        $parent = $this->getMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class, array(), array(), '', false);
+        $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class);
         /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, array('dummy'), array(), '', false);
         $structure = array(
@@ -69,7 +69,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
      */
     public function constructorSetsTargetPermission()
     {
-        $parent = $this->getMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class, array(), array(), '', false);
+        $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class);
         /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, array('dummy'), array(), '', false);
         $targetPermission = '0660';
@@ -88,7 +88,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
     {
         /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, array('dummy'), array(), '', false);
-        $parent = $this->getMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class, array(), array(), '', false);
+        $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class);
         $name = $this->getUniqueId('test_');
         $node->__construct(array('name' => $name), $parent);
         $this->assertSame($name, $node->getName());
@@ -103,7 +103,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
         $this->expectExceptionCode(1380364361);
         /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, array('dummy'), array(), '', false);
-        $parent = $this->getMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class, array(), array(), '', false);
+        $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class);
         $structure = array(
             'name' => 'foo',
             'targetContent' => 'foo',
@@ -119,7 +119,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
     {
         /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, array('dummy'), array(), '', false);
-        $parent = $this->getMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class, array(), array(), '', false);
+        $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class);
         $targetContent = $this->getUniqueId('content_');
         $structure = array(
             'name' => 'foo',
@@ -136,7 +136,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
     {
         /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, array('dummy'), array(), '', false);
-        $parent = $this->getMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class, array(), array(), '', false);
+        $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class);
         $targetFile = $this->getVirtualTestFilePath('test_');
         $targetContent = $this->getUniqueId('content_');
         file_put_contents($targetFile, $targetContent);
@@ -157,7 +157,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
         $this->expectExceptionCode(1380364362);
         /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, array('dummy'), array(), '', false);
-        $parent = $this->getMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class, array(), array(), '', false);
+        $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class);
         $targetFile = $this->getVirtualTestFilePath('test_');
         $structure = array(
             'name' => 'foo',
@@ -173,7 +173,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
     {
         /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, array('dummy'), array(), '', false);
-        $parent = $this->getMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class, array(), array(), '', false);
+        $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class);
         $structure = array(
             'name' => 'foo',
         );
@@ -429,7 +429,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
         $node->expects($this->any())->method('isFile')->will($this->returnValue(true));
         $node->expects($this->any())->method('isPermissionCorrect')->will($this->returnValue(true));
         $uniqueReturn = $this->getUniqueId();
-        $createFileStatus = $this->getMock(\TYPO3\CMS\Install\Status\OkStatus::class, array(), array(), '', false);
+        $createFileStatus = $this->createMock(\TYPO3\CMS\Install\Status\OkStatus::class);
         $node->expects($this->any())->method('createFile')->will($this->returnValue($createFileStatus));
         $node->_set('targetContent', 'foo');
         $node->expects($this->once())->method('setContent')->will($this->returnValue($uniqueReturn));
@@ -454,7 +454,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
         $node->expects($this->any())->method('exists')->will($this->returnValue(false));
         $node->expects($this->any())->method('isFile')->will($this->returnValue(true));
         $node->expects($this->any())->method('isPermissionCorrect')->will($this->returnValue(true));
-        $createFileStatus = $this->getMock(\TYPO3\CMS\Install\Status\ErrorStatus::class, array(), array(), '', false);
+        $createFileStatus = $this->createMock(\TYPO3\CMS\Install\Status\ErrorStatus::class);
         $node->expects($this->any())->method('createFile')->will($this->returnValue($createFileStatus));
         $node->_set('targetContent', 'foo');
         $node->expects($this->never())->method('setContent');
@@ -477,7 +477,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
         $node->expects($this->any())->method('exists')->will($this->returnValue(false));
         $node->expects($this->any())->method('isFile')->will($this->returnValue(true));
         $node->expects($this->any())->method('isPermissionCorrect')->will($this->returnValue(true));
-        $createFileStatus = $this->getMock(\TYPO3\CMS\Install\Status\OkStatus::class, array(), array(), '', false);
+        $createFileStatus = $this->createMock(\TYPO3\CMS\Install\Status\OkStatus::class);
         $node->expects($this->any())->method('createFile')->will($this->returnValue($createFileStatus));
         $node->_set('targetContent', null);
         $node->expects($this->never())->method('setContent');
@@ -666,7 +666,7 @@ class FileNodeTest extends \TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase
      */
     public function isPermissionCorrectReturnsTrueIfTargetPermissionAndCurrentPermissionAreIdentical()
     {
-        $parent = $this->getMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class, array(), array(), '', false);
+        $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class);
         /** @var $node \TYPO3\CMS\Install\FolderStructure\FileNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\FileNode::class, array('getCurrentPermission', 'isWindowsOs'), array(), '', false);
         $node->expects($this->any())->method('isWindowsOs')->will($this->returnValue(false));
diff --git a/typo3/sysext/install/Tests/Unit/FolderStructure/LinkNodeTest.php b/typo3/sysext/install/Tests/Unit/FolderStructure/LinkNodeTest.php
index 204b07a29ec90c8dd895cbeb829c2e80f63bd90b..8dbbc10c20e03ca812cd4ae535d2cfe71e409196 100644
--- a/typo3/sysext/install/Tests/Unit/FolderStructure/LinkNodeTest.php
+++ b/typo3/sysext/install/Tests/Unit/FolderStructure/LinkNodeTest.php
@@ -39,7 +39,7 @@ class LinkNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionCode(1380546061);
-        $parent = $this->getMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class, array(), array(), '', false);
+        $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class);
         /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\LinkNode::class, array('dummy'), array(), '', false);
         $structure = array(
@@ -53,7 +53,7 @@ class LinkNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function constructorSetsParent()
     {
-        $parent = $this->getMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class, array(), array(), '', false);
+        $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class);
         /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\LinkNode::class, array('dummy'), array(), '', false);
         $structure = array(
@@ -70,7 +70,7 @@ class LinkNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\LinkNode::class, array('dummy'), array(), '', false);
-        $parent = $this->getMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class, array(), array(), '', false);
+        $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class);
         $name = $this->getUniqueId('test_');
         $node->__construct(array('name' => $name), $parent);
         $this->assertSame($name, $node->getName());
@@ -83,7 +83,7 @@ class LinkNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         /** @var $node \TYPO3\CMS\Install\FolderStructure\LinkNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\LinkNode::class, array('dummy'), array(), '', false);
-        $parent = $this->getMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class, array(), array(), '', false);
+        $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class);
         $target = '../' . $this->getUniqueId('test_');
         $node->__construct(array('target' => $target), $parent);
         $this->assertSame($target, $node->_call('getTarget'));
diff --git a/typo3/sysext/install/Tests/Unit/FolderStructure/RootNodeTest.php b/typo3/sysext/install/Tests/Unit/FolderStructure/RootNodeTest.php
index 8f9ae6f008bce2e5f0045e47e14b0fc0ac54d2ea..31eee8573a0eb6a2c30df3b73553be42a593b4c6 100644
--- a/typo3/sysext/install/Tests/Unit/FolderStructure/RootNodeTest.php
+++ b/typo3/sysext/install/Tests/Unit/FolderStructure/RootNodeTest.php
@@ -30,13 +30,7 @@ class RootNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $this->expectExceptionCode(1366140117);
         /** @var $node \TYPO3\CMS\Install\FolderStructure\RootNode|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $node = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\RootNode::class, array('isWindowsOs'), array(), '', false);
-        $falseParent = $this->getMock(
-            \TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class,
-            array(),
-            array(),
-            '',
-            false
-        );
+        $falseParent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class);
         $node->__construct(array(), $falseParent);
     }
 
@@ -224,7 +218,7 @@ class RootNodeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $node->expects($this->any())->method('isDirectory')->will($this->returnValue(true));
         $node->expects($this->any())->method('isPermissionCorrect')->will($this->returnValue(true));
         $node->expects($this->any())->method('isWritable')->will($this->returnValue(true));
-        $childStatusMock = $this->getMock(\TYPO3\CMS\Install\Status\ErrorStatus::class, array(), array(), '', false);
+        $childStatusMock = $this->createMock(\TYPO3\CMS\Install\Status\ErrorStatus::class);
         $node->expects($this->once())->method('getChildrenStatus')->will($this->returnValue(array($childStatusMock)));
         $statusArray = $node->getStatus();
         /** @var $status \TYPO3\CMS\Install\Status\StatusInterface */
diff --git a/typo3/sysext/install/Tests/Unit/FolderStructure/StructureFacadeTest.php b/typo3/sysext/install/Tests/Unit/FolderStructure/StructureFacadeTest.php
index b8ecc3df5bbb4060e41075b22c4e7ceceec18a1a..035a51a30eca1883cd71982574fa405ffe938082 100644
--- a/typo3/sysext/install/Tests/Unit/FolderStructure/StructureFacadeTest.php
+++ b/typo3/sysext/install/Tests/Unit/FolderStructure/StructureFacadeTest.php
@@ -26,7 +26,7 @@ class StructureFacadeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         /** @var $facade \TYPO3\CMS\Install\FolderStructure\StructureFacade|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $facade = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\StructureFacade::class, array('dummy'), array(), '', false);
-        $root = $this->getMock(\TYPO3\CMS\Install\FolderStructure\RootNode::class, array(), array(), '', false);
+        $root = $this->createMock(\TYPO3\CMS\Install\FolderStructure\RootNode::class);
         $root->expects($this->once())->method('getStatus')->will($this->returnValue(array()));
         $facade->_set('structure', $root);
         $status = $facade->getStatus();
@@ -40,7 +40,7 @@ class StructureFacadeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
     {
         /** @var $facade \TYPO3\CMS\Install\FolderStructure\StructureFacade|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $facade = $this->getAccessibleMock(\TYPO3\CMS\Install\FolderStructure\StructureFacade::class, array('dummy'), array(), '', false);
-        $root = $this->getMock(\TYPO3\CMS\Install\FolderStructure\RootNode::class, array(), array(), '', false);
+        $root = $this->createMock(\TYPO3\CMS\Install\FolderStructure\RootNode::class);
         $root->expects($this->once())->method('fix')->will($this->returnValue(array()));
         $facade->_set('structure', $root);
         $status = $facade->fix();
diff --git a/typo3/sysext/install/Tests/Unit/Service/CoreVersionServiceTest.php b/typo3/sysext/install/Tests/Unit/Service/CoreVersionServiceTest.php
index 9e962b2b5a60a8bb08c5c3afe849aa3774dcb11a..13fb4ab0ad3a51a0df05d69d22921ecacccfb2a1 100644
--- a/typo3/sysext/install/Tests/Unit/Service/CoreVersionServiceTest.php
+++ b/typo3/sysext/install/Tests/Unit/Service/CoreVersionServiceTest.php
@@ -30,7 +30,7 @@ class CoreVersionServiceTest extends UnitTestCase
     {
         /** @var $instance CoreVersionService|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $instance = $this->getAccessibleMock(CoreVersionService::class, array('fetchVersionMatrixFromRemote'), array(), '', false);
-        $registry = $this->getMock(Registry::class);
+        $registry = $this->createMock(Registry::class);
         $versionArray = array(8 => []);
         $registry->expects($this->once())->method('set')->with('TYPO3.CMS.Install', 'coreVersionMatrix', $versionArray);
         $instance->_set('registry', $registry);
@@ -45,7 +45,7 @@ class CoreVersionServiceTest extends UnitTestCase
     {
         /** @var $instance CoreVersionService|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $instance = $this->getAccessibleMock(CoreVersionService::class, array('fetchVersionMatrixFromRemote'), array(), '', false);
-        $registry = $this->getMock(Registry::class);
+        $registry = $this->createMock(Registry::class);
         $versionArray = array(
             '7' => array(),
             '6.2' => array(),
@@ -386,7 +386,7 @@ class CoreVersionServiceTest extends UnitTestCase
         $this->expectExceptionCode(1380898792);
         /** @var $instance CoreVersionService|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $instance = $this->getAccessibleMock(CoreVersionService::class, array('fetchVersionMatrixFromRemote'), array(), '', false);
-        $registry = $this->getMock(Registry::class);
+        $registry = $this->createMock(Registry::class);
         $registry->expects($this->once())->method('get')->will($this->returnValue(null));
         $instance->_set('registry', $registry);
         $instance->_call('getVersionMatrix');
@@ -399,7 +399,7 @@ class CoreVersionServiceTest extends UnitTestCase
     {
         /** @var $instance CoreVersionService|\TYPO3\CMS\Core\Tests\AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
         $instance = $this->getAccessibleMock(CoreVersionService::class, array('fetchVersionMatrixFromRemote'), array(), '', false);
-        $registry = $this->getMock(Registry::class);
+        $registry = $this->createMock(Registry::class);
         $versionArray = array($this->getUniqueId());
         $registry->expects($this->once())->method('get')->will($this->returnValue($versionArray));
         $instance->_set('registry', $registry);
diff --git a/typo3/sysext/install/Tests/Unit/Service/SilentConfigurationUpgradeServiceTest.php b/typo3/sysext/install/Tests/Unit/Service/SilentConfigurationUpgradeServiceTest.php
index 71bd306d1dc4016a12c51dc0304b42be16a7bf92..bcadd622a0aeec60ef8c5828e8ef90c317a7ffe4 100644
--- a/typo3/sysext/install/Tests/Unit/Service/SilentConfigurationUpgradeServiceTest.php
+++ b/typo3/sysext/install/Tests/Unit/Service/SilentConfigurationUpgradeServiceTest.php
@@ -57,10 +57,9 @@ class SilentConfigurationUpgradeServiceTest extends \TYPO3\CMS\Core\Tests\UnitTe
      */
     protected function createConfigurationManagerWithMockedMethods(array $methods)
     {
-        $this->configurationManager = $this->getMock(
-            ConfigurationManager::class,
-            $methods
-        );
+        $this->configurationManager = $this->getMockBuilder(ConfigurationManager::class)
+            ->setMethods($methods)
+            ->getMock();
     }
 
     /**
@@ -97,7 +96,7 @@ class SilentConfigurationUpgradeServiceTest extends \TYPO3\CMS\Core\Tests\UnitTe
         );
 
         /** @var $packageManager PackageManager|\PHPUnit_Framework_MockObject_MockObject */
-        $packageManager = $this->getMock(PackageManager::class, array(), array(), '', false);
+        $packageManager = $this->createMock(PackageManager::class);
         $packageManager->expects($this->any())
             ->method('isPackageActive')
             ->will($this->returnValue($isPackageActive));
diff --git a/typo3/sysext/install/Tests/Unit/Status/StatusUtilityTest.php b/typo3/sysext/install/Tests/Unit/Status/StatusUtilityTest.php
index bd29a011946aab5dc234e4d1bdc57642a065205f..1766d99bc133093995d6b4fdad94a7645b7e5118 100644
--- a/typo3/sysext/install/Tests/Unit/Status/StatusUtilityTest.php
+++ b/typo3/sysext/install/Tests/Unit/Status/StatusUtilityTest.php
@@ -27,11 +27,21 @@ class StatusUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function sortBySeveritySortsGivenStatusObjects()
     {
-        $errorMock = $this->getMock(\TYPO3\CMS\Install\Status\ErrorStatus::class, array('dummy'));
-        $warningMock = $this->getMock(\TYPO3\CMS\Install\Status\WarningStatus::class, array('dummy'));
-        $okMock = $this->getMock(\TYPO3\CMS\Install\Status\OkStatus::class, array('dummy'));
-        $infoMock = $this->getMock(\TYPO3\CMS\Install\Status\InfoStatus::class, array('dummy'));
-        $noticeMock = $this->getMock(\TYPO3\CMS\Install\Status\NoticeStatus::class, array('dummy'));
+        $errorMock = $this->getMockBuilder(\TYPO3\CMS\Install\Status\ErrorStatus::class)
+            ->setMethods(array('dummy'))
+            ->getMock();
+        $warningMock = $this->getMockBuilder(\TYPO3\CMS\Install\Status\WarningStatus::class)
+            ->setMethods(array('dummy'))
+            ->getMock();
+        $okMock = $this->getMockBuilder(\TYPO3\CMS\Install\Status\OkStatus::class)
+            ->setMethods(array('dummy'))
+            ->getMock();
+        $infoMock = $this->getMockBuilder(\TYPO3\CMS\Install\Status\InfoStatus::class)
+            ->setMethods(array('dummy'))
+            ->getMock();
+        $noticeMock = $this->getMockBuilder(\TYPO3\CMS\Install\Status\NoticeStatus::class)
+            ->setMethods(array('dummy'))
+            ->getMock();
         $statusUtility = new StatusUtility();
         $return = $statusUtility->sortBySeverity(array($noticeMock, $infoMock, $okMock, $warningMock, $errorMock));
         $this->assertSame(array($errorMock), $return['error']);
@@ -57,8 +67,12 @@ class StatusUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     public function filterBySeverityReturnsSpecificSeverityOnly()
     {
-        $errorMock = $this->getMock(\TYPO3\CMS\Install\Status\ErrorStatus::class, array('dummy'));
-        $warningMock = $this->getMock(\TYPO3\CMS\Install\Status\WarningStatus::class, array('dummy'));
+        $errorMock = $this->getMockBuilder(\TYPO3\CMS\Install\Status\ErrorStatus::class)
+            ->setMethods(array('dummy'))
+            ->getMock();
+        $warningMock = $this->getMockBuilder(\TYPO3\CMS\Install\Status\WarningStatus::class)
+            ->setMethods(array('dummy'))
+            ->getMock();
         $statusUtility = new StatusUtility();
         $return = $statusUtility->filterBySeverity(array($errorMock, $warningMock), 'error');
         $this->assertSame(array($errorMock), $return);
diff --git a/typo3/sysext/install/Tests/Unit/View/JsonViewTest.php b/typo3/sysext/install/Tests/Unit/View/JsonViewTest.php
index 67095f21ddbaeab04aeea3b1c81bbb122601c9bf..985e61bbed4591c650c2d87f11594e548e1ceba8 100644
--- a/typo3/sysext/install/Tests/Unit/View/JsonViewTest.php
+++ b/typo3/sysext/install/Tests/Unit/View/JsonViewTest.php
@@ -47,7 +47,7 @@ class JsonViewTest extends UnitTestCase
      */
     public function transformStatusToArrayCreatesArrayFromStatusMessage()
     {
-        $status = $this->getMock(\TYPO3\CMS\Install\Status\StatusInterface::class);
+        $status = $this->createMock(\TYPO3\CMS\Install\Status\StatusInterface::class);
         $status->expects($this->once())->method('getSeverity')->will($this->returnValue('aSeverity'));
         $status->expects($this->once())->method('getTitle')->will($this->returnValue('aTitle'));
         $status->expects($this->once())->method('getMessage')->will($this->returnValue('aMessage'));
diff --git a/typo3/sysext/install/Tests/Unit/ViewHelpers/Format/PhpErrorCodeViewHelperTest.php b/typo3/sysext/install/Tests/Unit/ViewHelpers/Format/PhpErrorCodeViewHelperTest.php
index f80ef5728b3862b088b90a053bc8ddac0b533ec9..f313411a3cf645aaa2377be258ee1e7a950bc6f0 100644
--- a/typo3/sysext/install/Tests/Unit/ViewHelpers/Format/PhpErrorCodeViewHelperTest.php
+++ b/typo3/sysext/install/Tests/Unit/ViewHelpers/Format/PhpErrorCodeViewHelperTest.php
@@ -32,7 +32,9 @@ class PhpErrorCodeViewHelperTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     protected function setUp()
     {
-        $this->viewHelper = $this->getMock(\TYPO3\CMS\Install\ViewHelpers\Format\PhpErrorCodeViewHelper::class, array('dummy'));
+        $this->viewHelper = $this->getMockBuilder(\TYPO3\CMS\Install\ViewHelpers\Format\PhpErrorCodeViewHelper::class)
+            ->setMethods(array('dummy'))
+            ->getMock();
         /** @var RenderingContext $renderingContext */
         $renderingContext = new RenderingContextFixture();
         $this->viewHelper->setRenderingContext($renderingContext);
diff --git a/typo3/sysext/recycler/Tests/Unit/Task/CleanerFieldProviderTest.php b/typo3/sysext/recycler/Tests/Unit/Task/CleanerFieldProviderTest.php
index 4a78e8223b22529b4f335c6ea9ee7c887f959234..e0b7150c897fbaa14e5a0ddfdaa3ca7024489c8a 100644
--- a/typo3/sysext/recycler/Tests/Unit/Task/CleanerFieldProviderTest.php
+++ b/typo3/sysext/recycler/Tests/Unit/Task/CleanerFieldProviderTest.php
@@ -35,9 +35,14 @@ class CleanerFieldProviderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     protected function setUp()
     {
-        $languageServiceMock = $this->getMock(LanguageService::class, array('sL'), array(), '', false);
+        $languageServiceMock = $this->getMockBuilder(LanguageService::class)
+            ->setMethods(array('sL'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $languageServiceMock->expects($this->any())->method('sL')->will($this->returnValue('titleTest'));
-        $this->subject = $this->getMock(CleanerFieldProvider::class, array('getLanguageService'));
+        $this->subject = $this->getMockBuilder(CleanerFieldProvider::class)
+            ->setMethods(array('getLanguageService'))
+            ->getMock();
         $this->subject->expects($this->any())->method('getLanguageService')->willReturn($languageServiceMock);
     }
 
@@ -47,11 +52,17 @@ class CleanerFieldProviderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     protected function getScheduleModuleControllerMock($mockedMethods = array())
     {
-        $languageServiceMock = $this->getMock(LanguageService::class, array('sL'), array(), '', false);
+        $languageServiceMock = $this->getMockBuilder(LanguageService::class)
+            ->setMethods(array('sL'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $languageServiceMock->expects($this->any())->method('sL')->will($this->returnValue('titleTest'));
 
         $mockedMethods = array_merge(array('getLanguageService'), $mockedMethods);
-        $scheduleModuleMock = $this->getMock(SchedulerModuleController::class, $mockedMethods, array(), '', false);
+        $scheduleModuleMock = $this->getMockBuilder(SchedulerModuleController::class)
+            ->setMethods($mockedMethods)
+            ->disableOriginalConstructor()
+            ->getMock();
         $scheduleModuleMock->expects($this->any())->method('getLanguageService')->willReturn($languageServiceMock);
 
         return $scheduleModuleMock;
@@ -145,7 +156,7 @@ class CleanerFieldProviderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
             'RecyclerCleanerTCA' => array('pages')
         );
 
-        $taskMock = $this->getMock(CleanerTask::class);
+        $taskMock = $this->getMockBuilder(CleanerTask::class)->getMock();
 
         $taskMock->expects($this->once())
             ->method('setTcaTables')
diff --git a/typo3/sysext/recycler/Tests/Unit/Task/CleanerTaskTest.php b/typo3/sysext/recycler/Tests/Unit/Task/CleanerTaskTest.php
index 3dfb434c56479aee81851f0d2f43e8699cc2d8f7..2ce0b6c3c05dc8d0c3c73b257eec3f697f8cad5c 100644
--- a/typo3/sysext/recycler/Tests/Unit/Task/CleanerTaskTest.php
+++ b/typo3/sysext/recycler/Tests/Unit/Task/CleanerTaskTest.php
@@ -39,7 +39,10 @@ class CleanerTaskTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     protected function setUp()
     {
-        $this->subject = $this->getMock(CleanerTask::class, array('dummy'), array(), '', false);
+        $this->subject = $this->getMockBuilder(CleanerTask::class)
+            ->setMethods(array('dummy'))
+            ->disableOriginalConstructor()
+            ->getMock();
     }
 
     /**
@@ -73,7 +76,10 @@ class CleanerTaskTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
         $GLOBALS['TCA']['pages']['ctrl']['tstamp'] = 'tstamp';
 
         /** @var \PHPUnit_Framework_MockObject_MockObject|CleanerTask $subject */
-        $subject = $this->getMock(CleanerTask::class, array('getPeriodAsTimestamp'), array(), '', false);
+        $subject = $this->getMockBuilder(CleanerTask::class)
+            ->setMethods(array('getPeriodAsTimestamp'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $subject->setTcaTables(['pages']);
         $subject->expects($this->once())->method('getPeriodAsTimestamp')->willReturn(400);
 
diff --git a/typo3/sysext/reports/Tests/Unit/Report/Status/Typo3StatusTest.php b/typo3/sysext/reports/Tests/Unit/Report/Status/Typo3StatusTest.php
index 6ef237d96b1e0d5837ad77cf852188bc6023ac35..cebf0796aedbf4702d37bb12df0bc105de721518 100644
--- a/typo3/sysext/reports/Tests/Unit/Report/Status/Typo3StatusTest.php
+++ b/typo3/sysext/reports/Tests/Unit/Report/Status/Typo3StatusTest.php
@@ -24,7 +24,7 @@ class Typo3StatusTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     protected function setUp()
     {
-        $GLOBALS['LANG'] = $this->getMock(\TYPO3\CMS\Lang\LanguageService::class, array(), array(), '', false);
+        $GLOBALS['LANG'] = $this->createMock(\TYPO3\CMS\Lang\LanguageService::class);
     }
 
     /**
diff --git a/typo3/sysext/saltedpasswords/Tests/Unit/Evaluation/EvaluatorTest.php b/typo3/sysext/saltedpasswords/Tests/Unit/Evaluation/EvaluatorTest.php
index 59841d7758ee76e35919ede089d429230c42e8d9..cbfce85eef1409d96200bc5e995997f4dcc2aa00 100644
--- a/typo3/sysext/saltedpasswords/Tests/Unit/Evaluation/EvaluatorTest.php
+++ b/typo3/sysext/saltedpasswords/Tests/Unit/Evaluation/EvaluatorTest.php
@@ -32,7 +32,9 @@ class EvaluatorTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     protected function setUp()
     {
-        $this->subject = $this->getMock(Evaluator::class, array('dummy'));
+        $this->subject = $this->getMockBuilder(Evaluator::class)
+            ->setMethods(array('dummy'))
+            ->getMock();
 
         // Make sure SaltedPasswordsUtility::isUsageEnabled() returns TRUE
         unset($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['saltedpasswords']);
diff --git a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/BlowfishSaltTest.php b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/BlowfishSaltTest.php
index e0878956faef81df59fde65ff47087f45406d6b8..30ae4b308db5ccec856e78176d934a9296609f46 100644
--- a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/BlowfishSaltTest.php
+++ b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/BlowfishSaltTest.php
@@ -36,7 +36,9 @@ class BlowfishSaltTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     protected function setUp()
     {
-        $this->objectInstance = $this->getMock(\TYPO3\CMS\Saltedpasswords\Salt\BlowfishSalt::class, array('dummy'));
+        $this->objectInstance = $this->getMockBuilder(\TYPO3\CMS\Saltedpasswords\Salt\BlowfishSalt::class)
+            ->setMethods(array('dummy'))
+            ->getMock();
     }
 
     /**
diff --git a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/Md5SaltTest.php b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/Md5SaltTest.php
index 7a76cf60c6129eeaded2130865f1144bb33fc2b3..200c7b9c6cacf9665003441127e76de0c02aada9 100644
--- a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/Md5SaltTest.php
+++ b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/Md5SaltTest.php
@@ -36,7 +36,9 @@ class Md5SaltTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     protected function setUp()
     {
-        $this->objectInstance = $this->getMock(\TYPO3\CMS\Saltedpasswords\Salt\Md5Salt::class, array('dummy'));
+        $this->objectInstance = $this->getMockBuilder(\TYPO3\CMS\Saltedpasswords\Salt\Md5Salt::class)
+            ->setMethods(array('dummy'))
+            ->getMock();
     }
 
     /**
diff --git a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/Pbkdf2SaltTest.php b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/Pbkdf2SaltTest.php
index e69c993ab49be90a263b26571e7a0e0ad619099e..4b1618423463b289094f0127b9cb36a4b0c52a4b 100644
--- a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/Pbkdf2SaltTest.php
+++ b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/Pbkdf2SaltTest.php
@@ -37,7 +37,9 @@ class Pbkdf2SaltTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     protected function setUp()
     {
-        $this->objectInstance = $this->getMock(Pbkdf2Salt::class, array('dummy'));
+        $this->objectInstance = $this->getMockBuilder(Pbkdf2Salt::class)
+            ->setMethods(array('dummy'))
+            ->getMock();
         // Speed up the tests by reducing the iteration count
         $this->objectInstance->setHashCount(1000);
     }
diff --git a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/PhpassSaltTest.php b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/PhpassSaltTest.php
index 06da5b524f3c52d24b44f446a03926d79b84d447..ae64e24bba256805dfc4da3d414023191ffb1778 100644
--- a/typo3/sysext/saltedpasswords/Tests/Unit/Salt/PhpassSaltTest.php
+++ b/typo3/sysext/saltedpasswords/Tests/Unit/Salt/PhpassSaltTest.php
@@ -36,7 +36,9 @@ class PhpassSaltTest extends \TYPO3\CMS\Core\Tests\UnitTestCase
      */
     protected function setUp()
     {
-        $this->objectInstance = $this->getMock(\TYPO3\CMS\Saltedpasswords\Salt\PhpassSalt::class, array('dummy'));
+        $this->objectInstance = $this->getMockBuilder(\TYPO3\CMS\Saltedpasswords\Salt\PhpassSalt::class)
+            ->setMethods(array('dummy'))
+            ->getMock();
     }
 
     /**
diff --git a/typo3/sysext/scheduler/Tests/Unit/Task/CachingFrameworkGarbageCollectionTest.php b/typo3/sysext/scheduler/Tests/Unit/Task/CachingFrameworkGarbageCollectionTest.php
index 4fc15a56860d1f8fb9227370385f05347bba8617..3908a3325b2afec70ed8ce2de4c6db5504522c80 100644
--- a/typo3/sysext/scheduler/Tests/Unit/Task/CachingFrameworkGarbageCollectionTest.php
+++ b/typo3/sysext/scheduler/Tests/Unit/Task/CachingFrameworkGarbageCollectionTest.php
@@ -48,7 +48,7 @@ class CachingFrameworkGarbageCollectionTest extends \TYPO3\CMS\Core\Tests\UnitTe
      */
     public function executeCallsCollectGarbageOfConfiguredBackend()
     {
-        $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class, array(), array(), '', false);
+        $cache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class);
         $cache->expects($this->any())->method('getIdentifier')->will($this->returnValue('cache'));
         $cache->expects($this->atLeastOnce())->method('collectGarbage');
         $mockCacheManager = new \TYPO3\CMS\Core\Cache\CacheManager();
@@ -61,7 +61,10 @@ class CachingFrameworkGarbageCollectionTest extends \TYPO3\CMS\Core\Tests\UnitTe
             )
         );
         /** @var \TYPO3\CMS\Scheduler\Task\CachingFrameworkGarbageCollectionTask|\PHPUnit_Framework_MockObject_MockObject $subject */
-        $subject = $this->getMock(\TYPO3\CMS\Scheduler\Task\CachingFrameworkGarbageCollectionTask::class, array('dummy'), array(), '', false);
+        $subject = $this->getMockBuilder(\TYPO3\CMS\Scheduler\Task\CachingFrameworkGarbageCollectionTask::class)
+            ->setMethods(array('dummy'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $subject->selectedBackends = array(\TYPO3\CMS\Core\Cache\Backend\AbstractBackend::class);
         $subject->execute();
     }
@@ -71,7 +74,7 @@ class CachingFrameworkGarbageCollectionTest extends \TYPO3\CMS\Core\Tests\UnitTe
      */
     public function executeDoesNotCallCollectGarbageOfNotConfiguredBackend()
     {
-        $cache = $this->getMock(\TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class, array(), array(), '', false);
+        $cache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\StringFrontend::class);
         $cache->expects($this->any())->method('getIdentifier')->will($this->returnValue('cache'));
         $cache->expects($this->never())->method('collectGarbage');
         $mockCacheManager = new \TYPO3\CMS\Core\Cache\CacheManager();
@@ -84,7 +87,10 @@ class CachingFrameworkGarbageCollectionTest extends \TYPO3\CMS\Core\Tests\UnitTe
             )
         );
         /** @var \TYPO3\CMS\Scheduler\Task\CachingFrameworkGarbageCollectionTask|\PHPUnit_Framework_MockObject_MockObject $subject */
-        $subject = $this->getMock(\TYPO3\CMS\Scheduler\Task\CachingFrameworkGarbageCollectionTask::class, array('dummy'), array(), '', false);
+        $subject = $this->getMockBuilder(\TYPO3\CMS\Scheduler\Task\CachingFrameworkGarbageCollectionTask::class)
+            ->setMethods(array('dummy'))
+            ->disableOriginalConstructor()
+            ->getMock();
         $subject->selectedBackends = array(\TYPO3\CMS\Core\Cache\Backend\NullBackend::class);
         $subject->execute();
     }