diff --git a/eZ/Publish/Core/Repository/Tests/Service/Mock/DomainMapperTest.php b/eZ/Publish/Core/Repository/Tests/Service/Mock/DomainMapperTest.php
index c44629f3641..77efa31ab63 100644
--- a/eZ/Publish/Core/Repository/Tests/Service/Mock/DomainMapperTest.php
+++ b/eZ/Publish/Core/Repository/Tests/Service/Mock/DomainMapperTest.php
@@ -33,7 +33,7 @@ public function testBuildVersionInfo(SPIVersionInfo $spiVersionInfo, array $lang
         $languageHandlerMock->expects($this->never())->method('load');
 
         $versionInfo = $this->getDomainMapper()->buildVersionInfoDomainObject($spiVersionInfo);
-        $this->assertInstanceOf('eZ\\Publish\\Core\\Repository\\Values\\Content\\VersionInfo', $versionInfo);
+        $this->assertInstanceOf(APIVersionInfo::class, $versionInfo);
 
         foreach ($expected as $expectedProperty => $expectedValue) {
             $this->assertAttributeSame(
diff --git a/eZ/Publish/Core/Repository/Tests/Service/Mock/NameSchemaTest.php b/eZ/Publish/Core/Repository/Tests/Service/Mock/NameSchemaTest.php
index 0a8f237d133..ed30412989a 100644
--- a/eZ/Publish/Core/Repository/Tests/Service/Mock/NameSchemaTest.php
+++ b/eZ/Publish/Core/Repository/Tests/Service/Mock/NameSchemaTest.php
@@ -12,6 +12,7 @@
 use eZ\Publish\Core\Repository\Tests\Service\Mock\Base as BaseServiceMockTest;
 use eZ\Publish\Core\Repository\Values\Content\Content;
 use eZ\Publish\Core\Repository\Values\Content\VersionInfo;
+use eZ\Publish\Core\Repository\Helper\ContentTypeDomainMapper;
 use eZ\Publish\Core\Repository\Values\ContentType\ContentType;
 use eZ\Publish\Core\Repository\Values\ContentType\FieldDefinition;
 use eZ\Publish\API\Repository\Values\Content\Field;
@@ -402,10 +403,7 @@ protected function getPartlyMockedNameSchemaService(array $methods = null, array
     protected function getContentTypeDomainMapperMock()
     {
         if (!isset($this->contentTypeDomainMapperMock)) {
-            $this->contentTypeDomainMapperMock = $this
-                ->getMockBuilder('eZ\\Publish\\Core\\Repository\\Helper\\ContentTypeDomainMapper')
-                ->disableOriginalConstructor()
-                ->getMock();
+            $this->contentTypeDomainMapperMock = $this->createMock(ContentTypeDomainMapper::class);
         }
 
         return $this->contentTypeDomainMapperMock;
diff --git a/eZ/Publish/Core/Repository/Tests/Service/Mock/PermissionsCriterionHandlerTest.php b/eZ/Publish/Core/Repository/Tests/Service/Mock/PermissionsCriterionHandlerTest.php
index 23c633f333c..5d51f95eb4b 100644
--- a/eZ/Publish/Core/Repository/Tests/Service/Mock/PermissionsCriterionHandlerTest.php
+++ b/eZ/Publish/Core/Repository/Tests/Service/Mock/PermissionsCriterionHandlerTest.php
@@ -9,8 +9,12 @@
 namespace eZ\Publish\Core\Repository\Tests\Service\Mock;
 
 use eZ\Publish\Core\Repository\Tests\Service\Mock\Base as BaseServiceMockTest;
+use eZ\Publish\Core\Repository\PermissionsCriterionHandler;
 use eZ\Publish\API\Repository\Values\Content\Query\Criterion;
+use eZ\Publish\API\Repository\PermissionResolver;
+use eZ\Publish\API\Repository\Values\User\Limitation as APILimitation;
 use eZ\Publish\Core\Repository\Values\User\Policy;
+use eZ\Publish\Core\Repository\Helper\LimitationService;
 
 /**
  * Mock test case for PermissionCriterionHandler.
@@ -56,10 +60,7 @@ public function providerForTestAddPermissionsCriterionWithBooleanPermission()
     public function testAddPermissionsCriterionWithBooleanPermission($permissionsCriterion)
     {
         $handler = $this->getPermissionsCriterionHandlerMock(array('getPermissionsCriterion'));
-        $criterionMock = $this
-            ->getMockBuilder('eZ\\Publish\\API\\Repository\\Values\\Content\\Query\\Criterion')
-            ->disableOriginalConstructor()
-            ->getMock();
+        $criterionMock = $this->createMock(Criterion::class);
 
         $handler
             ->expects($this->once())
@@ -74,10 +75,7 @@ public function testAddPermissionsCriterionWithBooleanPermission($permissionsCri
 
     public function providerForTestAddPermissionsCriterion()
     {
-        $criterionMock = $this
-            ->getMockBuilder('eZ\\Publish\\API\\Repository\\Values\\Content\\Query\\Criterion')
-            ->disableOriginalConstructor()
-            ->getMock();
+        $criterionMock = $this->createMock(Criterion::class);
 
         return array(
             array(
@@ -115,12 +113,9 @@ public function testAddPermissionsCriterion($permissionsCriterionMock, $givenCri
 
     public function providerForTestGetPermissionsCriterion()
     {
-        $criterionMock = $this
-            ->getMockBuilder('eZ\\Publish\\API\\Repository\\Values\\Content\\Query\\Criterion')
-            ->disableOriginalConstructor()
-            ->getMock();
+        $criterionMock = $this->createMock(Criterion::class);
         $limitationMock = $this
-            ->getMockBuilder('eZ\\Publish\\API\\Repository\\Values\\User\\Limitation')
+            ->getMockBuilder(APILimitation::class)
             ->getMockForAbstractClass();
         $limitationMock
             ->expects($this->any())
@@ -328,7 +323,7 @@ protected function mockServices($criterionMock, $limitationCount, $permissionSet
             ->expects($this->any())
             ->method('getCriterion')
             ->with(
-                $this->isInstanceOf('eZ\\Publish\\API\\Repository\\Values\\User\\Limitation'),
+                $this->isInstanceOf(APILimitation::class),
                 $this->equalTo($userMock)
             )
             ->will($this->returnValue($criterionMock));
@@ -408,7 +403,7 @@ public function testGetPermissionsCriterionBooleanPermissionSets($permissionSets
     protected function getPermissionsCriterionHandlerMock($methods = [])
     {
         return $this
-            ->getMockBuilder('eZ\\Publish\\Core\\Repository\\PermissionsCriterionHandler')
+            ->getMockBuilder(PermissionsCriterionHandler::class)
             ->setMethods($methods)
             ->setConstructorArgs(
                 [
@@ -425,7 +420,7 @@ protected function getPermissionResolverMock($methods = [])
     {
         if ($this->permissionResolverMock === null) {
             $this->permissionResolverMock = $this
-                ->getMockBuilder('eZ\Publish\API\Repository\PermissionResolver')
+                ->getMockBuilder(PermissionResolver::class)
                 ->setMethods($methods)
                 ->disableOriginalConstructor()
                 ->getMockForAbstractClass();
@@ -440,7 +435,7 @@ protected function getLimitationServiceMock($methods = [])
     {
         if ($this->limitationServiceMock === null) {
             $this->limitationServiceMock = $this
-                ->getMockBuilder('eZ\Publish\Core\Repository\Helper\LimitationService')
+                ->getMockBuilder(LimitationService::class)
                 ->setMethods($methods)
                 ->disableOriginalConstructor()
                 ->getMock();
diff --git a/eZ/Publish/Core/Repository/Tests/Service/Mock/UserTest.php b/eZ/Publish/Core/Repository/Tests/Service/Mock/UserTest.php
index d495edb9c75..4cbe60f0e06 100644
--- a/eZ/Publish/Core/Repository/Tests/Service/Mock/UserTest.php
+++ b/eZ/Publish/Core/Repository/Tests/Service/Mock/UserTest.php
@@ -8,7 +8,12 @@
  */
 namespace eZ\Publish\Core\Repository\Tests\Service\Mock;
 
+use eZ\Publish\API\Repository\Values\User\User as APIUser;
+use eZ\Publish\API\Repository\Values\Content\ContentInfo as APIContentInfo;
+use eZ\Publish\API\Repository\Values\Content\VersionInfo as APIVersionInfo;
+use eZ\Publish\API\Repository\ContentService as APIContentService;
 use eZ\Publish\Core\Repository\Tests\Service\Mock\Base as BaseServiceMockTest;
+use eZ\Publish\Core\Repository\UserService;
 
 /**
  * Mock test case for User Service.
@@ -24,13 +29,13 @@ public function testDeleteUser()
     {
         $repository = $this->getRepositoryMock();
         $userService = $this->getPartlyMockedUserService(array('loadUser'));
-        $contentService = $this->createMock('eZ\\Publish\\API\\Repository\\ContentService');
+        $contentService = $this->createMock(APIContentService::class);
         $userHandler = $this->getPersistenceMock()->userHandler();
 
-        $user = $this->createMock('eZ\\Publish\\API\\Repository\\Values\\User\\User');
-        $loadedUser = $this->createMock('eZ\\Publish\\API\\Repository\\Values\\User\\User');
-        $versionInfo = $this->createMock('eZ\\Publish\\API\\Repository\\Values\\Content\\VersionInfo');
-        $contentInfo = $this->createMock('eZ\\Publish\\API\\Repository\\Values\\Content\\ContentInfo');
+        $user = $this->createMock(APIUser::class);
+        $loadedUser = $this->createMock(APIUser::class);
+        $versionInfo = $this->createMock(APIVersionInfo::class);
+        $contentInfo = $this->createMock(APIContentInfo::class);
 
         $user->expects($this->once())
             ->method('__get')
@@ -86,12 +91,12 @@ public function testDeleteUserWithRollback()
     {
         $repository = $this->getRepositoryMock();
         $userService = $this->getPartlyMockedUserService(array('loadUser'));
-        $contentService = $this->createMock('eZ\\Publish\\API\\Repository\\ContentService');
+        $contentService = $this->createMock(APIContentService::class);
 
-        $user = $this->createMock('eZ\\Publish\\API\\Repository\\Values\\User\\User');
-        $loadedUser = $this->createMock('eZ\\Publish\\API\\Repository\\Values\\User\\User');
-        $versionInfo = $this->createMock('eZ\\Publish\\API\\Repository\\Values\\Content\\VersionInfo');
-        $contentInfo = $this->createMock('eZ\\Publish\\API\\Repository\\Values\\Content\\ContentInfo');
+        $user = $this->createMock(APIUser::class);
+        $loadedUser = $this->createMock(APIUser::class);
+        $versionInfo = $this->createMock(APIVersionInfo::class);
+        $contentInfo = $this->createMock(APIContentInfo::class);
 
         $user->expects($this->once())
             ->method('__get')
@@ -139,7 +144,7 @@ public function testDeleteUserWithRollback()
      */
     protected function getPartlyMockedUserService(array $methods = null)
     {
-        return $this->getMockBuilder('eZ\\Publish\\Core\\Repository\\UserService')
+        return $this->getMockBuilder(UserService::class)
             ->setMethods($methods)
             ->setConstructorArgs(
                 array(