diff --git a/core/modules/views/tests/src/Unit/EntityViewsDataTest.php b/core/modules/views/tests/src/Unit/EntityViewsDataTest.php
index b03a2c6..6a8082a 100644
--- a/core/modules/views/tests/src/Unit/EntityViewsDataTest.php
+++ b/core/modules/views/tests/src/Unit/EntityViewsDataTest.php
@@ -10,6 +10,7 @@
 use Drupal\Component\Plugin\PluginManagerInterface;
 use Drupal\Core\Config\Entity\ConfigEntityType;
 use Drupal\Core\Entity\ContentEntityType;
+use Drupal\Core\Entity\EntityFieldManagerInterface;
 use Drupal\Core\Entity\EntityType;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Entity\Sql\DefaultTableMapping;
@@ -30,6 +31,7 @@
 use Drupal\views\EntityViewsData;
 use Drupal\views\Plugin\views\FieldTypeViewsData\Boolean;
 use Drupal\views\Plugin\views\FieldTypeViewsData\EntityReference;
+use Drupal\views\Plugin\views\FieldTypeViewsData\Uuid;
 use Prophecy\Argument;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
@@ -135,10 +137,19 @@ protected function setUp() {
    * @return \Drupal\Component\Plugin\PluginManagerInterface
    */
   protected function setupFieldTypeViewsData(EntityTypeManagerInterface $entity_type_manager) {
+    $entity_field_manager = $this->prophesize(EntityFieldManagerInterface::class);
     $field_type_views_data_manager = $this->prophesize(PluginManagerInterface::class);
-    $field_type_views_data_manager->createInstance('boolean')->willReturn(new Boolean());
-    $field_type_views_data_manager->createInstance('entity_reference')->willReturn(new EntityReference($entity_type_manager));
+    $field_type_views_data_manager->createInstance('boolean')->willReturn(new Boolean([], 'boolean', []));
+    $field_type_views_data_manager->createInstance('uuid')->willReturn(new Uuid([], 'uuid', []));
+    $field_type_views_data_manager->createInstance('entity_reference')->willReturn(new EntityReference([], 'entity_reference', [], $entity_type_manager, $entity_field_manager->reveal()));
     $field_type_views_data_manager->createInstance(Argument::any())->willReturn(NULL);
+    $field_type_views_data_manager->hasDefinition('integer')->willReturn(TRUE);
+    $field_type_views_data_manager->hasDefinition('uuid')->willReturn(TRUE);
+    $field_type_views_data_manager->hasDefinition('entity_reference')->willReturn(TRUE);
+    $field_type_views_data_manager->hasDefinition('language')->willReturn(TRUE);
+    $field_type_views_data_manager->hasDefinition('string')->willReturn(TRUE);
+    $field_type_views_data_manager->hasDefinition('text_long')->willReturn(TRUE);
+    $field_type_views_data_manager->hasDefinition('uri')->willReturn(TRUE);
     return $field_type_views_data_manager->reveal();
   }
 
@@ -1016,7 +1027,7 @@ protected function assertLongTextField($data, $field_name) {
    */
   protected function assertUuidField($data) {
     // @todo Can we provide additional support for UUIDs in views?
-    $this->assertEquals('field', $data['field']['id']);
+    $this->assertEquals('uuid', $data['id']);
     $this->assertFalse($data['field']['click sortable']);
     $this->assertEquals('string', $data['filter']['id']);
     $this->assertEquals('string', $data['argument']['id']);