diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Bundle.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Bundle.php
index 5a7d681..4796b68 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Bundle.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Bundle.php
@@ -52,7 +52,7 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o
    */
   public function get_value_options() {
     if (!isset($this->value_options)) {
-      $types = $this->entityInfo['bundles'];
+      $types = entity_get_bundles($this->entityType);
       $this->value_title = t('@entity types', array('@entity' => $this->entityInfo['label']));
 
       $options = array();
diff --git a/core/modules/views/lib/Drupal/views/Tests/Entity/FilterEntityBundleTest.php b/core/modules/views/lib/Drupal/views/Tests/Entity/FilterEntityBundleTest.php
index 031d601..29d55dd 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Entity/FilterEntityBundleTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Entity/FilterEntityBundleTest.php
@@ -36,6 +36,13 @@ class FilterEntityBundleTest extends ViewTestBase {
   protected $entityInfo;
 
   /**
+   * Entity bundle data.
+   *
+   * @var array
+   */
+  protected $entityBundles;
+
+  /**
    * An array of entities.
    *
    * @var array
@@ -56,11 +63,11 @@ public function setUp() {
     $this->drupalCreateContentType(array('type' => 'test_bundle'));
     $this->drupalCreateContentType(array('type' => 'test_bundle_2'));
 
-    $this->entityInfo = entity_get_info('node');
+    $this->entityBundles = entity_get_bundles('node');
 
     $this->entities['count'] = 0;
 
-    foreach ($this->entityInfo['bundles'] as $key => $info) {
+    foreach ($this->entityBundles as $key => $info) {
       for ($i = 0; $i < 5; $i++) {
         $entity = entity_create('node', array('label' => $this->randomName(), 'uid' => 1, 'type' => $key));
         $entity->save();
@@ -83,7 +90,7 @@ public function testFilterEntity() {
     // Test the value_options of the filter handler.
     $expected = array();
 
-    foreach ($this->entityInfo['bundles'] as $key => $info) {
+    foreach ($this->entityBundles as $key => $info) {
       $expected[$key] = $info['label'];
     }
     $this->assertIdentical($view->filter['type']->get_value_options(), $expected);
@@ -91,7 +98,7 @@ public function testFilterEntity() {
     $view->destroy();
 
     // Test each bundle type.
-    foreach ($this->entityInfo['bundles'] as $key => $info) {
+    foreach ($this->entityBundles as $key => $info) {
       // Test each bundle type.
       $view->initDisplay();
       $filters = $view->display_handler->getOption('filters');