diff --git a/features/plugin-update.feature b/features/plugin-update.feature
index 56a858ad..546f990b 100644
--- a/features/plugin-update.feature
+++ b/features/plugin-update.feature
@@ -95,7 +95,8 @@ Feature: Update WordPress plugins
       0.5.2
       """
 
-  @require-wp-4.0
+  # Akismet currently requires WordPress 5.8
+  @require-wp-5.8
   Scenario: Update a plugin to its latest minor release
     Given a WP install
     And I run `wp plugin install --force akismet --version=2.5.4`
@@ -196,7 +197,8 @@ Feature: Update WordPress plugins
       Error: Can't find the requested plugin's version 2.5.4 in the WordPress.org plugin repository (HTTP code 404).
       """
 
-  @require-wp-4.7
+  # Akismet currently requires WordPress 5.8
+  @require-wp-5.8
   Scenario: Plugin updates that error should not report a success
     Given a WP install
     And I run `wp plugin install --force akismet --version=4.0`
@@ -223,6 +225,8 @@ Feature: Update WordPress plugins
       Success:
       """
 
+  # Akismet currently requires WordPress 5.8, so there's a warning because of it.
+  @require-wp-5.8
   Scenario: Excluding a missing plugin should not throw an error
     Given a WP install
     And I run `wp plugin update --all --exclude=missing-plugin`
diff --git a/features/plugin.feature b/features/plugin.feature
index 21041ec2..a0401d65 100644
--- a/features/plugin.feature
+++ b/features/plugin.feature
@@ -61,7 +61,7 @@ Feature: Manage WordPress plugins
     When I run `wp plugin status`
     Then STDOUT should not be empty
 
-    When I run `wp plugin list`
+    When I run `wp plugin list --fields=name,status,update,version,update_version,auto_update`
     Then STDOUT should be a table containing rows:
       | name       | status | update | version | update_version | auto_update |
       | Zombieland | active | none   | 0.1.0   |                | off         |
@@ -107,7 +107,8 @@ Feature: Manage WordPress plugins
     And STDOUT should be empty
     And the return code should be 1
 
-  @require-wp-4.0
+  # WordPress Importer currently requires at least WP 5.2.
+  @require-wp-5.2
   Scenario: Install a plugin, activate, then force install an older version of the plugin
     Given a WP install
 
@@ -579,12 +580,13 @@ Feature: Manage WordPress plugins
       """
     And the return code should be 0
 
-  @require-wp-4.7
+  # Akismet currently requires WordPress 5.8, so there's a warning because of it.
+  @require-wp-5.8
   Scenario: Plugin hidden by "all_plugins" filter
     Given a WP install
     And these installed and active plugins:
       """
-      akismet
+      hello-dolly
       site-secrets
       """
     And a wp-content/mu-plugins/hide-us-plugin.php file:
@@ -753,7 +755,7 @@ Feature: Manage WordPress plugins
       """
     And I run `wp plugin activate foo`
 
-    When I run `wp plugin list`
+    When I run `wp plugin list --fields=name,status,update,version,update_version,auto_update`
     Then STDOUT should be a table containing rows:
       | name       | status   | update  | version  | update_version | auto_update |
       | foo        | active   | none    |          |                | off         |
@@ -795,7 +797,7 @@ Feature: Manage WordPress plugins
       """
     And I run `wp plugin activate foo`
 
-    When I run `wp plugin list`
+    When I run `wp plugin list --fields=name,status,update,version,update_version,auto_update`
     Then STDOUT should be a table containing rows:
       | name       | status   | update  | version  | update_version | auto_update |
       | foo        | active   | none    |          |                | off         |
diff --git a/features/upgradables.feature b/features/upgradables.feature
index dee3a627..20b8459f 100644
--- a/features/upgradables.feature
+++ b/features/upgradables.feature
@@ -6,6 +6,8 @@ Feature: Manage WordPress themes and plugins
   @require-wp-4.5
   Scenario Outline: Installing, upgrading and deleting a theme or plugin
     Given a WP install
+    # Akismet ships with WordPress but does not work with older versions we test
+    And I run `wp plugin delete akismet`
     And I run `wp <type> path`
     And save STDOUT as {CONTENT_DIR}
 
@@ -209,5 +211,5 @@ Feature: Manage WordPress themes and plugins
 
     Examples:
       | type   | type_name | item                    | item_title              | version | zip_file                                                               | file_to_check                                                     |
-      | theme  | Theme     | moina                      | Moina                      | 1.1.2   | https://wordpress.org/themes/download/moina.1.1.2.zip                     | {CONTENT_DIR}/moina/style.css                                        |
+      | theme  | Theme     | moina                   | Moina                   | 1.1.2   | https://wordpress.org/themes/download/moina.1.1.2.zip                  | {CONTENT_DIR}/moina/style.css                                     |
       | plugin | Plugin    | category-checklist-tree | Category Checklist Tree | 1.2     | https://downloads.wordpress.org/plugin/category-checklist-tree.1.2.zip | {CONTENT_DIR}/category-checklist-tree/category-checklist-tree.php |
diff --git a/src/Plugin_Command.php b/src/Plugin_Command.php
index 58ceaec7..88fbb051 100644
--- a/src/Plugin_Command.php
+++ b/src/Plugin_Command.php
@@ -1255,6 +1255,7 @@ public function uninstall( $args, $assoc_args = array() ) {
 
 			foreach ( $deleted as $plugin_file ) {
 				unset( $current->response[ $plugin_file ] );
+				unset( $current->checked[ $plugin_file ] );
 			}
 
 			set_site_transient( $this->upgrade_transient, $current );