diff --git a/composer.json b/composer.json
index c07c5a89..f5786131 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/sidebar.feature b/features/sidebar.feature
index b2f4533b..b6b5abfe 100644
--- a/features/sidebar.feature
+++ b/features/sidebar.feature
@@ -2,7 +2,10 @@ Feature: Manage WordPress sidebars
   Background:
     Given a WP install
     And I try `wp theme delete twentytwelve --force`
-    And I run `wp theme install twentytwelve --activate`
+    And these installed and active themes:
+      """
+      twentytwelve
+      """
 
   Scenario: List available sidebars
     When I run `wp sidebar list --fields=name,id`
diff --git a/features/widget-reset.feature b/features/widget-reset.feature
index 38c18317..d3946e6a 100644
--- a/features/widget-reset.feature
+++ b/features/widget-reset.feature
@@ -3,7 +3,10 @@ Feature: Reset WordPress sidebars
   Background:
     Given a WP install
     And I try `wp theme delete twentytwelve --force`
-    And I run `wp theme install twentytwelve --activate`
+    And these installed and active themes:
+      """
+      twentytwelve
+      """
     And I try `wp widget reset --all`
     And I try `wp widget delete wp_inactive_widgets $(wp widget list wp_inactive_widgets --format=ids)`
 
diff --git a/features/widget.feature b/features/widget.feature
index ff19b073..121c697c 100644
--- a/features/widget.feature
+++ b/features/widget.feature
@@ -3,7 +3,10 @@ Feature: Manage widgets in WordPress sidebar
   Background:
     Given a WP install
     And I try `wp theme delete twentytwelve --force`
-    And I run `wp theme install twentytwelve --activate`
+    And these installed and active themes:
+      """
+      twentytwelve
+      """
     And I try `wp widget reset --all`
     And I try `wp widget delete wp_inactive_widgets $(wp widget list wp_inactive_widgets --format=ids)`
     And I run `wp widget add text sidebar-1 --title="Text 1"`