diff --git a/composer.json b/composer.json
index fc82787e..377bbfa5 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
         "wp-cli/entity-command": "^1.3 || ^2 || ^3",
         "wp-cli/export-command": "^1 || ^2 || ^3",
         "wp-cli/extension-command": "^1.2 || ^2 || ^3",
-        "wp-cli/wp-cli-tests": "^5"
+        "wp-cli/wp-cli-tests": "dev-setup-commands-step as 5.3.99"
     },
     "repositories": [
         {
diff --git a/features/import.feature b/features/import.feature
index 9381e0e3..c03d9d1d 100644
--- a/features/import.feature
+++ b/features/import.feature
@@ -157,9 +157,11 @@ Feature: Import content.
     And I run `mkdir export`
 
     # NOTE: The Hello World page ID is 2.
-    When I run `wp menu create "My Menu"`
-    And I run `wp menu item add-post my-menu 2`
-    And I run `wp menu item list my-menu --format=count`
+    Given these setup commands:
+      | command                         |
+      | wp menu create "My Menu"        |
+      | wp menu item add-post my-menu 2 |
+    When I run `wp menu item list my-menu --format=count`
     Then STDOUT should be:
       """
       1
@@ -234,9 +236,11 @@ Feature: Import content.
     And I run `mkdir export`
 
     # NOTE: The Hello World page ID is 2.
-    When I run `wp menu create "My Menu"`
-    And I run `wp menu item add-post my-menu 2`
-    And I run `wp menu item list my-menu --format=count`
+    Given these setup commands:
+      | command                         |
+      | wp menu create "My Menu"        |
+      | wp menu item add-post my-menu 2 |
+    When I run `wp menu item list my-menu --format=count`
     Then STDOUT should be:
       """
       1