diff --git a/composer.json b/composer.json
index 1b38710a..3d7a6422 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
         "wp-cli/db-command": "^1.3 || ^2 || ^3",
         "wp-cli/entity-command": "^1.3 || ^2 || ^3",
         "wp-cli/extension-command": "^1.2 || ^2 || ^3",
-        "wp-cli/wp-cli-tests": "^5"
+        "wp-cli/wp-cli-tests": "dev-cached-extension-installs as 5.3.99"
     },
     "config": {
         "process-timeout": 7200,
diff --git a/features/core-check-update-db.feature b/features/core-check-update-db.feature
index 918cdefd..17dcb5d0 100644
--- a/features/core-check-update-db.feature
+++ b/features/core-check-update-db.feature
@@ -14,7 +14,10 @@ Feature: Check if WordPress database update is needed
           }
       );
       """
-    And I try `wp theme install twentytwenty --activate`
+    And these installed and active themes:
+      """
+      twentytwenty
+      """
     And I run `wp core download --version=5.4 --force`
     And I run `wp option update db_version 45805 --require=disable_sidebar_check.php`
 
@@ -59,7 +62,10 @@ Feature: Check if WordPress database update is needed
           }
       );
       """
-    And I try `wp theme install twentytwenty --activate`
+    And these installed and active themes:
+      """
+      twentytwenty
+      """
     And I run `wp core download --version=6.6 --force`
     And I run `wp option update db_version 57155 --require=disable_sidebar_check.php`
     And I run `wp site option update wpmu_upgrade_site 57155`
diff --git a/features/core-check-update.feature b/features/core-check-update.feature
index 7566cff0..8fc78d3c 100644
--- a/features/core-check-update.feature
+++ b/features/core-check-update.feature
@@ -4,7 +4,10 @@ Feature: Check for more recent versions
   @require-mysql
   Scenario: Check for update via Version Check API
     Given a WP install
-    And I try `wp theme install twentytwenty --activate`
+    And these installed and active themes:
+      """
+      twentytwenty
+      """
 
     When I run `wp core download --version=5.8 --force`
     Then STDOUT should not be empty
diff --git a/features/core-update-db.feature b/features/core-update-db.feature
index 9df19053..3ec5ee17 100644
--- a/features/core-update-db.feature
+++ b/features/core-update-db.feature
@@ -14,7 +14,10 @@ Feature: Update core's database
           }
       );
       """
-    And I try `wp theme install twentytwenty --activate`
+    And these installed and active themes:
+      """
+      twentytwenty
+      """
     And I run `wp core download --version=5.4 --force`
     And I run `wp option update db_version 45805 --require=disable_sidebar_check.php`
 
@@ -44,7 +47,10 @@ Feature: Update core's database
           }
       );
       """
-    And I try `wp theme install twentytwenty --activate`
+    And these installed and active themes:
+      """
+      twentytwenty
+      """
     And I run `wp core download --version=5.4 --force`
     And I run `wp option update db_version 45805 --require=disable_sidebar_check.php`
 
@@ -75,7 +81,10 @@ Feature: Update core's database
           }
       );
       """
-    And I try `wp theme install twentytwenty --activate`
+    And these installed and active themes:
+      """
+      twentytwenty
+      """
     And I run `wp core download --version=5.4 --force`
     And I run `wp option update db_version 45805 --require=disable_sidebar_check.php`
     And I run `wp site option update wpmu_upgrade_site 45805`
@@ -120,7 +129,10 @@ Feature: Update core's database
           }
       );
       """
-    And I try `wp theme install twentytwenty --activate`
+    And these installed and active themes:
+      """
+      twentytwenty
+      """
     And I run `wp core download --version=5.4 --force`
     And I run `wp option update db_version 45805 --require=disable_sidebar_check.php`
     And I run `wp site option update wpmu_upgrade_site 45805`
@@ -177,7 +189,10 @@ Feature: Update core's database
           }
       );
       """
-    And I try `wp theme install twentytwenty --activate`
+    And these installed and active themes:
+      """
+      twentytwenty
+      """
     And I run `wp core download --version=5.4 --force`
     And I run `wp option update db_version 45805 --require=disable_sidebar_check.php`
     And I run `wp site option update wpmu_upgrade_site 45805`
diff --git a/features/core-update.feature b/features/core-update.feature
index 4fcc2446..288e6fae 100644
--- a/features/core-update.feature
+++ b/features/core-update.feature
@@ -4,7 +4,10 @@ Feature: Update WordPress core
   @require-mysql
   Scenario: Update from a ZIP file
     Given a WP install
-    And I try `wp theme install twentytwenty --activate`
+    And these installed and active themes:
+      """
+      twentytwenty
+      """
 
     When I run `wp core download --version=6.2 --force`
     Then STDOUT should not be empty
@@ -35,7 +38,10 @@ Feature: Update WordPress core
   @require-php-7.0
   Scenario: Output in JSON format
     Given a WP install
-    And I try `wp theme install twentytwenty --activate`
+    And these installed and active themes:
+      """
+      twentytwenty
+      """
 
     When I run `wp core download --version=6.6 --force`
     Then STDOUT should not be empty
@@ -56,7 +62,10 @@ Feature: Update WordPress core
   @require-php-7.0
   Scenario: Output in CSV format
     Given a WP install
-    And I try `wp theme install twentytwenty --activate`
+    And these installed and active themes:
+      """
+      twentytwenty
+      """
 
     When I run `wp core download --version=6.6 --force`
     Then STDOUT should not be empty
@@ -78,7 +87,10 @@ Feature: Update WordPress core
   @require-php-7.0
   Scenario: Output in table format
     Given a WP install
-    And I try `wp theme install twentytwenty --activate`
+    And these installed and active themes:
+      """
+      twentytwenty
+      """
 
     When I run `wp core download --version=6.6 --force`
     Then STDOUT should not be empty
@@ -99,7 +111,10 @@ Feature: Update WordPress core
   @require-mysql
   Scenario: Update to the latest minor release (PHP 7.2 compatible with WP >= 4.9)
     Given a WP install
-    And I try `wp theme install twentytwenty --activate`
+    And these installed and active themes:
+      """
+      twentytwenty
+      """
 
     When I run `wp core download --version=6.2.5 --force`
     Then STDOUT should contain:
@@ -135,7 +150,10 @@ Feature: Update WordPress core
   @require-mysql
   Scenario: Core update from cache
     Given a WP install
-    And I try `wp theme install twentytwenty --activate`
+    And these installed and active themes:
+      """
+      twentytwenty
+      """
     And an empty cache
 
     When I run `wp core update --version=6.2.5 --force`
@@ -184,7 +202,10 @@ Feature: Update WordPress core
 
   Scenario: Ensure cached partial upgrades aren't used in full upgrade
     Given a WP install
-    And I try `wp theme install twentytwenty --activate`
+    And these installed and active themes:
+      """
+      twentytwenty
+      """
     And an empty cache
     And a wp-content/mu-plugins/upgrade-override.php file:
       """
@@ -259,7 +280,10 @@ Feature: Update WordPress core
   @less-than-php-7.3 @require-mysql
   Scenario: Make sure files are cleaned up
     Given a WP install
-    And I try `wp theme install twentytwenty --activate`
+    And these installed and active themes:
+      """
+      twentytwenty
+      """
 
     When I run `wp core update --version=4.4 --force`
     Then the wp-includes/rest-api.php file should exist
@@ -296,7 +320,10 @@ Feature: Update WordPress core
   @require-mysql
   Scenario: Make sure files are cleaned up with mixed case
     Given a WP install
-    And I try `wp theme install twentytwenty --activate`
+    And these installed and active themes:
+      """
+      twentytwenty
+      """
 
     When I run `wp core update --version=5.8 --force`
     Then the wp-includes/Requests/Transport/cURL.php file should exist