diff --git a/composer.json b/composer.json
index 5f6f1a1e..0002564b 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
     },
     "require-dev": {
         "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/scaffold-block.feature b/features/scaffold-block.feature
index 3481741e..9132bf48 100644
--- a/features/scaffold-block.feature
+++ b/features/scaffold-block.feature
@@ -5,7 +5,10 @@ Feature: WordPress block code scaffolding
     And I run `wp scaffold plugin movies`
     And I run `wp plugin path movies --dir`
     And save STDOUT as {PLUGIN_DIR}
-    And I run `wp theme install twentytwelve --activate --force`
+    And these installed and active themes:
+      """
+      twentytwelve --force
+      """
     And I run `wp theme path twentytwelve --dir`
     And save STDOUT as {THEME_DIR}
 
diff --git a/features/scaffold-lint.feature b/features/scaffold-lint.feature
index 2bc7c1b8..3b7bbc32 100644
--- a/features/scaffold-lint.feature
+++ b/features/scaffold-lint.feature
@@ -26,8 +26,11 @@ Feature: Lint scaffolded code
     Then the return code should be 0
 
   Scenario: Scaffold post-type and lint it
-    When I run `wp theme install twentytwentyone --force --activate`
-    And I run `wp eval 'echo STYLESHEETPATH;'`
+    Given these installed and active themes:
+      """
+      twentytwentyone --force
+      """
+    When I run `wp eval 'echo STYLESHEETPATH;'`
     And save STDOUT as {STYLESHEETPATH}
 
     And I run `wp scaffold post-type movie --theme`
@@ -38,8 +41,11 @@ Feature: Lint scaffolded code
     Then the return code should be 0
 
   Scenario: Scaffold taxonomy and lint it
-    When I run `wp theme install twentytwentyone --force --activate`
-    And I run `wp eval 'echo STYLESHEETPATH;'`
+    Given these installed and active themes:
+      """
+      twentytwentyone --force
+      """
+    When I run `wp eval 'echo STYLESHEETPATH;'`
     And save STDOUT as {STYLESHEETPATH}
 
     And I run `wp scaffold taxonomy genre --theme`
@@ -61,8 +67,11 @@ Feature: Lint scaffolded code
     Then the return code should be 0
 
   Scenario: Scaffold child theme and lint it
-    When I run `wp theme install twentytwentyone --force --activate`
-    And I run `wp theme path`
+    Given these installed and active themes:
+      """
+      twentytwentyone --force
+      """
+    When I run `wp theme path`
     And save STDOUT as {THEME_DIR}
 
     And I run `wp scaffold child-theme test-child --parent_theme=twentytwentyone`
diff --git a/features/scaffold-theme-tests.feature b/features/scaffold-theme-tests.feature
index d8756a5c..157b5216 100644
--- a/features/scaffold-theme-tests.feature
+++ b/features/scaffold-theme-tests.feature
@@ -2,7 +2,10 @@ Feature: Scaffold theme unit tests
 
   Background:
     Given a WP install
-    And I try `wp theme install twentytwelve --force`
+    And these installed themes:
+      """
+      twentytwelve --force
+      """
     And I run `wp scaffold child-theme t12child --parent_theme=twentytwelve`
 
     When I run `wp theme path`