diff --git a/composer.json b/composer.json
index 1b38710a..807a5080 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-setup-commands-step as 5.3.99"
     },
     "config": {
         "process-timeout": 7200,
diff --git a/features/core-update-db.feature b/features/core-update-db.feature
index 9df19053..e4d32da5 100644
--- a/features/core-update-db.feature
+++ b/features/core-update-db.feature
@@ -190,8 +190,10 @@ Feature: Update core's database
     And I run `wp site create --slug=net2-site2 --porcelain`
     And save STDOUT as {NET2_SITE2_ID}
     # Register a second network (ID=2) and reassign those two blogs to it
-    And I run `wp eval 'global $wpdb; $wpdb->insert( $wpdb->site, [ "domain" => "example.com", "path" => "/network2/" ] );'`
-    And I run `wp eval 'global $wpdb; $wpdb->update( $wpdb->blogs, [ "site_id" => 2 ], [ "blog_id" => {NET2_SITE1_ID} ] ); $wpdb->update( $wpdb->blogs, [ "site_id" => 2 ], [ "blog_id" => {NET2_SITE2_ID} ] );'`
+    And these setup commands:
+      | command                                                                                                                                                                                           |
+      | wp eval 'global $wpdb; $wpdb->insert( $wpdb->site, [ "domain" => "example.com", "path" => "/network2/" ] );'                                                                                      |
+      | wp eval 'global $wpdb; $wpdb->update( $wpdb->blogs, [ "site_id" => 2 ], [ "blog_id" => {NET2_SITE1_ID} ] ); $wpdb->update( $wpdb->blogs, [ "site_id" => 2 ], [ "blog_id" => {NET2_SITE2_ID} ] );' |
 
     When I run `wp site option get wpmu_upgrade_site`
     Then save STDOUT as {UPDATE_VERSION}