diff --git a/composer.json b/composer.json
index 2f62851f..c11684e1 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
         "wp-cli/entity-command": "^1.3 || ^2 || ^3",
         "wp-cli/eval-command": "^2.0 || ^3",
         "wp-cli/server-command": "^2.0 || ^3",
-        "wp-cli/wp-cli-tests": "^5"
+        "wp-cli/wp-cli-tests": "dev-setup-commands-step as 5.3.99"
     },
     "config": {
         "process-timeout": 7200,
diff --git a/features/cron-event.feature b/features/cron-event.feature
index 9ddda281..66fbfe9f 100644
--- a/features/cron-event.feature
+++ b/features/cron-event.feature
@@ -74,9 +74,11 @@ Feature: Manage WP Cron events
       Success: Unscheduled 1 event for hook 'wp_cli_test_event_1'.
       """
 
-    When I run `wp cron event schedule wp_cli_test_event_2 now hourly`
-    And I run `wp cron event schedule wp_cli_test_event_2 '+1 hour' hourly`
-    And I try `wp cron event unschedule wp_cli_test_event_2`
+    Given these setup commands:
+      | command                                                     |
+      | wp cron event schedule wp_cli_test_event_2 now hourly       |
+      | wp cron event schedule wp_cli_test_event_2 '+1 hour' hourly |
+    When I try `wp cron event unschedule wp_cli_test_event_2`
     Then STDOUT should contain:
       """
       Success: Unscheduled 2 events for hook 'wp_cli_test_event_2'.