diff --git a/features/core-check-update.feature b/features/core-check-update.feature
index 91522990..6a276919 100644
--- a/features/core-check-update.feature
+++ b/features/core-check-update.feature
@@ -13,7 +13,7 @@ Feature: Check for more recent versions
     Then STDOUT should be a table containing rows:
       | version                 | update_type | package_url                                                                             |
       | {WP_VERSION-latest}     | major       | https://downloads.wordpress.org/release/wordpress-{WP_VERSION-latest}.zip               |
-      | {WP_VERSION-5.8-latest} | minor       | https://downloads.wordpress.org/release/wordpress-{WP_VERSION-5.8-latest}-partial-0.zip |
+      | {WP_VERSION-5.8-latest} | minor       | https://downloads.w.org/release/wordpress-{WP_VERSION-5.8-latest}-partial-0.zip |
 
     When I run `wp core check-update --format=count`
     Then STDOUT should be:
@@ -35,7 +35,7 @@ Feature: Check for more recent versions
     When I run `wp core check-update --minor`
     Then STDOUT should be a table containing rows:
       | version                 | update_type | package_url                                                                             |
-      | {WP_VERSION-5.8-latest} | minor       | https://downloads.wordpress.org/release/wordpress-{WP_VERSION-5.8-latest}-partial-0.zip |
+      | {WP_VERSION-5.8-latest} | minor       | https://downloads.w.org/release/wordpress-{WP_VERSION-5.8-latest}-partial-0.zip |
 
     When I run `wp core check-update --minor --format=count`
     Then STDOUT should be:
diff --git a/features/core-update.feature b/features/core-update.feature
index ebff34a2..9cd7f689 100644
--- a/features/core-update.feature
+++ b/features/core-update.feature
@@ -259,7 +259,7 @@ Feature: Update WordPress core
     When I run `wp post create --post_title='Test post' --porcelain`
     Then STDOUT should be a number
 
-  # This test downgrades to an older WordPress version, but the SQLite plugin requires 6.0+
+  # This test downgrades to an older WordPress version, but the SQLite plugin requires 6.4+
   @require-mysql
   Scenario: Make sure files are cleaned up with mixed case
     Given a WP install
@@ -270,69 +270,31 @@ Feature: Update WordPress core
     Then the wp-includes/Requests/Exception/Transport/cURL.php file should exist
     Then the wp-includes/Requests/Exception/HTTP/502.php file should exist
     Then the wp-includes/Requests/IRI.php file should exist
-    Then the wp-includes/Requests/Transport/Curl.php file should not exist
-    Then the wp-includes/Requests/Exception/Transport/Curl.php file should not exist
-    Then the wp-includes/Requests/Exception/Http/Status502.php file should not exist
-    Then the wp-includes/Requests/Iri.php file should not exist
+    Then the wp-includes/Requests/src/Transport/Curl.php file should not exist
+    Then the wp-includes/Requests/src/Exception/Transport/Curl.php file should not exist
+    Then the wp-includes/Requests/src/Exception/Http/Status502.php file should not exist
+    Then the wp-includes/Requests/src/Iri.php file should not exist
+    And STDOUT should contain:
+      """
+      Cleaning up files...
+      """
     And STDOUT should contain:
       """
       Success: WordPress updated successfully.
       """
 
-    When I run `wp core update --version=5.9-beta1 --force`
+    When I run `wp core update --version=6.2 --force`
     Then the wp-includes/Requests/Transport/cURL.php file should not exist
     Then the wp-includes/Requests/Exception/Transport/cURL.php file should not exist
     Then the wp-includes/Requests/Exception/HTTP/502.php file should not exist
     Then the wp-includes/Requests/IRI.php file should not exist
-    Then the wp-includes/Requests/Transport/Curl.php file should exist
-    Then the wp-includes/Requests/Exception/Transport/Curl.php file should exist
-    Then the wp-includes/Requests/Exception/Http/Status502.php file should exist
-    Then the wp-includes/Requests/Iri.php file should exist
-    Then STDOUT should contain:
+    Then the wp-includes/Requests/src/Transport/Curl.php file should exist
+    Then the wp-includes/Requests/src/Exception/Transport/Curl.php file should exist
+    Then the wp-includes/Requests/src/Exception/Http/Status502.php file should exist
+    Then the wp-includes/Requests/src/Iri.php file should exist
+    And STDOUT should contain:
       """
-      File removed: wp-includes/Requests/Transport/fsockopen.php
-      File removed: wp-includes/Requests/Transport/cURL.php
-      File removed: wp-includes/Requests/Hooker.php
-      File removed: wp-includes/Requests/IPv6.php
-      File removed: wp-includes/Requests/Exception/Transport/cURL.php
-      File removed: wp-includes/Requests/Exception/HTTP.php
-      File removed: wp-includes/Requests/Exception/HTTP/502.php
-      File removed: wp-includes/Requests/Exception/HTTP/Unknown.php
-      File removed: wp-includes/Requests/Exception/HTTP/412.php
-      File removed: wp-includes/Requests/Exception/HTTP/408.php
-      File removed: wp-includes/Requests/Exception/HTTP/431.php
-      File removed: wp-includes/Requests/Exception/HTTP/501.php
-      File removed: wp-includes/Requests/Exception/HTTP/500.php
-      File removed: wp-includes/Requests/Exception/HTTP/407.php
-      File removed: wp-includes/Requests/Exception/HTTP/416.php
-      File removed: wp-includes/Requests/Exception/HTTP/428.php
-      File removed: wp-includes/Requests/Exception/HTTP/406.php
-      File removed: wp-includes/Requests/Exception/HTTP/504.php
-      File removed: wp-includes/Requests/Exception/HTTP/411.php
-      File removed: wp-includes/Requests/Exception/HTTP/414.php
-      File removed: wp-includes/Requests/Exception/HTTP/511.php
-      File removed: wp-includes/Requests/Exception/HTTP/410.php
-      File removed: wp-includes/Requests/Exception/HTTP/403.php
-      File removed: wp-includes/Requests/Exception/HTTP/400.php
-      File removed: wp-includes/Requests/Exception/HTTP/505.php
-      File removed: wp-includes/Requests/Exception/HTTP/413.php
-      File removed: wp-includes/Requests/Exception/HTTP/404.php
-      File removed: wp-includes/Requests/Exception/HTTP/306.php
-      File removed: wp-includes/Requests/Exception/HTTP/304.php
-      File removed: wp-includes/Requests/Exception/HTTP/405.php
-      File removed: wp-includes/Requests/Exception/HTTP/429.php
-      File removed: wp-includes/Requests/Exception/HTTP/417.php
-      File removed: wp-includes/Requests/Exception/HTTP/409.php
-      File removed: wp-includes/Requests/Exception/HTTP/402.php
-      File removed: wp-includes/Requests/Exception/HTTP/418.php
-      File removed: wp-includes/Requests/Exception/HTTP/305.php
-      File removed: wp-includes/Requests/Exception/HTTP/415.php
-      File removed: wp-includes/Requests/Exception/HTTP/401.php
-      File removed: wp-includes/Requests/Exception/HTTP/503.php
-      File removed: wp-includes/Requests/IRI.php
-      File removed: wp-includes/Requests/IDNAEncoder.php
-      File removed: wp-includes/Requests/SSL.php
-      File removed: wp-includes/Requests/Proxy/HTTP.php
+      Cleaning up files...
       """
 
     When I run `wp option add str_opt 'bar'`