diff --git a/core/modules/toolbar/lib/Drupal/toolbar/Tests/ToolbarAdminMenuTest.php b/core/modules/toolbar/lib/Drupal/toolbar/Tests/ToolbarAdminMenuTest.php
index 11b2476..808f8af 100644
--- a/core/modules/toolbar/lib/Drupal/toolbar/Tests/ToolbarAdminMenuTest.php
+++ b/core/modules/toolbar/lib/Drupal/toolbar/Tests/ToolbarAdminMenuTest.php
@@ -100,14 +100,16 @@ function setUp() {
   }
 
   /**
-   * Tests the toolbar_modules_enabled() and toolbar_modules_disabled() hook
+   * Tests the toolbar_modules_installed() and toolbar_modules_uninstalled() hook
    * implementations.
    */
   function testModuleStatusChangeSubtreesHashCacheClear() {
-    // Disable a module.
+    // Uninstall a module.
     $edit = array();
-    $edit['modules[Core][taxonomy][enable]'] = FALSE;
-    $this->drupalPostForm('admin/modules', $edit, t('Save configuration'));
+    $edit['uninstall[taxonomy]'] = TRUE;
+    $this->drupalPostForm('admin/modules/uninstall', $edit, t('Uninstall'));
+    // Confirm the uninstall form.
+    $this->drupalPostForm(NULL, array(), t('Uninstall'));
     $this->rebuildContainer();
 
     // Assert that the subtrees hash has been altered because the subtrees
diff --git a/core/modules/toolbar/toolbar.module b/core/modules/toolbar/toolbar.module
index c9c9d7a..b20474b 100644
--- a/core/modules/toolbar/toolbar.module
+++ b/core/modules/toolbar/toolbar.module
@@ -638,16 +638,16 @@ function _toolbar_get_subtrees_hash() {
 }
 
 /**
- * Implements hook_modules_enabled().
+ * Implements hook_modules_installed().
  */
-function toolbar_modules_enabled($modules) {
+function toolbar_modules_installed($modules) {
   _toolbar_clear_user_cache();
 }
 
 /**
- * Implements hook_modules_disabled().
+ * Implements hook_modules_uninstalled().
  */
-function toolbar_modules_disabled($modules) {
+function toolbar_modules_uninstalled($modules) {
   _toolbar_clear_user_cache();
 }