diff --git a/features/plugin-activate.feature b/features/plugin-activate.feature
index ed3345534..f36128aa9 100644
--- a/features/plugin-activate.feature
+++ b/features/plugin-activate.feature
@@ -35,18 +35,18 @@ Feature: Activate WordPress plugins
     And the return code should be 1
 
   Scenario: Activate all when one plugin is hidden by "all_plugins" filter
-    Given I run `wp plugin install query-monitor`
-    And a wp-content/mu-plugins/hide-qm-plugin.php file:
+    Given I run `wp plugin install user-switching`
+    And a wp-content/mu-plugins/hide-us-plugin.php file:
       """
       <?php
       /**
-       * Plugin Name: Hide Query Monitor on Production
-       * Description: Hides the Query Monitor plugin on production sites
+       * Plugin Name: Hide User Switching on Production
+       * Description: Hides the User Switching plugin on production sites
        * Author: WP-CLI tests
        */
 
        add_filter( 'all_plugins', function( $all_plugins ) {
-          unset( $all_plugins['query-monitor/query-monitor.php'] );
+          unset( $all_plugins['user-switching/user-switching.php'] );
           return $all_plugins;
        } );
        """
@@ -59,7 +59,7 @@ Feature: Activate WordPress plugins
       """
     And STDOUT should not contain:
       """
-      Plugin 'query-monitor' activated.
+      Plugin 'user-switching' activated.
       """
 
   Scenario: Not giving a slug on activate should throw an error unless --all given
diff --git a/features/plugin-update.feature b/features/plugin-update.feature
index 177667eb6..398629bb9 100644
--- a/features/plugin-update.feature
+++ b/features/plugin-update.feature
@@ -236,6 +236,7 @@ Feature: Update WordPress plugins
   @require-wp-5.2
   Scenario: Updating all plugins with some of them having an invalid version shouldn't report an error
     Given a WP install
+    And I run `wp plugin delete akismet`
 
     When I run `wp plugin install health-check --version=1.5.0`
     Then STDOUT should not be empty
diff --git a/features/plugin.feature b/features/plugin.feature
index 074c9c7d0..3d3bd0015 100644
--- a/features/plugin.feature
+++ b/features/plugin.feature
@@ -572,19 +572,19 @@ Feature: Manage WordPress plugins
       """
       akismet
       jetpack
-      query-monitor
+      user-switching
       """
-    And a wp-content/mu-plugins/hide-qm-plugin.php file:
+    And a wp-content/mu-plugins/hide-us-plugin.php file:
       """
       <?php
       /**
-       * Plugin Name: Hide Query Monitor on Production
-       * Description: Hides the Query Monitor plugin on production sites
+       * Plugin Name: Hide User Switchign on Production
+       * Description: Hides the User Switching plugin on production sites
        * Author: WP-CLI tests
        */
 
        add_filter( 'all_plugins', function( $all_plugins ) {
-          unset( $all_plugins['query-monitor/query-monitor.php'] );
+          unset( $all_plugins['user-switching/user-switching.php'] );
           return $all_plugins;
        } );
        """
@@ -592,7 +592,7 @@ Feature: Manage WordPress plugins
     When I run `wp plugin list --fields=name`
     Then STDOUT should not contain:
       """
-      query-monitor
+      user-switching
       """
 
   Scenario: Show dropins plugin list