diff --git a/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php b/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php
index f234072..106ac64 100644
--- a/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php
+++ b/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php
@@ -333,9 +333,9 @@ public function testBlockContextualLinks() {
   }
 
   /**
-   * Test menu link bundles.
+   * Tests menu link bundles.
    */
-  function testMenuBundles() {
+  public function testMenuBundles() {
     $this->drupalLogin($this->big_user);
     $menu = $this->addCustomMenu();
     $bundles = entity_get_bundles('menu_link');
diff --git a/core/modules/menu/menu.module b/core/modules/menu/menu.module
index 219fa67..728eab8 100644
--- a/core/modules/menu/menu.module
+++ b/core/modules/menu/menu.module
@@ -163,8 +163,7 @@ function menu_entity_info_alter(&$entity_info) {
  */
 function menu_entity_bundle_info() {
   $bundles = array();
-  $info = Drupal::entityManager()->getDefinition('menu');
-  $config_names = config_get_storage_names_with_prefix($info['config_prefix'] . '.');
+  $config_names = config_get_storage_names_with_prefix('menu.menu.');
   foreach ($config_names as $config_name) {
     $config = config($config_name);
     $bundles['menu_link'][$config->get('id')] = array(