diff --git a/core/modules/user/tests/Drupal/Tests/user/Views/Argument/RolesRidTest.php b/core/modules/user/tests/Drupal/Tests/user/Views/Argument/RolesRidTest.php
index 95a6478..105b76e 100644
--- a/core/modules/user/tests/Drupal/Tests/user/Views/Argument/RolesRidTest.php
+++ b/core/modules/user/tests/Drupal/Tests/user/Views/Argument/RolesRidTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\Tests\user\Views\Argument;
 
 use Drupal\Component\Utility\String;
+use Drupal\Component\Uuid\Php;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Tests\UnitTestCase;
 use Drupal\user\Plugin\views\argument\RolesRid;
@@ -60,7 +61,7 @@ public function testTitleQuery() {
     $config_factory = $this->getConfigFactoryStub($config);
     $config_storage = $this->getConfigStorageStub($config);
 
-    $uuid = $this->getMock('Drupal\Component\Uuid\Php');
+    $uuid = new Php();
 
     // Creates a stub role storage controller and replace the attachLoad()
     // method with an empty version, because attachLoad() calls
diff --git a/core/tests/Drupal/Tests/Component/Uuid/UuidTest.php b/core/tests/Drupal/Tests/Component/Uuid/UuidTest.php
index 3cfed16..99637cc 100644
--- a/core/tests/Drupal/Tests/Component/Uuid/UuidTest.php
+++ b/core/tests/Drupal/Tests/Component/Uuid/UuidTest.php
@@ -22,7 +22,6 @@ class UuidTest extends UnitTestCase {
    */
   protected $uuidInstances = array();
 
-
   public static function getInfo() {
     return array(
       'name' => 'UUID handling',