diff --git a/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsEntityRow.php b/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsEntityRow.php
index cc1a173..5cfd839 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsEntityRow.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/Derivative/ViewsEntityRow.php
@@ -60,7 +60,7 @@ public function getDerivativeDefinitions(array $base_plugin_definition) {
       // Just add support for entity types which have a views integration.
       if (isset($entity_info['base_table']) && $this->viewsData->get($entity_info['base_table'])) {
         $this->derivatives[$entity_type] = array(
-          'id' => 'entity_row',
+          'id' => 'entity:' . $entity_type,
           'module' => 'views',
           'title' => $entity_info['label'],
           'help' => t('Display the @label', array('@label' => $entity_info['label'])),
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_entity_row.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_entity_row.yml
index 2ddc0ec..3ee0097 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_entity_row.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_entity_row.yml
@@ -1,8 +1,7 @@
-api_version: '3.0'
 base_table: taxonomy_term_data
 core: '8'
 description: ''
-disabled: '0'
+status: '1'
 display:
   default:
     display_options:
@@ -32,5 +31,5 @@ display:
     id: default
     position: '0'
 human_name: ''
-name: test_entity_row
+id: test_entity_row
 tag: ''