diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/ModuleApiTest.php b/core/modules/system/lib/Drupal/system/Tests/Module/ModuleApiTest.php
index 3de02ce..6131fb8 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Module/ModuleApiTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Module/ModuleApiTest.php
@@ -137,6 +137,24 @@ function testModuleInvokeAll() {
   }
 
   /**
+   * Test that getHookInfo() always finds available hooks.
+   */
+  function testGetHookInfo() {
+    $handler = \Drupal::service('module_handler');
+    // Populate hook info for first time.
+    $hook_info = $handler->getHookInfo();
+    $this->assertFalse(array_key_exists('test_hook', $hook_info));
+
+    $module_list = $handler->getModuleList();
+    $module_list += array('module_test' => 'core/modules/system/tests/modules/module_test/module_test.module');
+    $handler->setModuleList($module_list);
+
+    // The new generated hookInfo should have our test module hook.
+    $hook_info = $handler->getHookInfo();
+    $this->assertTrue(array_key_exists('test_hook', $hook_info));
+  }
+
+  /**
    * Test that a menu item load function can invoke hooks defined in hook_hook_info().
    *
    * We test this separately from testModuleInvokeAll(), because menu item load