diff --git a/features/media-import.feature b/features/media-import.feature
index 312df3e5..bbe13cff 100644
--- a/features/media-import.feature
+++ b/features/media-import.feature
@@ -4,10 +4,10 @@ Feature: Manage WordPress attachments
     Given a WP install
 
   Scenario: Import media from remote URL
-    When I run `wp media import 'http://wp-cli.org/behat-data/codeispoetry.png' --post_id=1`
+    When I run `wp media import 'http://wp-cli.github.io/behat-data/codeispoetry.png' --post_id=1`
     Then STDOUT should contain:
       """
-      Imported file 'http://wp-cli.org/behat-data/codeispoetry.png'
+      Imported file 'http://wp-cli.github.io/behat-data/codeispoetry.png'
       """
     And STDOUT should contain:
       """
@@ -26,7 +26,7 @@ Feature: Manage WordPress attachments
       """
 
   Scenario: Import media from remote URL and use input file as attachment name
-    When I run `wp media import 'http://wp-cli.org/behat-data/codeispoetry.png' --file_name=abc`
+    When I run `wp media import 'http://wp-cli.github.io/behat-data/codeispoetry.png' --file_name=abc`
     Then STDOUT should contain:
       """
       file name abc.png
@@ -57,7 +57,7 @@ Feature: Manage WordPress attachments
   Scenario: Import a file as attachment from a local image
     Given download:
       | path                        | url                                              |
-      | {CACHE_DIR}/large-image.jpg | http://wp-cli.org/behat-data/large-image.jpg     |
+      | {CACHE_DIR}/large-image.jpg | http://wp-cli.github.io/behat-data/large-image.jpg     |
 
     When I run `wp media import {CACHE_DIR}/large-image.jpg --post_id=1 --featured_image`
     Then STDOUT should contain:
@@ -74,7 +74,7 @@ Feature: Manage WordPress attachments
   Scenario: Import a file as attachment from a local image and preserve the file modified time.
     Given download:
       | path                        | url                                              |
-      | {CACHE_DIR}/large-image.jpg | http://wp-cli.org/behat-data/large-image.jpg     |
+      | {CACHE_DIR}/large-image.jpg | http://wp-cli.github.io/behat-data/large-image.jpg     |
     And I run `TZ=UTC touch -t 8001031305 {CACHE_DIR}/large-image.jpg`
     And I run `wp option update gmt_offset -5`
 
@@ -96,7 +96,7 @@ Feature: Manage WordPress attachments
   Scenario: Import a file as an attachment but porcelain style
     Given download:
       | path                        | url                                              |
-      | {CACHE_DIR}/large-image.jpg | http://wp-cli.org/behat-data/large-image.jpg     |
+      | {CACHE_DIR}/large-image.jpg | http://wp-cli.github.io/behat-data/large-image.jpg     |
 
     When I run `wp media import {CACHE_DIR}/large-image.jpg --title="My imported attachment" --caption="My fabulous caption" --post_name="My post name" --porcelain`
     Then save STDOUT as {ATTACHMENT_ID}
@@ -122,7 +122,7 @@ Feature: Manage WordPress attachments
   Scenario: Import a file as attachment from a local image and leave it in it's current location
     Given download:
       | path                        | url                                              |
-      | {CACHE_DIR}/large-image.jpg | http://wp-cli.org/behat-data/large-image.jpg     |
+      | {CACHE_DIR}/large-image.jpg | http://wp-cli.github.io/behat-data/large-image.jpg     |
     And I run `wp option update uploads_use_yearmonth_folders 0`
 
     When I run `wp media import {CACHE_DIR}/large-image.jpg --skip-copy`
@@ -141,7 +141,7 @@ Feature: Manage WordPress attachments
   Scenario: Import a file and use its filename as the title
     Given download:
       | path                        | url                                              |
-      | {CACHE_DIR}/large-image.jpg | http://wp-cli.org/behat-data/large-image.jpg     |
+      | {CACHE_DIR}/large-image.jpg | http://wp-cli.github.io/behat-data/large-image.jpg     |
 
     When I run `wp media import {CACHE_DIR}/large-image.jpg --porcelain`
     Then save STDOUT as {ATTACHMENT_ID}
@@ -155,7 +155,7 @@ Feature: Manage WordPress attachments
   Scenario: Import a file and persist its original metadata
     Given download:
       | path                         | url                                              |
-      | {CACHE_DIR}/canola.jpg       | http://wp-cli.org/behat-data/canola.jpg          |
+      | {CACHE_DIR}/canola.jpg       | http://wp-cli.github.io/behat-data/canola.jpg          |
 
     When I run `wp media import {CACHE_DIR}/canola.jpg --porcelain`
     Then save STDOUT as {ATTACHMENT_ID}
@@ -173,7 +173,7 @@ Feature: Manage WordPress attachments
       """
 
   Scenario: Make sure WordPress receives the slashed data it expects
-    When I run `wp media import 'http://wp-cli.org/behat-data/codeispoetry.png' --post_id=1 --title='My\Title' --caption='Caption\Here' --alt='Alt\Here' --desc='Desc\Here' --porcelain`
+    When I run `wp media import 'http://wp-cli.github.io/behat-data/codeispoetry.png' --post_id=1 --title='My\Title' --caption='Caption\Here' --alt='Alt\Here' --desc='Desc\Here' --porcelain`
     Then save STDOUT as {ATTACHMENT_ID}
 
     When I run `wp post get {ATTACHMENT_ID} --format=csv --fields=post_title,post_excerpt,post_content`
@@ -199,16 +199,16 @@ Feature: Manage WordPress attachments
   Scenario: Import multiple images
     Given download:
       | path                        | url                                              |
-      | {CACHE_DIR}/large-image.jpg | http://wp-cli.org/behat-data/large-image.jpg     |
+      | {CACHE_DIR}/large-image.jpg | http://wp-cli.github.io/behat-data/large-image.jpg     |
 
-    When I run `wp media import 'http://wp-cli.org/behat-data/codeispoetry.png' {CACHE_DIR}/large-image.jpg`
+    When I run `wp media import 'http://wp-cli.github.io/behat-data/codeispoetry.png' {CACHE_DIR}/large-image.jpg`
     Then STDOUT should contain:
       """
       Success: Imported 2 of 2 items.
       """
 
   Scenario: Fail to import one image but continue trying the next
-    When I try `wp media import gobbledygook.png 'http://wp-cli.org/behat-data/codeispoetry.png'`
+    When I try `wp media import gobbledygook.png 'http://wp-cli.github.io/behat-data/codeispoetry.png'`
     Then STDERR should contain:
       """
       Error: Only imported 1 of 2 items.
@@ -216,10 +216,10 @@ Feature: Manage WordPress attachments
     And the return code should be 1
 
   Scenario: Fail when download_url() fails
-    When I try `wp media import 'http://wp-cli.org/404'`
+    When I try `wp media import 'http://example.com/404'`
     Then STDERR should be:
       """
-      Warning: Unable to import file 'http://wp-cli.org/404'. Reason: Not Found
+      Warning: Unable to import file 'http://example.com/404'. Reason: Not Found
       Error: No items imported.
       """
     And the return code should be 1
@@ -235,7 +235,7 @@ Feature: Manage WordPress attachments
   Scenario: Return upload URL after importing a single valid file
     Given download:
       | path                        | url                                              |
-      | {CACHE_DIR}/large-image.jpg | http://wp-cli.org/behat-data/large-image.jpg     |
+      | {CACHE_DIR}/large-image.jpg | http://wp-cli.github.io/behat-data/large-image.jpg     |
 
     When I run `wp media import {CACHE_DIR}/large-image.jpg --porcelain=url`
     Then STDOUT should contain:
@@ -251,10 +251,10 @@ Feature: Manage WordPress attachments
   Scenario: Return upload URL after importing a multiple valid files
     Given download:
       | path                                | url                                                  |
-      | {CACHE_DIR}/large-image.jpg         | http://wp-cli.org/behat-data/large-image.jpg         |
-      | {CACHE_DIR}/audio-with-no-cover.mp3 | http://wp-cli.org/behat-data/audio-with-no-cover.mp3 |
+      | {CACHE_DIR}/large-image.jpg         | http://wp-cli.github.io/behat-data/large-image.jpg         |
+      | {CACHE_DIR}/audio-with-no-cover.mp3 | http://wp-cli.github.io/behat-data/audio-with-no-cover.mp3 |
 
-    When I run `wp media import 'http://wp-cli.org/behat-data/codeispoetry.png' {CACHE_DIR}/large-image.jpg {CACHE_DIR}/audio-with-no-cover.mp3 --porcelain=url`
+    When I run `wp media import 'http://wp-cli.github.io/behat-data/codeispoetry.png' {CACHE_DIR}/large-image.jpg {CACHE_DIR}/audio-with-no-cover.mp3 --porcelain=url`
     Then STDOUT should contain:
       """
       https://example.com/wp-content/uploads/
@@ -281,7 +281,7 @@ Feature: Manage WordPress attachments
       """
 
   Scenario: Errors when invalid --porcelain flag is applied.
-    When I try `wp media import 'http://wp-cli.org/behat-data/codeispoetry.png' --porcelain=invalid`
+    When I try `wp media import 'http://wp-cli.github.io/behat-data/codeispoetry.png' --porcelain=invalid`
     Then STDERR should be:
       """
       Error: Invalid value for <porcelain>: invalid. Expected flag or 'url'.
@@ -290,7 +290,7 @@ Feature: Manage WordPress attachments
   Scenario: Import media from STDIN
     Given download:
       | path                        | url                                              |
-      | {CACHE_DIR}/codeispoetry.png | http://wp-cli.org/behat-data/codeispoetry.png     |
+      | {CACHE_DIR}/codeispoetry.png | http://wp-cli.github.io/behat-data/codeispoetry.png     |
 
     When I run `cat {CACHE_DIR}/codeispoetry.png | wp media import - --title="From STDIN" --porcelain`
     Then save STDOUT as {ATTACHMENT_ID}
@@ -304,7 +304,7 @@ Feature: Manage WordPress attachments
   Scenario: Import media from STDIN with file_name
     Given download:
       | path                        | url                                              |
-      | {CACHE_DIR}/codeispoetry.png | http://wp-cli.org/behat-data/codeispoetry.png     |
+      | {CACHE_DIR}/codeispoetry.png | http://wp-cli.github.io/behat-data/codeispoetry.png     |
 
     When I run `cat {CACHE_DIR}/codeispoetry.png | wp media import - --file_name=my-image.png --porcelain`
     Then save STDOUT as {ATTACHMENT_ID}
@@ -336,7 +336,7 @@ Feature: Manage WordPress attachments
   Scenario: Upload files into a custom directory, relative to ABSPATH, when --destination-dir flag is applied.
     Given download:
       | path                        | url                                              |
-      | {CACHE_DIR}/large-image.jpg | http://wp-cli.org/behat-data/large-image.jpg     |
+      | {CACHE_DIR}/large-image.jpg | http://wp-cli.github.io/behat-data/large-image.jpg     |
     When I run `wp media import --destination-dir="foo" {CACHE_DIR}/large-image.jpg --porcelain=url`
 
     Then STDOUT should not contain:
@@ -352,7 +352,7 @@ Feature: Manage WordPress attachments
   Scenario: Upload files into a custom directory, not relative to ABSPATH, when --destination-dir flag is applied.
     Given download:
       | path                        | url                                              |
-      | {CACHE_DIR}/large-image.jpg | http://wp-cli.org/behat-data/large-image.jpg     |
+      | {CACHE_DIR}/large-image.jpg | http://wp-cli.github.io/behat-data/large-image.jpg     |
     When I run `wp media import --destination-dir="{RUN_DIR}/foo" {CACHE_DIR}/large-image.jpg --porcelain=url`
 
     Then STDOUT should not contain:
diff --git a/features/media-prune.feature b/features/media-prune.feature
index f73db433..c070ecf1 100644
--- a/features/media-prune.feature
+++ b/features/media-prune.feature
@@ -16,8 +16,8 @@ Feature: Prune WordPress attachment thumbnails
   Scenario: Prune all thumbnails for all images
     Given download:
       | path                        | url                                          |
-      | {CACHE_DIR}/large-image.jpg | http://wp-cli.org/behat-data/large-image.jpg |
-      | {CACHE_DIR}/canola.jpg      | http://wp-cli.org/behat-data/canola.jpg      |
+      | {CACHE_DIR}/large-image.jpg | http://wp-cli.github.io/behat-data/large-image.jpg |
+      | {CACHE_DIR}/canola.jpg      | http://wp-cli.github.io/behat-data/canola.jpg      |
     And I run `wp option update uploads_use_yearmonth_folders 0`
 
     When I run `wp media import {CACHE_DIR}/large-image.jpg --title="My large attachment" --porcelain`
@@ -72,7 +72,7 @@ Feature: Prune WordPress attachment thumbnails
   Scenario: Prune a specific image size
     Given download:
       | path                        | url                                          |
-      | {CACHE_DIR}/large-image.jpg | http://wp-cli.org/behat-data/large-image.jpg |
+      | {CACHE_DIR}/large-image.jpg | http://wp-cli.github.io/behat-data/large-image.jpg |
     And I run `wp option update uploads_use_yearmonth_folders 0`
 
     When I run `wp media import {CACHE_DIR}/large-image.jpg --title="My large attachment" --porcelain`
@@ -96,7 +96,7 @@ Feature: Prune WordPress attachment thumbnails
   Scenario: Prune does not remove abandoned (unregistered) thumbnails by default
     Given download:
       | path                        | url                                          |
-      | {CACHE_DIR}/large-image.jpg | http://wp-cli.org/behat-data/large-image.jpg |
+      | {CACHE_DIR}/large-image.jpg | http://wp-cli.github.io/behat-data/large-image.jpg |
     And a wp-content/mu-plugins/media-settings.php file:
       """
       <?php
@@ -133,7 +133,7 @@ Feature: Prune WordPress attachment thumbnails
   Scenario: Prune removes abandoned thumbnails with --remove-abandoned
     Given download:
       | path                        | url                                          |
-      | {CACHE_DIR}/large-image.jpg | http://wp-cli.org/behat-data/large-image.jpg |
+      | {CACHE_DIR}/large-image.jpg | http://wp-cli.github.io/behat-data/large-image.jpg |
     And a wp-content/mu-plugins/media-settings.php file:
       """
       <?php
diff --git a/features/media-regenerate.feature b/features/media-regenerate.feature
index 22fa5732..1542fba9 100644
--- a/features/media-regenerate.feature
+++ b/features/media-regenerate.feature
@@ -16,9 +16,9 @@ Feature: Regenerate WordPress attachments
   Scenario: Regenerate all images default behavior
     Given download:
       | path                             | url                                               |
-      | {CACHE_DIR}/large-image.jpg      | http://wp-cli.org/behat-data/large-image.jpg      |
-      | {CACHE_DIR}/canola.jpg           | http://wp-cli.org/behat-data/canola.jpg           |
-      | {CACHE_DIR}/white-150-square.jpg | http://wp-cli.org/behat-data/white-150-square.jpg |
+      | {CACHE_DIR}/large-image.jpg      | http://wp-cli.github.io/behat-data/large-image.jpg      |
+      | {CACHE_DIR}/canola.jpg           | http://wp-cli.github.io/behat-data/canola.jpg           |
+      | {CACHE_DIR}/white-150-square.jpg | http://wp-cli.github.io/behat-data/white-150-square.jpg |
     And I run `wp option update uploads_use_yearmonth_folders 0`
 
     When I run `wp media import {CACHE_DIR}/large-image.jpg --title="My imported large attachment" --porcelain`
@@ -86,9 +86,9 @@ Feature: Regenerate WordPress attachments
   Scenario: Regenerate all images default behavior (pre-WP-5.3)
     Given download:
       | path                             | url                                               |
-      | {CACHE_DIR}/large-image.jpg      | http://wp-cli.org/behat-data/large-image.jpg      |
-      | {CACHE_DIR}/canola.jpg           | http://wp-cli.org/behat-data/canola.jpg           |
-      | {CACHE_DIR}/white-150-square.jpg | http://wp-cli.org/behat-data/white-150-square.jpg |
+      | {CACHE_DIR}/large-image.jpg      | http://wp-cli.github.io/behat-data/large-image.jpg      |
+      | {CACHE_DIR}/canola.jpg           | http://wp-cli.github.io/behat-data/canola.jpg           |
+      | {CACHE_DIR}/white-150-square.jpg | http://wp-cli.github.io/behat-data/white-150-square.jpg |
     And I run `wp option update uploads_use_yearmonth_folders 0`
 
     When I run `wp media import {CACHE_DIR}/large-image.jpg --title="My imported large attachment" --porcelain`
@@ -149,7 +149,7 @@ Feature: Regenerate WordPress attachments
   Scenario: Delete existing thumbnails when media is regenerated
     Given download:
       | path                        | url                                              |
-      | {CACHE_DIR}/large-image.jpg | http://wp-cli.org/behat-data/large-image.jpg     |
+      | {CACHE_DIR}/large-image.jpg | http://wp-cli.github.io/behat-data/large-image.jpg     |
     And a wp-content/mu-plugins/media-settings.php file:
       """
       <?php
@@ -181,7 +181,7 @@ Feature: Regenerate WordPress attachments
   Scenario: Skip deletion of existing thumbnails when media is regenerated
     Given download:
       | path                        | url                                              |
-      | {CACHE_DIR}/large-image.jpg | http://wp-cli.org/behat-data/large-image.jpg     |
+      | {CACHE_DIR}/large-image.jpg | http://wp-cli.github.io/behat-data/large-image.jpg     |
     And a wp-content/mu-plugins/media-settings.php file:
       """
       <?php
@@ -214,8 +214,8 @@ Feature: Regenerate WordPress attachments
   Scenario: Delete existing thumbnails when media including PDF is regenerated
     Given download:
       | path                              | url                                                   |
-      | {CACHE_DIR}/large-image.jpg       | http://wp-cli.org/behat-data/large-image.jpg          |
-      | {CACHE_DIR}/minimal-us-letter.pdf | http://wp-cli.org/behat-data/minimal-us-letter.pdf    |
+      | {CACHE_DIR}/large-image.jpg       | http://wp-cli.github.io/behat-data/large-image.jpg          |
+      | {CACHE_DIR}/minimal-us-letter.pdf | http://wp-cli.github.io/behat-data/minimal-us-letter.pdf    |
     And a wp-content/mu-plugins/media-settings.php file:
       """
       <?php
@@ -262,8 +262,8 @@ Feature: Regenerate WordPress attachments
   Scenario: Skip deletion of existing thumbnails when media including PDF is regenerated
     Given download:
       | path                              | url                                                   |
-      | {CACHE_DIR}/large-image.jpg       | http://wp-cli.org/behat-data/large-image.jpg          |
-      | {CACHE_DIR}/minimal-us-letter.pdf | http://wp-cli.org/behat-data/minimal-us-letter.pdf    |
+      | {CACHE_DIR}/large-image.jpg       | http://wp-cli.github.io/behat-data/large-image.jpg          |
+      | {CACHE_DIR}/minimal-us-letter.pdf | http://wp-cli.github.io/behat-data/minimal-us-letter.pdf    |
     And a wp-content/mu-plugins/media-settings.php file:
       """
       <?php
@@ -309,7 +309,7 @@ Feature: Regenerate WordPress attachments
   Scenario: Provide helpful error messages when media can't be regenerated
     Given download:
       | path                        | url                                              |
-      | {CACHE_DIR}/large-image.jpg | http://wp-cli.org/behat-data/large-image.jpg     |
+      | {CACHE_DIR}/large-image.jpg | http://wp-cli.github.io/behat-data/large-image.jpg     |
     And a wp-content/mu-plugins/media-settings.php file:
       """
       <?php
@@ -337,7 +337,7 @@ Feature: Regenerate WordPress attachments
   Scenario: Only regenerate images which are missing sizes
     Given download:
       | path                        | url                                              |
-      | {CACHE_DIR}/large-image.jpg | http://wp-cli.org/behat-data/large-image.jpg     |
+      | {CACHE_DIR}/large-image.jpg | http://wp-cli.github.io/behat-data/large-image.jpg     |
     And a wp-content/mu-plugins/media-settings.php file:
       """
       <?php
@@ -454,7 +454,7 @@ Feature: Regenerate WordPress attachments
   Scenario: Regenerate images which are missing globally-defined image sizes
     Given download:
       | path                        | url                                              |
-      | {CACHE_DIR}/large-image.jpg | http://wp-cli.org/behat-data/large-image.jpg     |
+      | {CACHE_DIR}/large-image.jpg | http://wp-cli.github.io/behat-data/large-image.jpg     |
     And I run `wp option update uploads_use_yearmonth_folders 0`
 
     When I run `wp media import {CACHE_DIR}/large-image.jpg --title="My imported attachment" --porcelain`
@@ -502,7 +502,7 @@ Feature: Regenerate WordPress attachments
   Scenario: Only regenerate images that are missing if the size should exist
     Given download:
       | path                   | url                                         |
-      | {CACHE_DIR}/canola.jpg | http://wp-cli.org/behat-data/canola.jpg     |
+      | {CACHE_DIR}/canola.jpg | http://wp-cli.github.io/behat-data/canola.jpg     |
     And a wp-content/mu-plugins/media-settings.php file:
       """
       <?php
@@ -537,7 +537,7 @@ Feature: Regenerate WordPress attachments
   Scenario: Only regenerate PDF previews that are missing if the size should exist
     Given download:
       | path                              | url                                                   |
-      | {CACHE_DIR}/minimal-us-letter.pdf | http://wp-cli.org/behat-data/minimal-us-letter.pdf    |
+      | {CACHE_DIR}/minimal-us-letter.pdf | http://wp-cli.github.io/behat-data/minimal-us-letter.pdf    |
     And a wp-content/mu-plugins/media-settings.php file:
       """
       <?php
@@ -579,7 +579,7 @@ Feature: Regenerate WordPress attachments
   Scenario: Only regenerate images that are missing if it has thumbnails
     Given download:
       | path                             | url                                               |
-      | {CACHE_DIR}/white-150-square.jpg | http://wp-cli.org/behat-data/white-150-square.jpg |
+      | {CACHE_DIR}/white-150-square.jpg | http://wp-cli.github.io/behat-data/white-150-square.jpg |
     And I run `wp option update uploads_use_yearmonth_folders 0`
 
     When I run `wp media import {CACHE_DIR}/white-150-square.jpg --title="My imported attachment" --porcelain`
@@ -603,7 +603,7 @@ Feature: Regenerate WordPress attachments
   Scenario: Regenerate a specific image size
     Given download:
       | path                        | url                                          |
-      | {CACHE_DIR}/canola.jpg      | http://wp-cli.org/behat-data/canola.jpg      |
+      | {CACHE_DIR}/canola.jpg      | http://wp-cli.github.io/behat-data/canola.jpg      |
     And a wp-content/mu-plugins/media-settings.php file:
       """
       <?php
@@ -836,7 +836,7 @@ Feature: Regenerate WordPress attachments
   Scenario: Regenerating a specific image size should not regenerate the scaled version of big images
     Given download:
       | path                        | url                                          |
-      | {CACHE_DIR}/large-image.jpg | http://wp-cli.org/behat-data/large-image.jpg |
+      | {CACHE_DIR}/large-image.jpg | http://wp-cli.github.io/behat-data/large-image.jpg |
     And I run `wp option update uploads_use_yearmonth_folders 0`
 
     When I run `wp media import {CACHE_DIR}/large-image.jpg --title="My imported attachment" --porcelain`
@@ -873,7 +873,7 @@ Feature: Regenerate WordPress attachments
   Scenario: Regenerating only-missing sizes on WP 5.3+ uses wp_update_image_subsizes and does not recreate the scaled version
     Given download:
       | path                        | url                                          |
-      | {CACHE_DIR}/large-image.jpg | http://wp-cli.org/behat-data/large-image.jpg |
+      | {CACHE_DIR}/large-image.jpg | http://wp-cli.github.io/behat-data/large-image.jpg |
     And I run `wp option update uploads_use_yearmonth_folders 0`
 
     When I run `wp media import {CACHE_DIR}/large-image.jpg --title="My imported attachment" --porcelain`
@@ -917,7 +917,7 @@ Feature: Regenerate WordPress attachments
   Scenario: Regenerate a specific image size for a PDF attachment
     Given download:
       | path                              | url                                                   |
-      | {CACHE_DIR}/minimal-us-letter.pdf | http://wp-cli.org/behat-data/minimal-us-letter.pdf    |
+      | {CACHE_DIR}/minimal-us-letter.pdf | http://wp-cli.github.io/behat-data/minimal-us-letter.pdf    |
     And a wp-content/mu-plugins/media-settings.php file:
       """
       <?php
@@ -1039,7 +1039,7 @@ Feature: Regenerate WordPress attachments
   Scenario: Regenerate multiple specific image sizes
     Given download:
       | path                        | url                                          |
-      | {CACHE_DIR}/canola.jpg      | http://wp-cli.org/behat-data/canola.jpg      |
+      | {CACHE_DIR}/canola.jpg      | http://wp-cli.github.io/behat-data/canola.jpg      |
     And a wp-content/mu-plugins/media-settings.php file:
       """
       <?php
@@ -1182,8 +1182,8 @@ Feature: Regenerate WordPress attachments
   Scenario: Regenerating PDFs when thumbnails disabled should be marked as skipped and not produce PHP notices
     Given download:
       | path                              | url                                                |
-      | {CACHE_DIR}/minimal-us-letter.pdf | http://wp-cli.org/behat-data/minimal-us-letter.pdf |
-      | {CACHE_DIR}/canola.jpg            | http://wp-cli.org/behat-data/canola.jpg            |
+      | {CACHE_DIR}/minimal-us-letter.pdf | http://wp-cli.github.io/behat-data/minimal-us-letter.pdf |
+      | {CACHE_DIR}/canola.jpg            | http://wp-cli.github.io/behat-data/canola.jpg            |
     And a wp-content/mu-plugins/media-settings.php file:
       """
       <?php
@@ -1257,7 +1257,7 @@ Feature: Regenerate WordPress attachments
   Scenario: Regenerating PDFs when thumbnails enabled on import but disabled on regeneration
     Given download:
       | path                              | url                                                |
-      | {CACHE_DIR}/minimal-us-letter.pdf | http://wp-cli.org/behat-data/minimal-us-letter.pdf |
+      | {CACHE_DIR}/minimal-us-letter.pdf | http://wp-cli.github.io/behat-data/minimal-us-letter.pdf |
     And a wp-content/mu-plugins/media-settings.php file:
       """
       <?php
@@ -1322,7 +1322,7 @@ Feature: Regenerate WordPress attachments
   Scenario: Regenerating PDFs when thumbnails disabled on import but enabled on regeneration
     Given download:
       | path                              | url                                                |
-      | {CACHE_DIR}/minimal-us-letter.pdf | http://wp-cli.org/behat-data/minimal-us-letter.pdf |
+      | {CACHE_DIR}/minimal-us-letter.pdf | http://wp-cli.github.io/behat-data/minimal-us-letter.pdf |
     And a wp-content/mu-plugins/media-settings.php file:
       """
       <?php
@@ -1389,8 +1389,8 @@ Feature: Regenerate WordPress attachments
   Scenario: Regenerating video with thumbnail
     Given download:
       | path                                        | url                                                          |
-      | {CACHE_DIR}/video-400x300-with-cover.mp4    | http://wp-cli.org/behat-data/video-400x300-with-cover.mp4    |
-      | {CACHE_DIR}/video-400x300-with-no-cover.mp4 | http://wp-cli.org/behat-data/video-400x300-with-no-cover.mp4 |
+      | {CACHE_DIR}/video-400x300-with-cover.mp4    | http://wp-cli.github.io/behat-data/video-400x300-with-cover.mp4    |
+      | {CACHE_DIR}/video-400x300-with-no-cover.mp4 | http://wp-cli.github.io/behat-data/video-400x300-with-no-cover.mp4 |
     And I run `wp option update uploads_use_yearmonth_folders 0`
 
     When I run `wp media import {CACHE_DIR}/video-400x300-with-cover.mp4 --title="My imported video with cover attachment" --porcelain`
@@ -1434,7 +1434,7 @@ Feature: Regenerate WordPress attachments
   Scenario: Regenerate image uploaded with no sizes metadata
     Given download:
       | path                             | url                                               |
-      | {CACHE_DIR}/white-160-square.bmp | http://wp-cli.org/behat-data/white-160-square.bmp |
+      | {CACHE_DIR}/white-160-square.bmp | http://wp-cli.github.io/behat-data/white-160-square.bmp |
     And a wp-content/mu-plugins/media-settings.php file:
       """
       <?php
@@ -1565,9 +1565,9 @@ Feature: Regenerate WordPress attachments
   Scenario: Regenerating melange with batch results: regenerated (and not needing regeneration), skipped, failed
     Given download:
       | path                                     | url                                                       |
-      | {CACHE_DIR}/canola.jpg                   | http://wp-cli.org/behat-data/canola.jpg                   |
-      | {CACHE_DIR}/minimal-us-letter.pdf        | http://wp-cli.org/behat-data/minimal-us-letter.pdf        |
-      | {CACHE_DIR}/video-400x300-with-cover.mp4 | http://wp-cli.org/behat-data/video-400x300-with-cover.mp4 |
+      | {CACHE_DIR}/canola.jpg                   | http://wp-cli.github.io/behat-data/canola.jpg                   |
+      | {CACHE_DIR}/minimal-us-letter.pdf        | http://wp-cli.github.io/behat-data/minimal-us-letter.pdf        |
+      | {CACHE_DIR}/video-400x300-with-cover.mp4 | http://wp-cli.github.io/behat-data/video-400x300-with-cover.mp4 |
     And an svg.svg file:
       """
       <?xml version="1.0" encoding="utf-8"?>
@@ -1801,7 +1801,7 @@ Feature: Regenerate WordPress attachments
   Scenario: Regenerate a large image that was edited by the user preserves the edits
     Given download:
       | path                        | url                                          |
-      | {CACHE_DIR}/large-image.jpg | http://wp-cli.org/behat-data/large-image.jpg |
+      | {CACHE_DIR}/large-image.jpg | http://wp-cli.github.io/behat-data/large-image.jpg |
     And I run `wp option update uploads_use_yearmonth_folders 0`
 
     When I run `wp media import {CACHE_DIR}/large-image.jpg --title="My imported large attachment" --porcelain`
@@ -1861,7 +1861,7 @@ Feature: Regenerate WordPress attachments
   Scenario: Only delete missing image sizes
     Given download:
       | path                        | url                                              |
-      | {CACHE_DIR}/large-image.jpg | http://wp-cli.org/behat-data/large-image.jpg     |
+      | {CACHE_DIR}/large-image.jpg | http://wp-cli.github.io/behat-data/large-image.jpg     |
     And a wp-content/mu-plugins/media-settings.php file:
       """
       <?php
@@ -1898,7 +1898,7 @@ Feature: Regenerate WordPress attachments
   Scenario: Regenerate site-icon attachment preserves site-icon-specific image sizes
     Given download:
       | path                        | url                                          |
-      | {CACHE_DIR}/large-image.jpg | http://wp-cli.org/behat-data/large-image.jpg |
+      | {CACHE_DIR}/large-image.jpg | http://wp-cli.github.io/behat-data/large-image.jpg |
     And I run `wp option update uploads_use_yearmonth_folders 0`
 
     When I run `wp media import {CACHE_DIR}/large-image.jpg --title="My site icon" --porcelain`
@@ -1937,7 +1937,7 @@ Feature: Regenerate WordPress attachments
   Scenario: Update post content references when regenerating a specific image size
     Given download:
       | path                        | url                                      |
-      | {CACHE_DIR}/canola.jpg      | http://wp-cli.org/behat-data/canola.jpg  |
+      | {CACHE_DIR}/canola.jpg      | http://wp-cli.github.io/behat-data/canola.jpg  |
     And a wp-content/mu-plugins/media-settings.php file:
       """
       <?php
diff --git a/features/media-replace.feature b/features/media-replace.feature
index 06981ec6..4a51fc1a 100644
--- a/features/media-replace.feature
+++ b/features/media-replace.feature
@@ -6,8 +6,8 @@ Feature: Replace WordPress attachment files
   Scenario: Replace an attachment file with a local file
     Given download:
       | path                        | url                                          |
-      | {CACHE_DIR}/large-image.jpg | http://wp-cli.org/behat-data/large-image.jpg |
-      | {CACHE_DIR}/canola.jpg      | http://wp-cli.org/behat-data/canola.jpg      |
+      | {CACHE_DIR}/large-image.jpg | http://wp-cli.github.io/behat-data/large-image.jpg |
+      | {CACHE_DIR}/canola.jpg      | http://wp-cli.github.io/behat-data/canola.jpg      |
     And I run `wp option update uploads_use_yearmonth_folders 0`
 
     When I run `wp media import {CACHE_DIR}/large-image.jpg --porcelain`
@@ -26,13 +26,13 @@ Feature: Replace WordPress attachment files
   Scenario: Replace an attachment file from a URL
     Given download:
       | path                        | url                                          |
-      | {CACHE_DIR}/large-image.jpg | http://wp-cli.org/behat-data/large-image.jpg |
+      | {CACHE_DIR}/large-image.jpg | http://wp-cli.github.io/behat-data/large-image.jpg |
     And I run `wp option update uploads_use_yearmonth_folders 0`
 
     When I run `wp media import {CACHE_DIR}/large-image.jpg --porcelain`
     Then save STDOUT as {ATTACHMENT_ID}
 
-    When I run `wp media replace {ATTACHMENT_ID} 'http://wp-cli.org/behat-data/canola.jpg'`
+    When I run `wp media replace {ATTACHMENT_ID} 'http://wp-cli.github.io/behat-data/canola.jpg'`
     Then STDOUT should contain:
       """
       Replaced file for attachment ID {ATTACHMENT_ID}
@@ -45,8 +45,8 @@ Feature: Replace WordPress attachment files
   Scenario: Replace an attachment file and output only the attachment ID in porcelain mode
     Given download:
       | path                        | url                                          |
-      | {CACHE_DIR}/large-image.jpg | http://wp-cli.org/behat-data/large-image.jpg |
-      | {CACHE_DIR}/canola.jpg      | http://wp-cli.org/behat-data/canola.jpg      |
+      | {CACHE_DIR}/large-image.jpg | http://wp-cli.github.io/behat-data/large-image.jpg |
+      | {CACHE_DIR}/canola.jpg      | http://wp-cli.github.io/behat-data/canola.jpg      |
     And I run `wp option update uploads_use_yearmonth_folders 0`
 
     When I run `wp media import {CACHE_DIR}/large-image.jpg --porcelain`
@@ -61,8 +61,8 @@ Feature: Replace WordPress attachment files
   Scenario: Preserve attachment metadata after replacing the file
     Given download:
       | path                        | url                                          |
-      | {CACHE_DIR}/large-image.jpg | http://wp-cli.org/behat-data/large-image.jpg |
-      | {CACHE_DIR}/canola.jpg      | http://wp-cli.org/behat-data/canola.jpg      |
+      | {CACHE_DIR}/large-image.jpg | http://wp-cli.github.io/behat-data/large-image.jpg |
+      | {CACHE_DIR}/canola.jpg      | http://wp-cli.github.io/behat-data/canola.jpg      |
     And I run `wp option update uploads_use_yearmonth_folders 0`
 
     When I run `wp media import {CACHE_DIR}/large-image.jpg --title="My Image Title" --porcelain`
@@ -83,7 +83,7 @@ Feature: Replace WordPress attachment files
   Scenario: Error when replacing with a non-existent local file
     Given download:
       | path                        | url                                          |
-      | {CACHE_DIR}/large-image.jpg | http://wp-cli.org/behat-data/large-image.jpg |
+      | {CACHE_DIR}/large-image.jpg | http://wp-cli.github.io/behat-data/large-image.jpg |
 
     When I run `wp media import {CACHE_DIR}/large-image.jpg --porcelain`
     Then save STDOUT as {ATTACHMENT_ID}
@@ -110,8 +110,8 @@ Feature: Replace WordPress attachment files
   Scenario: Skip deletion of old thumbnails when --skip-delete flag is used
     Given download:
       | path                        | url                                          |
-      | {CACHE_DIR}/large-image.jpg | http://wp-cli.org/behat-data/large-image.jpg |
-      | {CACHE_DIR}/canola.jpg      | http://wp-cli.org/behat-data/canola.jpg      |
+      | {CACHE_DIR}/large-image.jpg | http://wp-cli.github.io/behat-data/large-image.jpg |
+      | {CACHE_DIR}/canola.jpg      | http://wp-cli.github.io/behat-data/canola.jpg      |
     And I run `wp option update uploads_use_yearmonth_folders 0`
 
     When I run `wp media import {CACHE_DIR}/large-image.jpg --porcelain`