diff --git a/features/add-oembed-provider.feature b/features/add-oembed-provider.feature
deleted file mode 100644
index 4ccfdde..0000000
--- a/features/add-oembed-provider.feature
+++ /dev/null
@@ -1,321 +0,0 @@
-Feature: Register and use custom oEmbed providers
-
-  Background:
-    Given a WP install
-    And a filter-providers.php file:
-      """
-      <?php
-      WP_CLI::add_wp_hook( 'init', function () {
-        wp_oembed_add_provider( 'http://example.com/*', 'http://example.com/api/oembed.{format}' );
-      });
-      """
-
-  Scenario: List oEmbed providers after registration
-    When I run `wp embed provider list --require=filter-providers.php`
-    And save STDOUT as {DEFAULT_STDOUT}
-    Then STDOUT should contain:
-      """
-      format
-      """
-    And STDOUT should contain:
-      """
-      endpoint
-      """
-    And STDOUT should not contain:
-      """
-      regex
-      """
-    And STDOUT should contain:
-      """
-      http://example.com/*
-      """
-    And STDOUT should contain:
-      """
-      http://example.com/api/oembed.{format}
-      """
-    And STDOUT should contain:
-      """
-      youtube\.com/watch.*
-      """
-    And STDOUT should contain:
-      """
-      //www.youtube.com/oembed
-      """
-    And STDOUT should contain:
-      """
-      flickr\.com/
-      """
-    And STDOUT should contain:
-      """
-      flickr.com
-      """
-    And STDOUT should contain:
-      """
-      twitter\.com/
-      """
-    And STDOUT should contain:
-      """
-      twitter.com
-      """
-    And STDOUT should contain:
-      """
-      \.spotify\.com/
-      """
-    And STDOUT should contain:
-      """
-      spotify.com
-      """
-
-    When I run `wp embed provider list --fields=format,endpoint --require=filter-providers.php`
-    Then STDOUT should be:
-      """
-      {DEFAULT_STDOUT}
-      """
-
-    When I run `wp embed provider list --force-regex --require=filter-providers.php`
-    Then STDOUT should contain:
-      """
-      #https?\://example\.com/(.+)#i
-      """
-    And STDOUT should contain:
-      """
-      http://example.com/api/oembed.{format}
-      """
-    And STDOUT should not contain:
-      """
-      http://example.com/*
-      """
-    And STDOUT should match /^#http/m
-
-    When I run `wp embed provider list --fields=format`
-    Then STDOUT should contain:
-      """
-      format
-      """
-    And STDOUT should not contain:
-      """
-      endpoint
-      """
-    And STDOUT should contain:
-      """
-      youtube\.com/watch.*
-      """
-    And STDOUT should not contain:
-      """
-      youtube.com
-      """
-
-    When I run `wp embed provider list --field=format`
-    Then STDOUT should not contain:
-      """
-      format
-      """
-    And STDOUT should not contain:
-      """
-      endpoint
-      """
-    And STDOUT should contain:
-      """
-      youtube\.com/watch.*
-      """
-    And STDOUT should not contain:
-      """
-      youtube.com
-      """
-
-    When I run `wp embed provider list --field=regex`
-    Then STDOUT should match /^(?:(?:1|0)\n)+$/
-
-  @require-wp-4.0
-  Scenario: Match an oEmbed provider
-    # Provider not requiring discovery
-    When I run `wp embed provider match https://www.youtube.com/watch?v=dQw4w9WgXcQ`
-    Then STDOUT should contain:
-      """
-      //www.youtube.com/oembed
-      """
-
-    # Provider requiring discovery
-    # Old versions of WP_oEmbed can trigger PHP "Only variables should be passed by reference" notices on discover so use "try" to cater for these.
-    When I try `wp embed provider match https://audio.com/audio-com/collections/ambient-focus`
-    And save STDOUT as {DEFAULT_STDOUT}
-    Then the return code should be 0
-    And STDERR should not contain:
-      """
-      Error:
-      """
-    And STDOUT should contain:
-      """
-      audio.com/
-      """
-    And STDOUT should contain:
-      """
-      json
-      """
-    And STDOUT should not contain:
-      """
-      xml
-      """
-
-    # Old versions of WP_oEmbed can trigger PHP "Only variables should be passed by reference" notices on discover so use "try" to cater for these.
-    When I try `wp embed provider match https://audio.com/audio-com/collections/ambient-focus --link-type=json`
-    Then the return code should be 0
-    And STDERR should not contain:
-      """
-      Error:
-      """
-    And STDOUT should be:
-      """
-      {DEFAULT_STDOUT}
-      """
-
-    # Old versions of WP_oEmbed can trigger PHP "Only variables should be passed by reference" notices on discover so use "try" to cater for these.
-    When I try `wp embed provider match https://audio.com/audio-com/collections/ambient-focus --link-type=xml`
-    Then the return code should be 0
-    And STDERR should not contain:
-      """
-      Error:
-      """
-    And STDOUT should not contain:
-      """
-      {DEFAULT_STDOUT}
-      """
-    And STDOUT should contain:
-      """
-      audio.com/
-      """
-    And STDOUT should contain:
-      """
-      xml
-      """
-    And STDOUT should not contain:
-      """
-      json
-      """
-
-  # Depends on `oembed_remote_get_args` filter introduced in WP 4.0 https://core.trac.wordpress.org/ticket/23442
-  @require-wp-4.0
-  Scenario: Discover a provider with limited response size
-    When I run `wp embed provider match https://audio.com/audio-com/collections/ambient-focus`
-    Then save STDOUT as {DEFAULT_STDOUT}
-
-    # Response limit too small
-    When I try `wp embed provider match https://audio.com/audio-com/collections/ambient-focus --limit-response-size=10`
-    Then the return code should be 1
-    And STDERR should be:
-      """
-      Error: No oEmbed provider found for given URL.
-      """
-
-    # Response limit big enough
-    When I run `wp embed provider match https://audio.com/audio-com/collections/ambient-focus --limit-response-size=50000`
-    Then STDOUT should be:
-      """
-      {DEFAULT_STDOUT}
-      """
-
-  Scenario: Fail to match an oEmbed provider
-    When I try `wp embed provider match https://www.example.com/watch?v=dQw4w9WgXcQ --no-discover`
-    Then the return code should be 1
-    And STDERR should be:
-      """
-      Error: No oEmbed provider found for given URL. Maybe try discovery?
-      """
-    And STDOUT should be empty
-
-    When I try `wp embed provider match https://www.example.com/watch?v=dQw4w9WgXcQ`
-    Then the return code should be 1
-    # Old versions of WP_oEmbed can trigger PHP "Only variables should be passed by reference" notices on discover so use "contain" to ignore these.
-    And STDERR should contain:
-      """
-      Error: No oEmbed provider found for given URL.
-      """
-    And STDOUT should be empty
-
-    When I try `wp embed provider match https://www.example.com/watch?v=dQw4w9WgXcQ --discover`
-    Then the return code should be 1
-    # Old versions of WP_oEmbed can trigger PHP "Only variables should be passed by reference" notices on discover so use "contain" to ignore these.
-    And STDERR should contain:
-      """
-      Error: No oEmbed provider found for given URL.
-      """
-    And STDOUT should be empty
-
-  @require-wp-4.0
-  Scenario: Only match an oEmbed provider if discover
-    When I try `wp embed provider match https://audio.com/audio-com/collections/ambient-focus --no-discover`
-    Then the return code should be 1
-    And STDERR should be:
-      """
-      Error: No oEmbed provider found for given URL. Maybe try discovery?
-      """
-    And STDOUT should be empty
-
-    # Old versions of WP_oEmbed can trigger PHP "Only variables should be passed by reference" notices on discover so use "try" to cater for these.
-    When I try `wp embed provider match https://audio.com/audio-com/collections/ambient-focus`
-    Then the return code should be 0
-    And STDERR should not contain:
-      """
-      Error:
-      """
-    And STDOUT should contain:
-      """
-      audio.com/
-      """
-    And STDOUT should contain:
-      """
-      collection
-      """
-
-    # Old versions of WP_oEmbed can trigger PHP "Only variables should be passed by reference" notices on discover so use "try" to cater for these.
-    When I try `wp embed provider match https://audio.com/audio-com/collections/ambient-focus --discover`
-    Then the return code should be 0
-    And STDERR should not contain:
-      """
-      Error:
-      """
-    And STDOUT should contain:
-      """
-      audio.com/
-      """
-
-  Scenario: Match custom oEmbed provider after registration
-    When I run `wp embed provider match http://example.com/foo --require=filter-providers.php`
-    Then STDOUT should be:
-      """
-      http://example.com/api/oembed.json
-      """
-
-  Scenario: Incompatible or wrong options
-    When I try `wp embed provider match https://www.example.com/watch?v=dQw4w9WgXcQ --no-discover --limit-response-size=50000`
-    Then the return code should be 1
-    And STDERR should be:
-      """
-      Error: The 'limit-response-size' option can only be used with discovery.
-      """
-    And STDOUT should be empty
-
-    When I try `wp embed provider match https://www.example.com/watch?v=dQw4w9WgXcQ --no-discover --link-type=json`
-    Then the return code should be 1
-    And STDERR should be:
-      """
-      Error: The 'link-type' option can only be used with discovery.
-      """
-    And STDOUT should be empty
-
-    When I try `wp embed provider match https://www.example.com/watch?v=dQw4w9WgXcQ --no-discover --limit-response-size=50000 --link-type=json`
-    Then the return code should be 1
-    And STDERR should be:
-      """
-      Error: The 'limit-response-size' and 'link-type' options can only be used with discovery.
-      """
-    And STDOUT should be empty
-
-    When I try `wp embed provider match https://www.example.com/watch?v=dQw4w9WgXcQ --no-discover --link-type=blah`
-    Then the return code should be 1
-    And STDERR should contain:
-      """
-      Error: Parameter errors:
-       Invalid value specified for 'link-type'
-      """
-    And STDOUT should be empty
diff --git a/features/cache.feature b/features/cache.feature
index 1924d19..c5f14e1 100644
--- a/features/cache.feature
+++ b/features/cache.feature
@@ -67,7 +67,6 @@ Feature: Manage oEmbed cache.
       """
     And the return code should be 0
 
-  @require-wp-4.9
   Scenario: Find oEmbed cache post ID for a non-existent key
     When I try `wp embed cache find foo`
     Then STDERR should be:
@@ -76,7 +75,6 @@ Feature: Manage oEmbed cache.
       """
     And the return code should be 1
 
-  @require-wp-4.9
   Scenario: Find oEmbed cache post ID for an existing key
     # Add a non-post embed, default attributes.
     When I run `wp eval 'echo $GLOBALS["wp_embed"]->run_shortcode( "[embed]https://www.youtube.com/watch?v=dQw4w9WgXcQ[/embed]" );'`
diff --git a/features/fetch.feature b/features/fetch.feature
index 68ef353..ad2ee80 100644
--- a/features/fetch.feature
+++ b/features/fetch.feature
@@ -3,7 +3,6 @@ Feature: Manage oEmbed fetch.
   Background:
     Given a WP install
 
-  @require-wp-4.0
   Scenario: Get HTML embed code for a given URL
     # Known provider not requiring discovery.
     When I run `wp embed fetch https://www.youtube.com/watch?v=dQw4w9WgXcQ --width=500`
@@ -77,8 +76,6 @@ Feature: Manage oEmbed fetch.
       <script
       """
 
-  # WP 4.9 always returns clickable link even for sanitized oEmbed responses.
-  @require-wp-4.9
   Scenario: Get HTML embed code for a given URL that requires discovery and is sanitized
     When I run `wp embed fetch https://app.ex.co/stories/item/8fb2343f-fa5d-48d4-8723-f8b5d51cc1a9`
     Then STDOUT should contain:
@@ -90,7 +87,6 @@ Feature: Manage oEmbed fetch.
       <a
       """
 
-  @require-wp-4.0
   Scenario: Get raw oEmbed data for a given URL
     When I run `wp embed fetch https://www.youtube.com/watch?v=dQw4w9WgXcQ --raw`
     And save STDOUT as {DEFAULT_STDOUT}
@@ -119,7 +115,6 @@ Feature: Manage oEmbed fetch.
       ceros.com
       """
 
-  @require-wp-4.0
   Scenario: Fail then succeed when given unknown discoverable provider for a raw request, depending on discover option
     When I try `wp embed fetch http://LearningApps.org/259 --raw --no-discover`
     # Old versions of WP_oEmbed can trigger PHP "Only variables should be passed by reference" notices on discovery so use "contain" to ignore these.
@@ -140,7 +135,6 @@ Feature: Manage oEmbed fetch.
       LearningApps.org
       """
 
-  @require-wp-4.0
   Scenario: Bails when no oEmbed provider is found for a raw request
     When I try `wp embed fetch https://foo.example.com --raw`
     # Old versions of WP_oEmbed can trigger PHP "Only variables should be passed by reference" notices on discovery so use "contain" to ignore these.
@@ -149,7 +143,6 @@ Feature: Manage oEmbed fetch.
       Error: No oEmbed provider found for given URL.
       """
 
-  @require-wp-4.0
   Scenario: Bails when no oEmbed provider is found for a raw request and discovery is off
     When I try `wp embed fetch https://foo.example.com --raw --discover=0`
     Then STDERR should be:
@@ -157,8 +150,6 @@ Feature: Manage oEmbed fetch.
       Error: No oEmbed provider found for given URL. Maybe try discovery?
       """
 
-  # WP 4.9 always returns clickable link.
-  @require-wp-4.9
   Scenario: Makes unknown URLs clickable
     When I run `wp embed fetch https://foo.example.com`
     Then STDOUT should contain:
@@ -166,7 +157,6 @@ Feature: Manage oEmbed fetch.
       <a href="https://foo.example.com">https://foo.example.com</a>
       """
 
-  @require-wp-4.0
   Scenario: Caches oEmbed response data for a given post
     # Note need post author for 'unfiltered_html' check to work for WP < 4.4.
     When I run `wp post create --post_title="Foo Bar" --post_author=1 --porcelain`
@@ -191,7 +181,6 @@ Feature: Manage oEmbed fetch.
       Success: Cleared oEmbed cache.
       """
 
-  @require-wp-4.0
   Scenario: Return data as XML when requested
     When I run `wp embed fetch https://www.youtube.com/watch?v=dQw4w9WgXcQ --raw-format=xml --raw`
     Then STDOUT should contain:
@@ -199,8 +188,6 @@ Feature: Manage oEmbed fetch.
       <type>video</type>
       """
 
-  # Depends on `oembed_remote_get_args` filter introduced WP 4.0 https://core.trac.wordpress.org/ticket/23442
-  @require-wp-4.0
   Scenario: Get embed code for a URL with limited response size
     # Need post_id for caching to work for WP < 4.9, and also post_author for caching to work for WP < 4.4 (due to 'unfiltered_html' check).
     When I run `wp post create --post_title="Foo Bar" --post_author=1 --porcelain`
@@ -246,8 +233,6 @@ Feature: Manage oEmbed fetch.
       {DEFAULT_STDOUT}
       """
 
-  # Same as above but without the post_id. WP >= 4.9 only
-  @require-wp-4.9
   Scenario: Get embed code for a URL with limited response size and post-less cache
     When I run `wp embed fetch https://www.youtube.com/watch?v=dQw4w9WgXcQ`
     And save STDOUT as {DEFAULT_STDOUT}
@@ -288,8 +273,6 @@ Feature: Manage oEmbed fetch.
       {DEFAULT_STDOUT}
       """
 
-  # Depends on `wp_filter_pre_oembed_result` filter introduced WP 4.5.3 https://core.trac.wordpress.org/ticket/36767
-  @require-wp-4.5.3
   Scenario: Fetch locally provided URL
     When I run `wp embed fetch http://example.com/?p=1`
     Then STDOUT should contain:
@@ -303,8 +286,6 @@ Feature: Manage oEmbed fetch.
       Hello world!
       """
 
-  # `wp_embed_handler_youtube` handler introduced WP 4.0.
-  @require-wp-4.0
   Scenario: Invoke built-in YouTube handler
     When I run `wp post create --post_title="Foo Bar" --porcelain`
     Then STDOUT should be a number
@@ -320,7 +301,6 @@ Feature: Manage oEmbed fetch.
       <iframe
       """
 
-  @require-wp-4.0
   Scenario: Invoke built-in audio handler
     When I run `wp post create --post_title="Foo Bar" --porcelain`
     Then STDOUT should be a number
@@ -346,7 +326,6 @@ Feature: Manage oEmbed fetch.
       <audio
       """
 
-  @require-wp-4.0
   Scenario: Invoke built-in video handler
     When I run `wp post create --post_title="Foo Bar" --porcelain`
     Then STDOUT should be a number
@@ -372,7 +351,6 @@ Feature: Manage oEmbed fetch.
       <video
       """
 
-  @require-wp-4.0
   Scenario: Incompatible options
     When I try `wp embed fetch https://www.example.com/watch?v=dQw4w9WgXcQ --no-discover --limit-response-size=50000`
     Then the return code should be 1
diff --git a/features/provider.feature b/features/provider.feature
index 6615048..b85d407 100644
--- a/features/provider.feature
+++ b/features/provider.feature
@@ -127,8 +127,25 @@ Feature: Manage oEmbed providers.
     When I run `wp embed provider list --field=regex`
     Then STDOUT should match /^(?:(?:1|0)\n)+$/
 
-  @require-wp-4.0
   Scenario: Match an oEmbed provider
+    # Mock the audio.com URL to return HTML with oEmbed discovery links
+    Given that HTTP requests to https://audio.com/audio-com/collections/ambient-focus will respond with:
+      """
+      HTTP/1.1 200
+      Content-Type: text/html
+
+      <!DOCTYPE html>
+      <html>
+      <head>
+        <link rel="alternate" type="application/json+oembed" href="https://audio.com/oembed?format=json&url=https%3A%2F%2Faudio.com%2Faudio-com%2Fcollections%2Fambient-focus" title="Ambient Focus Collection">
+        <link rel="alternate" type="text/xml+oembed" href="https://audio.com/oembed?format=xml&url=https%3A%2F%2Faudio.com%2Faudio-com%2Fcollections%2Fambient-focus" title="Ambient Focus Collection">
+      </head>
+      <body>
+        <h1>Ambient Focus Collection</h1>
+      </body>
+      </html>
+      """
+
     # Provider not requiring discovery
     When I run `wp embed provider match https://www.youtube.com/watch?v=dQw4w9WgXcQ`
     Then STDOUT should contain:
@@ -194,14 +211,12 @@ Feature: Manage oEmbed providers.
       json
       """
 
-  # Depends on `oembed_remote_get_args` filter introduced in WP 4.0 https://core.trac.wordpress.org/ticket/23442
-  @require-wp-4.0
   Scenario: Discover a provider with limited response size
-    When I run `wp embed provider match https://audio.com/audio-com/collections/ambient-focus`
+    When I run `wp embed provider match https://developer.wordpress.org/news/`
     Then save STDOUT as {DEFAULT_STDOUT}
 
     # Response limit too small
-    When I try `wp embed provider match https://audio.com/audio-com/collections/ambient-focus --limit-response-size=10`
+    When I try `wp embed provider match https://developer.wordpress.org/news/ --limit-response-size=10`
     Then the return code should be 1
     And STDERR should be:
       """
@@ -209,7 +224,7 @@ Feature: Manage oEmbed providers.
       """
 
     # Response limit big enough
-    When I run `wp embed provider match https://audio.com/audio-com/collections/ambient-focus --limit-response-size=50000`
+    When I run `wp embed provider match https://developer.wordpress.org/news/ --limit-response-size=50000`
     Then STDOUT should be:
       """
       {DEFAULT_STDOUT}
@@ -242,8 +257,25 @@ Feature: Manage oEmbed providers.
       """
     And STDOUT should be empty
 
-  @require-wp-4.0
   Scenario: Only match an oEmbed provider if discover
+    # Mock the audio.com URL to return HTML with oEmbed discovery links
+    Given that HTTP requests to https://audio.com/audio-com/collections/ambient-focus will respond with:
+      """
+      HTTP/1.1 200
+      Content-Type: text/html
+
+      <!DOCTYPE html>
+      <html>
+      <head>
+        <link rel="alternate" type="application/json+oembed" href="https://audio.com/oembed?format=json&url=https%3A%2F%2Faudio.com%2Faudio-com%2Fcollections%2Fambient-focus" title="Ambient Focus Collection">
+        <link rel="alternate" type="text/xml+oembed" href="https://audio.com/oembed?format=xml&url=https%3A%2F%2Faudio.com%2Faudio-com%2Fcollections%2Fambient-focus" title="Ambient Focus Collection">
+      </head>
+      <body>
+        <h1>Ambient Focus Collection</h1>
+      </body>
+      </html>
+      """
+
     When I try `wp embed provider match https://audio.com/audio-com/collections/ambient-focus --no-discover`
     Then the return code should be 1
     And STDERR should be:
@@ -280,6 +312,13 @@ Feature: Manage oEmbed providers.
      audio.com/
       """
 
+  Scenario: Match custom oEmbed provider after registration
+    When I run `wp embed provider match http://example.com/foo --require=filter-providers.php`
+    Then STDOUT should be:
+      """
+      http://example.com/api/oembed.json
+      """
+
   Scenario: Incompatible or wrong options
     When I try `wp embed provider match https://www.example.com/watch?v=dQw4w9WgXcQ --no-discover --limit-response-size=50000`
     Then the return code should be 1