diff --git a/includes/class-amp-theme-support.php b/includes/class-amp-theme-support.php
index cfb180bde66..595037e02e2 100644
--- a/includes/class-amp-theme-support.php
+++ b/includes/class-amp-theme-support.php
@@ -6,6 +6,7 @@
  */
 
 use AmpProject\Amp;
+use AmpProject\AmpWP\Embed\Registerable;
 use AmpProject\AmpWP\Option;
 use AmpProject\AmpWP\RemoteRequest\CachedRemoteGetRequest;
 use AmpProject\AmpWP\ConfigurationArgument;
@@ -1179,8 +1180,9 @@ public static function register_content_embed_handlers() {
 				);
 				continue;
 			}
-
-			$embed_handler->register_embed();
+			if ( $embed_handler instanceof Registerable ) {
+				$embed_handler->register_embed();
+			}
 			$embed_handlers[] = $embed_handler;
 		}
 
diff --git a/includes/embeds/class-amp-base-embed-handler.php b/includes/embeds/class-amp-base-embed-handler.php
index 77f86b83d79..6d35e315cd8 100644
--- a/includes/embeds/class-amp-base-embed-handler.php
+++ b/includes/embeds/class-amp-base-embed-handler.php
@@ -7,6 +7,8 @@
  * @package  AMP
  */
 
+use AmpProject\Dom\Document;
+
 /**
  * Class AMP_Base_Embed_Handler
  */
@@ -40,14 +42,18 @@ abstract class AMP_Base_Embed_Handler {
 	protected $did_convert_elements = false;
 
 	/**
-	 * Registers embed.
+	 * Default AMP tag to be used when sanitizing embeds.
+	 *
+	 * @var string
 	 */
-	abstract public function register_embed();
+	protected $amp_tag = 'amp-iframe';
 
 	/**
-	 * Unregisters embed.
+	 * Base URL used for identifying embeds.
+	 *
+	 * @var string
 	 */
-	abstract public function unregister_embed();
+	protected $base_embed_url = '';
 
 	/**
 	 * Constructor.
@@ -64,6 +70,56 @@ public function __construct( $args = [] ) {
 		);
 	}
 
+	/**
+	 * Sanitize all embeds on the page to be AMP compatible.
+	 *
+	 * @param Document $dom DOM.
+	 */
+	public function sanitize_raw_embeds( Document $dom ) {
+		$nodes = $this->get_raw_embed_nodes( $dom );
+
+		if ( null === $nodes ) {
+			// Bail if the embed handler returns null.
+			return;
+		}
+
+		if ( 0 === $nodes->length ) {
+			return;
+		}
+
+		foreach ( $nodes as $node ) {
+			if ( ! $this->is_raw_embed( $node ) ) {
+				continue;
+			}
+			$this->sanitize_raw_embed( $node );
+		}
+	}
+
+	/**
+	 * Determine if the node is indeed a raw embed.
+	 *
+	 * @param DOMElement $node DOM element.
+	 * @return bool True if it is a raw embed, false otherwise.
+	 */
+	protected function is_raw_embed( DOMElement $node ) {
+		return $node->parentNode && $this->amp_tag !== $node->parentNode->nodeName;
+	}
+
+	/**
+	 * Get all raw embeds from the DOM.
+	 *
+	 * @param Document $dom Document.
+	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
+	 */
+	abstract protected function get_raw_embed_nodes( Document $dom );
+
+	/**
+	 * Make embed AMP compatible.
+	 *
+	 * @param DOMElement $node DOM element.
+	 */
+	abstract protected function sanitize_raw_embed( DOMElement $node );
+
 	/**
 	 * Get mapping of AMP component names to AMP script URLs.
 	 *
@@ -107,4 +163,90 @@ function ( $attr_name ) {
 		}
 		return wp_array_slice_assoc( $matches, $attribute_names );
 	}
+
+	/**
+	 * Get all child elements of the specified element.
+	 *
+	 * @param DOMElement $node Element.
+	 * @return DOMElement[] Array of child elements for specified element.
+	 */
+	protected function get_child_elements( DOMElement $node ) {
+		return array_filter(
+			iterator_to_array( $node->childNodes ),
+			static function ( DOMNode $child ) {
+				return $child instanceof DOMElement;
+			}
+		);
+	}
+
+	/**
+	 * Replace the node's parent with itself if the parent is a <p> tag, has no attributes and has no other children.
+	 * This usually happens while `wpautop()` processes the element.
+	 *
+	 * @since 1.6
+	 *
+	 * @param DOMElement $node Node.
+	 */
+	protected function unwrap_p_element( DOMElement $node ) {
+		$parent_node = $node->parentNode;
+		while ( $parent_node && ! ( $parent_node instanceof DOMElement ) ) {
+			$parent_node = $parent_node->parentNode;
+		}
+
+		if ( $parent_node instanceof DOMElement && 'p' === $parent_node->nodeName && false === $parent_node->hasAttributes() ) {
+			$child_element_count = count( $this->get_child_elements( $parent_node ) );
+			if ( 1 === $child_element_count ) {
+				$parent_node->parentNode->replaceChild( $node, $parent_node );
+			}
+		}
+	}
+
+	/**
+	 * Removes the node's nearest <script> sibling with a `src` attribute containing the base `src` URL provided.
+	 *
+	 * @since 1.6
+	 *
+	 * @param DOMElement $node         The DOMNode to whose sibling is the script to be removed.
+	 * @param string     $base_src_url Script URL to match against.
+	 * @param string     $content      Text content of node to match against.
+	 * @param bool       $is_next_to   Whether the script sibling is next or preceding the specified element.
+	 */
+	protected function remove_script_sibling( DOMElement $node, $base_src_url, $content = '', $is_next_to = true ) {
+		$sibling_location = $is_next_to ? 'nextSibling' : 'previousSibling';
+		$element_sibling  = $node->{$sibling_location};
+
+		while ( $element_sibling && ! ( $element_sibling instanceof DOMElement ) ) {
+			$element_sibling = $element_sibling->{$sibling_location};
+		}
+
+		// Handle case where script is wrapped in paragraph by wpautop.
+		if ( $element_sibling instanceof DOMElement && 'p' === $element_sibling->nodeName ) {
+			$children_elements = array_values( $this->get_child_elements( $element_sibling ) );
+
+			if (
+				1 === count( $children_elements ) &&
+				'script' === $children_elements[0]->nodeName &&
+				(
+					( $base_src_url && false !== strpos( $children_elements[0]->getAttribute( 'src' ), $base_src_url ) ) ||
+					( $content && false !== strpos( $children_elements[0]->textContent, $content ) )
+				)
+			) {
+				$element_sibling->parentNode->removeChild( $element_sibling );
+				return;
+			}
+		}
+
+		// Handle case where script is immediately following.
+		$is_embed_script = (
+			$element_sibling instanceof DOMElement &&
+			'script' === strtolower( $element_sibling->nodeName ) &&
+			(
+				( $base_src_url && false !== strpos( $element_sibling->getAttribute( 'src' ), $base_src_url ) ) ||
+				( $content && false !== strpos( $element_sibling->textContent, $content ) )
+			)
+		);
+		if ( $is_embed_script ) {
+			$element_sibling->parentNode->removeChild( $element_sibling );
+		}
+	}
 }
diff --git a/includes/embeds/class-amp-core-block-handler.php b/includes/embeds/class-amp-core-block-handler.php
index 94de522b13a..161562416d4 100644
--- a/includes/embeds/class-amp-core-block-handler.php
+++ b/includes/embeds/class-amp-core-block-handler.php
@@ -5,6 +5,7 @@
  * @package AMP
  */
 
+use AmpProject\AmpWP\Embed\Registerable;
 use AmpProject\Attribute;
 use AmpProject\Dom\Document;
 
@@ -13,7 +14,7 @@
  *
  * @since 1.0
  */
-class AMP_Core_Block_Handler extends AMP_Base_Embed_Handler {
+class AMP_Core_Block_Handler extends AMP_Base_Embed_Handler implements Registerable {
 
 	/**
 	 * Attribute to store the original width on a video or iframe just before WordPress removes it.
@@ -355,4 +356,22 @@ private function process_text_widgets( Document $dom ) {
 			}
 		}
 	}
+
+	/**
+	 * Get all raw embeds from the DOM.
+	 *
+	 * @param Document $dom Document.
+	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
+	 */
+	protected function get_raw_embed_nodes( Document $dom ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+		return null;
+	}
+
+	/**
+	 * Make embed AMP compatible.
+	 *
+	 * @param DOMElement $node DOM element.
+	 */
+	protected function sanitize_raw_embed( DOMElement $node ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+	}
 }
diff --git a/includes/embeds/class-amp-crowdsignal-embed-handler.php b/includes/embeds/class-amp-crowdsignal-embed-handler.php
index f243bed4625..23adc3899d9 100644
--- a/includes/embeds/class-amp-crowdsignal-embed-handler.php
+++ b/includes/embeds/class-amp-crowdsignal-embed-handler.php
@@ -8,59 +8,128 @@
  * @since 1.2
  */
 
+use AmpProject\AmpWP\Embed\Registerable;
+use AmpProject\Dom\Document;
+
 /**
  * Class AMP_Crowdsignal_Embed_Handler
  */
-class AMP_Crowdsignal_Embed_Handler extends AMP_Base_Embed_Handler {
+class AMP_Crowdsignal_Embed_Handler extends AMP_Base_Embed_Handler implements Registerable {
 
 	/**
-	 * Register embed.
+	 * Register the embed.
+	 *
+	 * @return void
 	 */
 	public function register_embed() {
-		add_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10, 3 );
+		if ( version_compare( get_bloginfo( 'version' ), '5.2', '>=' ) ) {
+			return;
+		}
+
+		// The oEmbed providers for CrowdSignal embeds are outdated on WP < 5.1. Updating the providers here will
+		// allow for the oEmbed HTML to be fetched, and can then sanitized later below.
+		$formats = [
+			'#https?://(.+\.)?polldaddy\.com/.*#i',
+			'#https?://poll\.fm/.*#i',
+			'#https?://(.+\.)?survey\.fm/.*#i', // Not available on WP 5.2.
+		];
+
+		foreach ( $formats as $format ) {
+			wp_oembed_add_provider( $format, 'https://api.crowdsignal.com/oembed', true );
+		}
 	}
 
 	/**
-	 * Unregister embed.
+	 * Unregister the embed.
+	 *
+	 * @return void
 	 */
 	public function unregister_embed() {
-		remove_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10 );
 	}
 
 	/**
-	 * Filter oEmbed HTML for Crowdsignal for AMP output.
+	 * Get all raw embeds from the DOM.
 	 *
-	 * @param string $cache Cache for oEmbed.
-	 * @param string $url   Embed URL.
-	 * @param array  $attr  Shortcode attributes.
-	 * @return string Embed.
+	 * @param Document $dom Document.
+	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
-	public function filter_embed_oembed_html( $cache, $url, $attr ) {
-		$parsed_url = wp_parse_url( $url );
-		if ( empty( $parsed_url['host'] ) || empty( $parsed_url['path'] ) || ! preg_match( '#(^|\.)(?P<host>polldaddy\.com|crowdsignal\.com|survey\.fm|poll\.fm)#', $parsed_url['host'], $matches ) ) {
-			return $cache;
-		}
+	protected function get_raw_embed_nodes( Document $dom ) {
+		$queries = [
+			// For poll embeds.
+			'//iframe[ @class="cs-iframe-embed" and starts-with( @src, "https://poll.fm/" ) ]',
+			// For survey embeds.
+			'//div[ @class="pd-embed" and @data-settings ]',
+		];
 
-		$parsed_url['host'] = $matches['host'];
+		return $dom->xpath->query( implode( ' | ', $queries ) );
+	}
 
-		$output = '';
+	/**
+	 * Make embed AMP compatible.
+	 *
+	 * @param DOMElement $node DOM element.
+	 */
+	protected function sanitize_raw_embed( DOMElement $node ) {
+		$is_poll = 'cs-iframe-embed' === $node->getAttribute( 'class' );
 
-		// Poll oEmbed responses include noscript which can be used as the AMP response.
-		if ( preg_match( '#<noscript>(.+?)</noscript>#s', $cache, $matches ) ) {
-			$output = $matches[1];
+		if ( $is_poll ) {
+			$this->sanitize_poll_embed( $node );
+		} else {
+			$this->sanitize_survey_embed( $node );
 		}
+	}
 
-		if ( empty( $output ) ) {
-			if ( ! empty( $attr['title'] ) ) {
-				$name = $attr['title'];
-			} elseif ( 'survey.fm' === $parsed_url['host'] || preg_match( '#^/s/#', $parsed_url['path'] ) ) {
-				$name = __( 'View Survey', 'amp' );
-			} else {
-				$name = __( 'View Poll', 'amp' );
-			}
-			$output = sprintf( '<a href="%s" target="_blank">%s</a>', esc_url( $url ), esc_html( $name ) );
+	/**
+	 * Sanitize poll embed.
+	 *
+	 * @param DOMElement $node Poll embed.
+	 */
+	private function sanitize_poll_embed( DOMElement $node ) {
+		// Replace the `noscript` parent element with the iframe.
+		$node->parentNode->parentNode->replaceChild( $node, $node->parentNode );
+
+		$this->unwrap_p_element( $node );
+		$this->remove_script_sibling( $node, 'https://secure.polldaddy.com', '', false );
+	}
+
+	/**
+	 * Sanitize survey embed.
+	 *
+	 * @param DOMElement $node Survey embed.
+	 */
+	private function sanitize_survey_embed( DOMElement $node ) {
+		$settings = json_decode( $node->getAttribute( 'data-settings' ), false );
+
+		// We can't form the iframe URL without a domain and survey ID.
+		if ( ! ( property_exists( $settings, 'domain' ) || property_exists( $settings, 'id' ) ) ) {
+			return;
 		}
 
-		return $output;
+		// Logic for building the iframe `src` can be found in https://polldaddy.com/survey.js.
+		$iframe_src = sprintf(
+			'https://%s/%s?%s',
+			$settings->domain,
+			$settings->id,
+			property_exists( $settings, 'auto' ) && $settings->auto ? 'ft=1&iframe=' . amp_get_current_url() : 'iframe=1'
+		);
+
+		$iframe_node = AMP_DOM_Utils::create_node(
+			Document::fromNode( $node ),
+			'iframe',
+			[
+				'src'               => $iframe_src,
+				'layout'            => 'responsive',
+				'width'             => 600,
+				'height'            => 600,
+				'frameborder'       => 0,
+				'scrolling'         => 'no',
+				'allowtransparency' => 'true',
+				'sandbox'           => 'allow-scripts allow-same-origin',
+			]
+		);
+
+		$this->remove_script_sibling( $node, null, 'https://polldaddy.com/survey.js' );
+
+		$node->parentNode->replaceChild( $iframe_node, $node );
 	}
 }
diff --git a/includes/embeds/class-amp-dailymotion-embed-handler.php b/includes/embeds/class-amp-dailymotion-embed-handler.php
index 40add350f89..9b9204534b5 100644
--- a/includes/embeds/class-amp-dailymotion-embed-handler.php
+++ b/includes/embeds/class-amp-dailymotion-embed-handler.php
@@ -5,6 +5,8 @@
  * @package AMP
  */
 
+use AmpProject\Dom\Document;
+
 /**
  * Class AMP_DailyMotion_Embed_Handler
  *
@@ -12,8 +14,12 @@
  */
 class AMP_DailyMotion_Embed_Handler extends AMP_Base_Embed_Handler {
 
-	const URL_PATTERN = '#https?:\/\/(www\.)?dailymotion\.com\/video\/.*#i';
-	const RATIO       = 0.5625;
+	/**
+	 * The 16:9 aspect ratio in decimal form.
+	 *
+	 * @var float
+	 */
+	const RATIO = 0.5625;
 
 	/**
 	 * Default width.
@@ -29,6 +35,20 @@ class AMP_DailyMotion_Embed_Handler extends AMP_Base_Embed_Handler {
 	 */
 	protected $DEFAULT_HEIGHT = 338;
 
+	/**
+	 * Default AMP tag to be used when sanitizing embeds.
+	 *
+	 * @var string
+	 */
+	protected $amp_tag = 'amp-dailymotion';
+
+	/**
+	 * Base URL used for identifying embeds.
+	 *
+	 * @var string
+	 */
+	protected $base_embed_url = 'https://www.dailymotion.com/embed/video/';
+
 	/**
 	 * AMP_DailyMotion_Embed_Handler constructor.
 	 *
@@ -45,89 +65,51 @@ public function __construct( $args = [] ) {
 	}
 
 	/**
-	 * Register embed.
-	 */
-	public function register_embed() {
-		wp_embed_register_handler( 'amp-dailymotion', self::URL_PATTERN, [ $this, 'oembed' ], -1 );
-	}
-
-	/**
-	 * Unregister embed.
-	 */
-	public function unregister_embed() {
-		wp_embed_unregister_handler( 'amp-dailymotion', -1 );
-	}
-
-	/**
-	 * Render oEmbed.
+	 * Get all raw embeds from the DOM.
 	 *
-	 * @see \WP_Embed::shortcode()
-	 *
-	 * @param array  $matches URL pattern matches.
-	 * @param array  $attr    Shortcode attributes.
-	 * @param string $url     URL.
-	 * @param string $rawattr Unmodified shortcode attributes.
-	 * @return string Rendered oEmbed.
+	 * @param Document $dom Document.
+	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
-	public function oembed( $matches, $attr, $url, $rawattr ) {
-		$video_id = $this->get_video_id_from_url( $url );
-		return $this->render(
-			[
-				'video_id' => $video_id,
-			]
-		);
+	protected function get_raw_embed_nodes( Document $dom ) {
+		return $dom->xpath->query( sprintf( '//iframe[ starts-with( @src, "%s" ) ]', $this->base_embed_url ) );
 	}
 
 	/**
-	 * Render.
+	 * Make embed AMP compatible.
 	 *
-	 * @param array $args Args.
-	 * @return string Rendered.
+	 * @param DOMElement $node DOM element.
 	 */
-	public function render( $args ) {
-		$args = wp_parse_args(
-			$args,
-			[
-				'video_id' => false,
-			]
-		);
+	protected function sanitize_raw_embed( DOMElement $node ) {
+		$iframe_src = $node->getAttribute( 'src' );
 
-		if ( empty( $args['video_id'] ) ) {
-			return AMP_HTML_Utils::build_tag(
-				'a',
-				[
-					'href'  => esc_url_raw( $args['url'] ),
-					'class' => 'amp-wp-embed-fallback',
-				],
-				esc_html( $args['url'] )
-			);
+		$video_id = strtok( substr( $iframe_src, strlen( $this->base_embed_url ) ), '/?#' );
+		if ( empty( $video_id ) ) {
+			return;
 		}
 
-		$this->did_convert_elements = true;
+		$attributes = [
+			'data-videoid' => $video_id,
+			'layout'       => 'responsive',
+			'width'        => $this->args['width'],
+			'height'       => $this->args['height'],
+		];
 
-		return AMP_HTML_Utils::build_tag(
-			'amp-dailymotion',
-			[
-				'data-videoid' => $args['video_id'],
-				'layout'       => 'responsive',
-				'width'        => $this->args['width'],
-				'height'       => $this->args['height'],
-			]
+		if ( $node->hasAttribute( 'width' ) ) {
+			$attributes['width'] = $node->getAttribute( 'width' );
+		}
+
+		if ( $node->hasAttribute( 'height' ) ) {
+			$attributes['height'] = $node->getAttribute( 'height' );
+		}
+
+		$amp_node = AMP_DOM_Utils::create_node(
+			Document::fromNode( $node ),
+			$this->amp_tag,
+			$attributes
 		);
-	}
 
-	/**
-	 * Determine the video ID from the URL.
-	 *
-	 * @param string $url URL.
-	 * @return string Video ID.
-	 */
-	private function get_video_id_from_url( $url ) {
-		$parsed_url = wp_parse_url( $url );
-		parse_str( $parsed_url['path'], $path );
-		$tok = explode( '/', $parsed_url['path'] );
-		$tok = explode( '_', $tok[2] );
+		$this->unwrap_p_element( $node );
 
-		return $tok[0];
+		$node->parentNode->replaceChild( $amp_node, $node );
 	}
 }
diff --git a/includes/embeds/class-amp-facebook-embed-handler.php b/includes/embeds/class-amp-facebook-embed-handler.php
index 1a6bb7c6788..2619024f906 100644
--- a/includes/embeds/class-amp-facebook-embed-handler.php
+++ b/includes/embeds/class-amp-facebook-embed-handler.php
@@ -19,68 +19,123 @@ class AMP_Facebook_Embed_Handler extends AMP_Base_Embed_Handler {
 	protected $DEFAULT_HEIGHT = 400;
 
 	/**
-	 * Tag.
+	 * Default AMP tag to be used when sanitizing embeds.
 	 *
-	 * @var string embed HTML blockquote tag to identify and replace with AMP version.
+	 * @var string
 	 */
-	protected $sanitize_tag = 'div';
+	protected $amp_tag = 'amp-facebook';
 
 	/**
-	 * Tag.
+	 * Sanitize all embeds on the page to be AMP compatible.
 	 *
-	 * @var string AMP amp-facebook tag
+	 * @param Document $dom DOM.
 	 */
-	private $amp_tag = 'amp-facebook';
+	public function sanitize_raw_embeds( Document $dom ) {
+		$nodes = $this->get_raw_embed_nodes( $dom );
 
-	/**
-	 * Registers embed.
-	 */
-	public function register_embed() {
-		// Not implemented.
+		if ( 0 < $nodes->length ) {
+			foreach ( $nodes as $node ) {
+				if ( ! $this->is_raw_embed( $node ) ) {
+					continue;
+				}
+				$this->sanitize_raw_embed( $node );
+			}
+
+			$this->remove_fb_root_nodes( $dom );
+		}
 	}
 
 	/**
-	 * Unregisters embed.
+	 * Get all raw embeds from the DOM.
+	 *
+	 * @param Document $dom Document.
+	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
-	public function unregister_embed() {
-		// Not implemented.
+	protected function get_raw_embed_nodes( Document $dom ) {
+		return $dom->getElementsByTagName( 'div' );
 	}
 
 	/**
-	 * Sanitized <div class="fb-video" data-href=> tags to <amp-facebook>.
+	 * Make embed AMP compatible.
 	 *
-	 * @param Document $dom DOM.
+	 * @param DOMElement $node DOM element.
 	 */
-	public function sanitize_raw_embeds( Document $dom ) {
-		$nodes     = $dom->getElementsByTagName( $this->sanitize_tag );
-		$num_nodes = $nodes->length;
+	protected function sanitize_raw_embed( DOMElement $node ) {
+		$embed_type = $this->get_embed_type( $node );
 
-		if ( 0 === $num_nodes ) {
+		if ( null === $embed_type ) {
 			return;
 		}
 
-		for ( $i = $num_nodes - 1; $i >= 0; $i-- ) {
-			$node = $nodes->item( $i );
-			if ( ! $node instanceof DOMElement ) {
-				continue;
+		$attributes = [
+			'data-amp-layout' => 'responsive',
+			'width'           => $node->hasAttribute( 'data-width' ) ? $node->getAttribute( 'data-width' ) : $this->DEFAULT_WIDTH,
+			'height'          => $node->hasAttribute( 'data-height' ) ? $node->getAttribute( 'data-height' ) : $this->DEFAULT_HEIGHT,
+		];
+
+		$node->removeAttribute( 'data-width' );
+		$node->removeAttribute( 'data-height' );
+
+		foreach ( $node->attributes as $attribute ) {
+			if ( 'data-' === substr( $attribute->nodeName, 0, 5 ) ) {
+				$attributes[ $attribute->nodeName ] = $attribute->nodeValue;
 			}
+		}
 
-			$embed_type = $this->get_embed_type( $node );
+		if ( 'page' === $embed_type ) {
+			$amp_tag = 'amp-facebook-page';
+		} elseif ( 'like' === $embed_type ) {
+			$amp_tag = 'amp-facebook-like';
+		} elseif ( 'comments' === $embed_type ) {
+			$amp_tag = 'amp-facebook-comments';
+		} else {
+			$amp_tag                     = $this->amp_tag;
+			$attributes['data-embed-as'] = $embed_type;
+		}
+
+		$amp_facebook_node = AMP_DOM_Utils::create_node(
+			Document::fromNode( $node ),
+			$amp_tag,
+			$attributes
+		);
 
-			if ( null !== $embed_type ) {
-				$this->create_amp_facebook_and_replace_node( $dom, $node, $embed_type );
+		$fallback = null;
+		foreach ( $node->childNodes as $child_node ) {
+			if ( $child_node instanceof DOMElement && false !== strpos( $child_node->getAttribute( 'class' ), 'fb-xfbml-parse-ignore' ) ) {
+				$fallback = $child_node;
+				$child_node->parentNode->removeChild( $child_node );
+				$fallback->setAttribute( 'fallback', '' );
+				break;
 			}
 		}
 
-		/*
-		 * Remove the fb-root div and the Facebook Connect JS script since irrelevant.
-		 * <div id="fb-root"></div>
-		 * <script async defer crossorigin="anonymous" src="https://connect.facebook.net/en_US/sdk.js#xfbml=1&version=v3.2"></script>
-		 */
-		$fb_root = $dom->getElementById( 'fb-root' );
-		if ( $fb_root ) {
-			$script_elements = $dom->xpath->query( '//script[ starts-with( @src, "https://connect.facebook.net" ) and contains( @src, "sdk.js" ) ]' );
-			foreach ( $script_elements as $script ) {
+		$node->parentNode->replaceChild( $amp_facebook_node, $node );
+		if ( $fallback ) {
+			$amp_facebook_node->appendChild( $fallback );
+		}
+
+		$this->did_convert_elements = true;
+	}
+
+	/**
+	 * Remove instances of the `fb-root` div element and its accompanied Facebook Connect JS script since they would be irrelevant.
+	 *
+	 * @param Document $dom DOM.
+	 */
+	private function remove_fb_root_nodes( Document $dom ) {
+		$fb_root_query = $dom->xpath->query( '//div[ @id = "fb-root" ]' );
+
+		if ( 0 < $fb_root_query->length ) {
+			// Remove instances of <div id="fb-root">.
+			foreach ( $fb_root_query as $fb_root ) {
+				$fb_root->parentNode->removeChild( $fb_root );
+			}
+
+			// Remove instances of the accompanied script.
+			$script_query = $dom->xpath->query( '//script[ starts-with( @src, "https://connect.facebook.net" ) and contains( @src, "sdk.js" ) ]' );
+
+			foreach ( $script_query as $script ) {
+				/** @var DOMElement $parent_node */
 				$parent_node = $script->parentNode;
 				$parent_node->removeChild( $script );
 
@@ -89,12 +144,6 @@ public function sanitize_raw_embeds( Document $dom ) {
 					$parent_node->parentNode->removeChild( $parent_node );
 				}
 			}
-
-			// Remove other instances of <div id="fb-root">.
-			$fb_root_elements = $dom->xpath->query( '//div[ @id = "fb-root" ]' );
-			foreach ( $fb_root_elements as $fb_root ) {
-				$fb_root->parentNode->removeChild( $fb_root );
-			}
 		}
 	}
 
@@ -136,66 +185,4 @@ private function get_embed_type( DOMElement $node ) {
 
 		return null;
 	}
-
-	/**
-	 * Create amp-facebook and replace node.
-	 *
-	 * @param Document   $dom        The HTML Document.
-	 * @param DOMElement $node       The DOMNode to adjust and replace.
-	 * @param string     $embed_type Embed type.
-	 */
-	private function create_amp_facebook_and_replace_node( Document $dom, DOMElement $node, $embed_type ) {
-
-		$attributes = [
-			// The layout sanitizer will convert this to `layout` when being sanitized.
-			// The data attribute needs to be used so that the layout sanitizer will process it.
-			'data-amp-layout' => 'responsive',
-			'width'           => $node->hasAttribute( 'data-width' ) ? $node->getAttribute( 'data-width' ) : $this->DEFAULT_WIDTH,
-			'height'          => $node->hasAttribute( 'data-height' ) ? $node->getAttribute( 'data-height' ) : $this->DEFAULT_HEIGHT,
-		];
-
-		$node->removeAttribute( 'data-width' );
-		$node->removeAttribute( 'data-height' );
-
-		foreach ( $node->attributes as $attribute ) {
-			if ( 'data-' === substr( $attribute->nodeName, 0, 5 ) ) {
-				$attributes[ $attribute->nodeName ] = $attribute->nodeValue;
-			}
-		}
-
-		if ( 'page' === $embed_type ) {
-			$amp_tag = 'amp-facebook-page';
-		} elseif ( 'like' === $embed_type ) {
-			$amp_tag = 'amp-facebook-like';
-		} elseif ( 'comments' === $embed_type ) {
-			$amp_tag = 'amp-facebook-comments';
-		} else {
-			$amp_tag = $this->amp_tag;
-
-			$attributes['data-embed-as'] = $embed_type;
-		}
-
-		$amp_facebook_node = AMP_DOM_Utils::create_node(
-			$dom,
-			$amp_tag,
-			$attributes
-		);
-
-		$fallback = null;
-		foreach ( $node->childNodes as $child_node ) {
-			if ( $child_node instanceof DOMElement && false !== strpos( $child_node->getAttribute( 'class' ), 'fb-xfbml-parse-ignore' ) ) {
-				$fallback = $child_node;
-				$child_node->parentNode->removeChild( $child_node );
-				$fallback->setAttribute( 'fallback', '' );
-				break;
-			}
-		}
-
-		$node->parentNode->replaceChild( $amp_facebook_node, $node );
-		if ( $fallback ) {
-			$amp_facebook_node->appendChild( $fallback );
-		}
-
-		$this->did_convert_elements = true;
-	}
 }
diff --git a/includes/embeds/class-amp-gallery-embed-handler.php b/includes/embeds/class-amp-gallery-embed-handler.php
index 875ad3e793a..fe097637af0 100644
--- a/includes/embeds/class-amp-gallery-embed-handler.php
+++ b/includes/embeds/class-amp-gallery-embed-handler.php
@@ -5,6 +5,7 @@
  * @package AMP
  */
 
+use AmpProject\AmpWP\Embed\Registerable;
 use AmpProject\Dom\Document;
 use AmpProject\AmpWP\Dom\ElementList;
 use AmpProject\AmpWP\Component\Carousel;
@@ -14,7 +15,7 @@
  *
  * @since 0.2
  */
-class AMP_Gallery_Embed_Handler extends AMP_Base_Embed_Handler {
+class AMP_Gallery_Embed_Handler extends AMP_Base_Embed_Handler implements Registerable {
 
 	/**
 	 * Register embed.
@@ -220,7 +221,7 @@ public function render( $args ) {
 
 		$images = new ElementList();
 		foreach ( $args['images'] as $props ) {
-			$image_atts = [
+			$image_attrs = [
 				'src'    => $props['url'],
 				'width'  => $props['width'],
 				'height' => $props['height'],
@@ -228,16 +229,16 @@ public function render( $args ) {
 				'alt'    => $props['alt'],
 			];
 			if ( ! empty( $props['srcset'] ) ) {
-				$image_atts['srcset'] = $props['srcset'];
+				$image_attrs['srcset'] = $props['srcset'];
 			}
 
 			if ( ! empty( $args['lightbox'] ) ) {
-				$image_atts['lightbox'] = '';
+				$image_attrs['lightbox'] = '';
 			}
 			$image = AMP_DOM_Utils::create_node(
 				$dom,
 				'img',
-				$image_atts
+				$image_attrs
 			);
 
 			if ( ! empty( $props['href'] ) ) {
@@ -285,4 +286,22 @@ public function print_styles() {
 		</style>
 		<?php
 	}
+
+	/**
+	 * Get all raw embeds from the DOM.
+	 *
+	 * @param Document $dom Document.
+	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
+	 */
+	protected function get_raw_embed_nodes( Document $dom ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+		return null;
+	}
+
+	/**
+	 * Make embed AMP compatible.
+	 *
+	 * @param DOMElement $node DOM element.
+	 */
+	protected function sanitize_raw_embed( DOMElement $node ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+	}
 }
diff --git a/includes/embeds/class-amp-gfycat-embed-handler.php b/includes/embeds/class-amp-gfycat-embed-handler.php
index adc4b00991a..a5790f44661 100644
--- a/includes/embeds/class-amp-gfycat-embed-handler.php
+++ b/includes/embeds/class-amp-gfycat-embed-handler.php
@@ -6,76 +6,80 @@
  * @since 1.0
  */
 
+use AmpProject\Dom\Document;
+
 /**
  * Class AMP_Gfycat_Embed_Handler
  */
 class AMP_Gfycat_Embed_Handler extends AMP_Base_Embed_Handler {
+
 	/**
-	 * Regex matched to produce output amp-gfycat.
+	 * Default AMP tag to be used when sanitizing embeds.
 	 *
 	 * @var string
 	 */
-	const URL_PATTERN = '#https?://(www\.)?gfycat\.com/.*#i';
+	protected $amp_tag = 'amp-gfycat';
 
 	/**
-	 * Register embed.
+	 * Base URL used for identifying embeds.
+	 *
+	 * @var string
 	 */
-	public function register_embed() {
-		add_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10, 3 );
-	}
+	protected $base_embed_url = 'https://gfycat.com/ifr/';
 
 	/**
-	 * Unregister embed.
+	 * Get all raw embeds from the DOM.
+	 *
+	 * @param Document $dom Document.
+	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
-	public function unregister_embed() {
-		remove_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10 );
+	protected function get_raw_embed_nodes( Document $dom ) {
+		return $dom->xpath->query( sprintf( '//iframe[ starts-with( @src, "%s" ) ]', $this->base_embed_url ) );
 	}
 
 	/**
-	 * Filter oEmbed HTML for Gfycat to prepare it for AMP.
+	 * Make embed AMP compatible.
 	 *
-	 * @param mixed  $return The oEmbed HTML.
-	 * @param string $url    The attempted embed URL.
-	 * @param array  $attr   Attributes.
-	 * @return string Embed.
+	 * @param DOMElement $node DOM element.
 	 */
-	public function filter_embed_oembed_html( $return, $url, $attr ) {
-		$parsed_url = wp_parse_url( $url );
-		if ( false !== strpos( $parsed_url['host'], 'gfycat.com' ) ) {
-			if ( preg_match( '/width=["\']?(\d+)/', $return, $matches ) ) {
-				$attr['width'] = $matches[1];
-			}
-			if ( preg_match( '/height=["\']?(\d+)/', $return, $matches ) ) {
-				$attr['height'] = $matches[1];
-			}
+	protected function sanitize_raw_embed( DOMElement $node ) {
+		$iframe_src = $node->getAttribute( 'src' );
 
-			if ( empty( $attr['height'] ) ) {
-				return $return;
-			}
+		$gfycat_id = strtok( substr( $iframe_src, strlen( $this->base_embed_url ) ), '/?#' );
+		if ( empty( $gfycat_id ) ) {
+			// Nothing to do if the ID could not be found.
+			return;
+		}
 
-			$attributes = wp_array_slice_assoc( $attr, [ 'width', 'height' ] );
+		$attributes = [
+			'data-gfyid' => $gfycat_id,
+			'layout'     => 'responsive',
+			'height'     => $this->args['height'],
+			'width'      => $this->args['width'],
+		];
 
-			if ( empty( $attr['width'] ) ) {
-				$attributes['layout'] = 'fixed-height';
-				$attributes['width']  = 'auto';
+		if ( '100%' === $node->getAttribute( 'width' ) && '100%' === $node->getAttribute( 'height' ) ) {
+			$attributes['layout'] = 'fill';
+			unset( $attributes['width'], $attributes['height'] );
+		} else {
+			if ( $node->hasAttribute( 'width' ) ) {
+				$attributes['width'] = $node->getAttribute( 'width' );
 			}
 
-			$pieces = explode( '/detail/', $parsed_url['path'] );
-			if ( ! isset( $pieces[1] ) ) {
-				if ( ! preg_match( '/\/([A-Za-z0-9]+)/', $parsed_url['path'], $matches ) ) {
-					return $return;
-				}
-				$attributes['data-gfyid'] = $matches[1];
-			} else {
-				$attributes['data-gfyid'] = $pieces[1];
+			if ( $node->hasAttribute( 'height' ) ) {
+				$attributes['height'] = $node->getAttribute( 'height' );
 			}
-
-			$return = AMP_HTML_Utils::build_tag(
-				'amp-gfycat',
-				$attributes
-			);
 		}
-		return $return;
+
+		$amp_node = AMP_DOM_Utils::create_node(
+			Document::fromNode( $node ),
+			'amp-gfycat',
+			$attributes
+		);
+
+		$this->unwrap_p_element( $node );
+
+		$node->parentNode->replaceChild( $amp_node, $node );
 	}
 }
 
diff --git a/includes/embeds/class-amp-hulu-embed-handler.php b/includes/embeds/class-amp-hulu-embed-handler.php
index e9dca1df449..3e1a1dd5559 100644
--- a/includes/embeds/class-amp-hulu-embed-handler.php
+++ b/includes/embeds/class-amp-hulu-embed-handler.php
@@ -6,16 +6,12 @@
  * @since 1.0
  */
 
+use AmpProject\Dom\Document;
+
 /**
  * Class AMP_Hulu_Embed_Handler
  */
 class AMP_Hulu_Embed_Handler extends AMP_Base_Embed_Handler {
-	/**
-	 * Regex matched to produce output amp-hulu.
-	 *
-	 * @var string
-	 */
-	const URL_PATTERN = '#https?://(www\.)?hulu\.com/.*#i';
 
 	/**
 	 * Default height.
@@ -25,63 +21,65 @@ class AMP_Hulu_Embed_Handler extends AMP_Base_Embed_Handler {
 	protected $DEFAULT_HEIGHT = 600;
 
 	/**
-	 * Register embed.
+	 * Default AMP tag to be used when sanitizing embeds.
+	 *
+	 * @var string
 	 */
-	public function register_embed() {
-		add_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10, 3 );
-	}
+	protected $amp_tag = 'amp-hulu';
+
+	/**
+	 * Base URL used for identifying embeds.
+	 *
+	 * @var string
+	 */
+	protected $base_embed_url = 'www.hulu.com/embed.html';
 
 	/**
-	 * Unregister embed.
+	 * Get all raw embeds from the DOM.
+	 *
+	 * @param Document $dom Document.
+	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
-	public function unregister_embed() {
-		remove_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10 );
+	protected function get_raw_embed_nodes( Document $dom ) {
+		return $dom->xpath->query( sprintf( '//iframe[ contains( @src, "%s" ) ]', $this->base_embed_url ) );
 	}
 
 	/**
-	 * Filter oEmbed HTML for Hulu to prepare it for AMP.
+	 * Make embed AMP compatible.
 	 *
-	 * @param mixed  $return The oEmbed HTML.
-	 * @param string $url    The attempted embed URL.
-	 * @param array  $attr   Attributes.
-	 * @return string Embed.
+	 * @param DOMElement $node DOM element.
 	 */
-	public function filter_embed_oembed_html( $return, $url, $attr ) {
-		$parsed_url = wp_parse_url( $url );
-		if ( false !== strpos( $parsed_url['host'], 'hulu.com' ) ) {
-			if ( preg_match( '/width=["\']?(\d+)/', $return, $matches ) ) {
-				$attr['width'] = $matches[1];
-			}
-			if ( preg_match( '/height=["\']?(\d+)/', $return, $matches ) ) {
-				$attr['height'] = $matches[1];
-			}
-
-			if ( empty( $attr['height'] ) ) {
-				return $return;
-			}
+	protected function sanitize_raw_embed( DOMElement $node ) {
+		$iframe_src = $node->getAttribute( 'src' );
 
-			$attributes = wp_array_slice_assoc( $attr, [ 'width', 'height' ] );
+		parse_str( wp_parse_url( $iframe_src, PHP_URL_QUERY ), $query );
+		if ( empty( $query['eid'] ) ) {
+			return;
+		}
 
-			if ( empty( $attr['width'] ) ) {
-				$attributes['layout'] = 'fixed-height';
-				$attributes['width']  = 'auto';
-			}
+		$attributes = [
+			'data-eid' => $query['eid'],
+			'layout'   => 'responsive',
+			'width'    => $this->DEFAULT_WIDTH,
+			'height'   => $this->DEFAULT_HEIGHT,
+		];
 
-			$pieces = explode( '/watch/', $parsed_url['path'] );
-			if ( ! isset( $pieces[1] ) ) {
-				if ( ! preg_match( '/\/([A-Za-z0-9]+)/', $parsed_url['path'], $matches ) ) {
-					return $return;
-				}
-				$attributes['data-eid'] = $matches[1];
-			} else {
-				$attributes['data-eid'] = $pieces[1];
-			}
+		if ( $node->hasAttribute( 'width' ) ) {
+			$attributes['width'] = $node->getAttribute( 'width' );
+		}
 
-			$return = AMP_HTML_Utils::build_tag(
-				'amp-hulu',
-				$attributes
-			);
+		if ( $node->hasAttribute( 'height' ) ) {
+			$attributes['height'] = $node->getAttribute( 'height' );
 		}
-		return $return;
+
+		$amp_node = AMP_DOM_Utils::create_node(
+			Document::fromNode( $node ),
+			$this->amp_tag,
+			$attributes
+		);
+
+		$this->unwrap_p_element( $node );
+
+		$node->parentNode->replaceChild( $amp_node, $node );
 	}
 }
diff --git a/includes/embeds/class-amp-imgur-embed-handler.php b/includes/embeds/class-amp-imgur-embed-handler.php
index 3d862302192..e19d3f25866 100644
--- a/includes/embeds/class-amp-imgur-embed-handler.php
+++ b/includes/embeds/class-amp-imgur-embed-handler.php
@@ -6,145 +6,69 @@
  * @since 1.0
  */
 
+use AmpProject\Dom\Document;
+
 /**
  * Class AMP_Imgur_Embed_Handler
  */
 class AMP_Imgur_Embed_Handler extends AMP_Base_Embed_Handler {
+
 	/**
-	 * Regex matched to produce output amp-imgur.
+	 * Default width.
 	 *
-	 * @var string
+	 * @var int
 	 */
-	const URL_PATTERN = '#https?://(www\.)?imgur\.com/.*#i';
+	protected $DEFAULT_WIDTH = 540;
 
 	/**
-	 * Register embed.
+	 * Default height.
+	 *
+	 * @var int
 	 */
-	public function register_embed() {
-		if ( version_compare( strtok( get_bloginfo( 'version' ), '-' ), '4.9', '<' ) ) {
-
-			// Before 4.9 the embedding Imgur is not working properly, register embed for that case.
-			wp_embed_register_handler( 'amp-imgur', self::URL_PATTERN, [ $this, 'oembed' ], -1 );
-		} else {
-			add_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10, 3 );
-		}
-	}
+	protected $DEFAULT_HEIGHT = 500;
 
 	/**
-	 * Unregister embed.
+	 * Default AMP tag to be used when sanitizing embeds.
+	 *
+	 * @var string
 	 */
-	public function unregister_embed() {
-		if ( version_compare( strtok( get_bloginfo( 'version' ), '-' ), '4.9', '<' ) ) {
-			wp_embed_unregister_handler( 'amp-imgur', -1 );
-		} else {
-			remove_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10 );
-		}
-	}
+	protected $amp_tag = 'amp-imgur';
 
 	/**
-	 * Oembed.
+	 * Get all raw embeds from the DOM.
 	 *
-	 * @param array  $matches Matches.
-	 * @param array  $attr Attributes.
-	 * @param string $url URL.
-	 * @return string Embed.
+	 * @param Document $dom Document.
+	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
-	public function oembed( $matches, $attr, $url ) {
-		return $this->render( [ 'url' => $url ] );
+	protected function get_raw_embed_nodes( Document $dom ) {
+		return $dom->xpath->query( '//blockquote[ @class = "imgur-embed-pub" ]' );
 	}
 
 	/**
-	 * Render embed.
+	 * Make embed AMP compatible.
 	 *
-	 * @param array $args Args.
-	 * @return string Embed.
+	 * @param DOMElement $node DOM element.
 	 */
-	public function render( $args ) {
-		$args = wp_parse_args(
-			$args,
-			[
-				'url' => false,
-			]
-		);
+	protected function sanitize_raw_embed( DOMElement $node ) {
+		$imgur_id = $node->getAttribute( 'data-id' );
 
-		if ( empty( $args['url'] ) ) {
-			return '';
+		if ( empty( $imgur_id ) ) {
+			return;
 		}
 
-		$this->did_convert_elements = true;
-
-		$id = $this->get_imgur_id_from_url( $args['url'] );
-		if ( false === $id ) {
-			return '';
-		}
-		return AMP_HTML_Utils::build_tag(
-			'amp-imgur',
+		$amp_node = AMP_DOM_Utils::create_node(
+			Document::fromNode( $node ),
+			$this->amp_tag,
 			[
+				'data-imgur-id' => $imgur_id,
+				'layout'        => 'responsive',
 				'width'         => $this->args['width'],
 				'height'        => $this->args['height'],
-				'data-imgur-id' => $id,
 			]
 		);
-	}
-
-	/**
-	 * Filter oEmbed HTML for Imgur to prepare it for AMP.
-	 *
-	 * @param mixed  $return The oEmbed HTML.
-	 * @param string $url    The attempted embed URL.
-	 * @param array  $attr   Attributes.
-	 * @return string Embed.
-	 */
-	public function filter_embed_oembed_html( $return, $url, $attr ) {
-		$parsed_url = wp_parse_url( $url );
-		if ( false !== strpos( $parsed_url['host'], 'imgur.com' ) ) {
-			if ( preg_match( '/width=["\']?(\d+)/', $return, $matches ) ) {
-				$attr['width'] = $matches[1];
-			}
-			if ( preg_match( '/height=["\']?(\d+)/', $return, $matches ) ) {
-				$attr['height'] = $matches[1];
-			}
-
-			if ( empty( $attr['height'] ) ) {
-				return $return;
-			}
-
-			$attributes = wp_array_slice_assoc( $attr, [ 'width', 'height' ] );
-
-			if ( empty( $attr['width'] ) ) {
-				$attributes['layout'] = 'fixed-height';
-				$attributes['width']  = 'auto';
-			}
 
-			$attributes['data-imgur-id'] = $this->get_imgur_id_from_url( $url );
-			if ( false === $attributes['data-imgur-id'] ) {
-				return $return;
-			}
-
-			$return = AMP_HTML_Utils::build_tag(
-				'amp-imgur',
-				$attributes
-			);
-		}
-		return $return;
-	}
-
-	/**
-	 * Get Imgur ID from URL.
-	 *
-	 * @param string $url URL.
-	 * @return bool|string ID / false.
-	 */
-	protected function get_imgur_id_from_url( $url ) {
-		$parsed_url = wp_parse_url( $url );
-		$pieces     = explode( '/gallery/', $parsed_url['path'] );
-		if ( ! isset( $pieces[1] ) ) {
-			if ( ! preg_match( '/\/([A-Za-z0-9]+)/', $parsed_url['path'], $matches ) ) {
-				return false;
-			}
-			return $matches[1];
-		}
+		$this->remove_script_sibling( $node, 's.imgur.com/min/embed.js' );
 
-		return $pieces[1];
+		$node->parentNode->replaceChild( $amp_node, $node );
 	}
 }
diff --git a/includes/embeds/class-amp-instagram-embed-handler.php b/includes/embeds/class-amp-instagram-embed-handler.php
index 313d455d8fb..1dddaf67d47 100644
--- a/includes/embeds/class-amp-instagram-embed-handler.php
+++ b/includes/embeds/class-amp-instagram-embed-handler.php
@@ -5,6 +5,7 @@
  * @package AMP
  */
 
+use AmpProject\AmpWP\Embed\Registerable;
 use AmpProject\Dom\Document;
 
 /**
@@ -12,9 +13,9 @@
  *
  * Much of this class is borrowed from Jetpack embeds
  */
-class AMP_Instagram_Embed_Handler extends AMP_Base_Embed_Handler {
-	const SHORT_URL_HOST = 'instagr.am';
-	const URL_PATTERN    = '#https?:\/\/(www\.)?instagr(\.am|am\.com)\/(p|tv)\/([A-Za-z0-9-_]+)#i';
+class AMP_Instagram_Embed_Handler extends AMP_Base_Embed_Handler implements Registerable {
+
+	const URL_PATTERN = '#https?:\/\/(www\.)?instagr(\.am|am\.com)\/(p|tv)\/([A-Za-z0-9-_]+)#i';
 
 	/**
 	 * Default width.
@@ -31,143 +32,52 @@ class AMP_Instagram_Embed_Handler extends AMP_Base_Embed_Handler {
 	protected $DEFAULT_HEIGHT = 600;
 
 	/**
-	 * Tag.
+	 * Default AMP tag to be used when sanitizing embeds.
 	 *
-	 * @var string embed HTML blockquote tag to identify and replace with AMP version.
+	 * @var string
 	 */
-	protected $sanitize_tag = 'blockquote';
+	protected $amp_tag = 'amp-instagram';
 
 	/**
-	 * Tag.
+	 * Register the embed.
 	 *
-	 * @var string AMP amp-facebook tag
-	 */
-	private $amp_tag = 'amp-instagram';
-
-	/**
-	 * Registers embed.
+	 * @return void
 	 */
 	public function register_embed() {
-		wp_embed_register_handler( $this->amp_tag, self::URL_PATTERN, [ $this, 'oembed' ], -1 );
-	}
-
-	/**
-	 * Unregisters embed.
-	 */
-	public function unregister_embed() {
-		wp_embed_unregister_handler( $this->amp_tag, -1 );
-	}
-
-	/**
-	 * WordPress OEmbed rendering callback.
-	 *
-	 * @param array  $matches URL pattern matches.
-	 * @param array  $attr    Matched attributes.
-	 * @param string $url     Matched URL.
-	 * @return string HTML markup for rendered embed.
-	 */
-	public function oembed( $matches, $attr, $url ) {
-		return $this->render(
-			[
-				'url'          => $url,
-				'instagram_id' => end( $matches ),
-			]
-		);
-	}
-
-	/**
-	 * Gets the rendered embed markup.
-	 *
-	 * @param array $args Embed rendering arguments.
-	 * @return string HTML markup for rendered embed.
-	 */
-	public function render( $args ) {
-		$args = wp_parse_args(
-			$args,
-			[
-				'url'          => false,
-				'instagram_id' => false,
-			]
-		);
-
-		if ( empty( $args['instagram_id'] ) ) {
-			return AMP_HTML_Utils::build_tag(
-				'a',
-				[
-					'href'  => esc_url_raw( $args['url'] ),
-					'class' => 'amp-wp-embed-fallback',
-				],
-				esc_html( $args['url'] )
-			);
+		if ( version_compare( get_bloginfo( 'version' ), '5.1', '>=' ) ) {
+			return;
 		}
 
-		$this->did_convert_elements = true;
-
-		return AMP_HTML_Utils::build_tag(
-			$this->amp_tag,
-			[
-				'data-shortcode' => $args['instagram_id'],
-				'data-captioned' => '',
-				'layout'         => 'responsive',
-				'width'          => $this->args['width'],
-				'height'         => $this->args['height'],
-			]
-		);
+		// The oEmbed provider for Instagram does not accommodate Instagram TV URLs on WP < 5.1. Modifying the provider format
+		// here will allow for the oEmbed HTML to be fetched, and can then sanitized later below.
+		wp_oembed_remove_provider( '#https?://(www\.)?instagr(\.am|am\.com)/p/.*#i' );
+		wp_oembed_add_provider( self::URL_PATTERN, 'https://api.instagram.com/oembed', true );
 	}
 
 	/**
-	 * Get Instagram ID from URL.
+	 * Unregister the embed.
 	 *
-	 * @param string $url URL.
-	 * @return string|false The ID parsed from the URL or false if not found.
+	 * @return void
 	 */
-	private function get_instagram_id_from_url( $url ) {
-		$found = preg_match( self::URL_PATTERN, $url, $matches );
-
-		if ( ! $found ) {
-			return false;
-		}
-
-		return end( $matches );
+	public function unregister_embed() {
 	}
 
 	/**
-	 * Sanitized <blockquote class="instagram-media"> tags to <amp-instagram>
+	 * Get all raw embeds from the DOM.
 	 *
-	 * @param Document $dom DOM.
+	 * @param Document $dom Document.
+	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
-	public function sanitize_raw_embeds( Document $dom ) {
-		/**
-		 * Node list.
-		 *
-		 * @var DOMNodeList $nodes
-		 */
-		$nodes     = $dom->getElementsByTagName( $this->sanitize_tag );
-		$num_nodes = $nodes->length;
-
-		if ( 0 === $num_nodes ) {
-			return;
-		}
-
-		for ( $i = $num_nodes - 1; $i >= 0; $i-- ) {
-			$node = $nodes->item( $i );
-			if ( ! $node instanceof DOMElement ) {
-				continue;
-			}
-
-			if ( $node->hasAttribute( 'data-instgrm-permalink' ) ) {
-				$this->create_amp_instagram_and_replace_node( $dom, $node );
-			}
-		}
+	protected function get_raw_embed_nodes( Document $dom ) {
+		return $dom->xpath->query( '//blockquote[ @data-instgrm-permalink ]' );
 	}
 
 	/**
-	 * Make final modifications to DOMNode
+	 * Make embed AMP compatible.
 	 *
-	 * @param Document   $dom The HTML Document.
-	 * @param DOMElement $node The DOMNode to adjust and replace.
+	 * @param DOMElement $node DOM element.
 	 */
-	private function create_amp_instagram_and_replace_node( $dom, $node ) {
+	protected function sanitize_raw_embed( DOMElement $node ) {
 		$instagram_id = $this->get_instagram_id_from_url( $node->getAttribute( 'data-instgrm-permalink' ) );
 
 		$node_args = [
@@ -181,47 +91,26 @@ private function create_amp_instagram_and_replace_node( $dom, $node ) {
 			$node_args['data-captioned'] = '';
 		}
 
-		$new_node = AMP_DOM_Utils::create_node( $dom, $this->amp_tag, $node_args );
+		$new_node = AMP_DOM_Utils::create_node( Document::fromNode( $node ), $this->amp_tag, $node_args );
 
-		$this->sanitize_embed_script( $node );
+		$this->remove_script_sibling( $node, 'instagram.com/embed.js' );
 
 		$node->parentNode->replaceChild( $new_node, $node );
-
-		$this->did_convert_elements = true;
 	}
 
 	/**
-	 * Removes Instagram's embed <script> tag.
+	 * Get Instagram ID from URL.
 	 *
-	 * @param DOMElement $node The DOMNode to whose sibling is the instagram script.
+	 * @param string $url URL.
+	 * @return string|false The ID parsed from the URL or false if not found.
 	 */
-	private function sanitize_embed_script( $node ) {
-		$next_element_sibling = $node->nextSibling;
-		while ( $next_element_sibling && ! ( $next_element_sibling instanceof DOMElement ) ) {
-			$next_element_sibling = $next_element_sibling->nextSibling;
-		}
-
-		$script_src = 'instagram.com/embed.js';
+	private function get_instagram_id_from_url( $url ) {
+		$found = preg_match( self::URL_PATTERN, $url, $matches );
 
-		// Handle case where script is wrapped in paragraph by wpautop.
-		if ( $next_element_sibling instanceof DOMElement && 'p' === $next_element_sibling->nodeName ) {
-			$children = $next_element_sibling->getElementsByTagName( '*' );
-			if ( 1 === $children->length && 'script' === $children->item( 0 )->nodeName && false !== strpos( $children->item( 0 )->getAttribute( 'src' ), $script_src ) ) {
-				$next_element_sibling->parentNode->removeChild( $next_element_sibling );
-				return;
-			}
+		if ( ! $found ) {
+			return false;
 		}
 
-		// Handle case where script is immediately following.
-		$is_embed_script = (
-			$next_element_sibling instanceof DOMElement
-			&&
-			'script' === strtolower( $next_element_sibling->nodeName )
-			&&
-			false !== strpos( $next_element_sibling->getAttribute( 'src' ), $script_src )
-		);
-		if ( $is_embed_script ) {
-			$next_element_sibling->parentNode->removeChild( $next_element_sibling );
-		}
+		return end( $matches );
 	}
 }
diff --git a/includes/embeds/class-amp-issuu-embed-handler.php b/includes/embeds/class-amp-issuu-embed-handler.php
index a4c27109603..03312522bc8 100644
--- a/includes/embeds/class-amp-issuu-embed-handler.php
+++ b/includes/embeds/class-amp-issuu-embed-handler.php
@@ -6,60 +6,60 @@
  * @since 0.7
  */
 
+use AmpProject\Dom\Document;
+
 /**
  * Class AMP_Issuu_Embed_Handler
  */
 class AMP_Issuu_Embed_Handler extends AMP_Base_Embed_Handler {
-	/**
-	 * Regex matched to produce output amp-iframe.
-	 *
-	 * @const string
-	 */
-	const URL_PATTERN = '#https?://(www\.)?issuu\.com/.+/docs/.+#i';
 
 	/**
-	 * Register embed.
-	 */
-	public function register_embed() {
-		add_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10, 3 );
-	}
-
-	/**
-	 * Unregister embed.
+	 * Get all raw embeds from the DOM.
+	 *
+	 * @param Document $dom Document.
+	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
-	public function unregister_embed() {
-		remove_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10 );
+	protected function get_raw_embed_nodes( Document $dom ) {
+		return $dom->xpath->query( '//div[ @class="issuuembed" and @data-url ]' );
 	}
 
 	/**
-	 * Filter oEmbed HTML for Meetup to prepare it for AMP.
+	 * Make embed AMP compatible.
 	 *
-	 * @param mixed  $return The oEmbed HTML.
-	 * @param string $url    The attempted embed URL.
-	 * @param array  $attr   Attributes.
-	 * @return string Embed.
+	 * @param DOMElement $node DOM element.
 	 */
-	public function filter_embed_oembed_html( $return, $url, $attr ) {
-		$parsed_url = wp_parse_url( $url );
-		if ( false !== strpos( $parsed_url['host'], 'issuu.com' ) ) {
-			if ( preg_match( '/width\s*:\s*(\d+)px/', $return, $matches ) ) {
-				$attr['width'] = $matches[1];
-			}
-			if ( preg_match( '/height\s*:\s*(\d+)px/', $return, $matches ) ) {
-				$attr['height'] = $matches[1];
+	protected function sanitize_raw_embed( DOMElement $node ) {
+		$url = $node->getAttribute( 'data-url' );
+
+		$attributes = [
+			'width'   => $this->args['width'],
+			'height'  => $this->args['height'],
+			'src'     => $url,
+			'sandbox' => 'allow-scripts allow-same-origin',
+		];
+
+		if ( $node->hasAttribute( 'style' ) ) {
+			$style = $node->getAttribute( 'style' );
+
+			if ( preg_match( '/width\s*:\s*(\d+)px/', $style, $matches ) ) {
+				$attributes['width'] = $matches[1];
 			}
 
-			$return = AMP_HTML_Utils::build_tag(
-				'amp-iframe',
-				[
-					'width'   => $attr['width'],
-					'height'  => $attr['height'],
-					'src'     => $url,
-					'sandbox' => 'allow-scripts allow-same-origin',
-				]
-			);
+			if ( preg_match( '/height\s*:\s*(\d+)px/', $style, $matches ) ) {
+				$attributes['height'] = $matches[1];
+			}
 		}
-		return $return;
+
+		$amp_node = AMP_DOM_Utils::create_node(
+			Document::fromNode( $node ),
+			$this->amp_tag,
+			$attributes
+		);
+
+		$this->unwrap_p_element( $node );
+		$this->remove_script_sibling( $node, '//e.issuu.com/embed.js' );
+
+		$node->parentNode->replaceChild( $amp_node, $node );
 	}
 }
 
diff --git a/includes/embeds/class-amp-meetup-embed-handler.php b/includes/embeds/class-amp-meetup-embed-handler.php
index 6f39aa01dbe..ed3712bec35 100644
--- a/includes/embeds/class-amp-meetup-embed-handler.php
+++ b/includes/embeds/class-amp-meetup-embed-handler.php
@@ -6,40 +6,44 @@
  * @since 0.7
  */
 
+use AmpProject\Dom\Document;
+
 /**
  * Class AMP_Meetup_Embed_Handler
  */
 class AMP_Meetup_Embed_Handler extends AMP_Base_Embed_Handler {
 
 	/**
-	 * Register embed.
+	 * Determine if the node is indeed a raw embed.
+	 *
+	 * @param DOMElement $node DOM element.
+	 * @return bool True if it is a raw embed, false otherwise.
 	 */
-	public function register_embed() {
-		add_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10, 2 );
+	protected function is_raw_embed( DOMElement $node ) {
+		$width  = filter_var( $node->getAttribute( 'width' ), FILTER_SANITIZE_NUMBER_INT );
+		$height = filter_var( $node->getAttribute( 'height' ), FILTER_SANITIZE_NUMBER_INT );
+
+		return 50 !== $width && 50 !== $height;
 	}
 
 	/**
-	 * Unregister embed.
+	 * Get all raw embeds from the DOM.
+	 *
+	 * @param Document $dom Document.
+	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
-	public function unregister_embed() {
-		remove_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10 );
+	protected function get_raw_embed_nodes( Document $dom ) {
+		return $dom->xpath->query( '//div[ @id="meetup_oembed" ]//div[ @class="photo" ]/img' );
 	}
 
 	/**
-	 * Filter oEmbed HTML for Meetup to prepare it for AMP.
+	 * Make embed AMP compatible.
 	 *
-	 * @param string $cache Cache for oEmbed.
-	 * @param string $url   Embed URL.
-	 * @return string Embed.
+	 * @param DOMElement $node DOM element.
 	 */
-	public function filter_embed_oembed_html( $cache, $url ) {
-		$parsed_url = wp_parse_url( $url );
-		if ( false !== strpos( $parsed_url['host'], 'meetup.com' ) ) {
-
-			// Supply the width/height so that we don't have to make requests to look them up later.
-			$cache = str_replace( '<img ', '<img width="50" height="50" ', $cache );
-		}
-		return $cache;
+	protected function sanitize_raw_embed( DOMElement $node ) {
+		// Supply the width/height so that we don't have to make requests to look them up later.
+		$node->setAttribute( 'width', 50 );
+		$node->setAttribute( 'height', 50 );
 	}
 }
-
diff --git a/includes/embeds/class-amp-pinterest-embed-handler.php b/includes/embeds/class-amp-pinterest-embed-handler.php
index a0debc6e855..681d711a193 100644
--- a/includes/embeds/class-amp-pinterest-embed-handler.php
+++ b/includes/embeds/class-amp-pinterest-embed-handler.php
@@ -5,10 +5,13 @@
  * @package AMP
  */
 
+use AmpProject\AmpWP\Embed\Registerable;
+use AmpProject\Dom\Document;
+
 /**
  * Class AMP_Pinterest_Embed_Handler
  */
-class AMP_Pinterest_Embed_Handler extends AMP_Base_Embed_Handler {
+class AMP_Pinterest_Embed_Handler extends AMP_Base_Embed_Handler implements Registerable {
 
 	const URL_PATTERN = '#https?://(www\.)?pinterest\.com/pin/.*#i';
 
@@ -26,12 +29,19 @@ class AMP_Pinterest_Embed_Handler extends AMP_Base_Embed_Handler {
 	 */
 	protected $DEFAULT_HEIGHT = 750;
 
+	/**
+	 * Default AMP tag to be used when sanitizing embeds.
+	 *
+	 * @var string
+	 */
+	protected $amp_tag = 'amp-pinterest';
+
 	/**
 	 * Registers embed.
 	 */
 	public function register_embed() {
 		wp_embed_register_handler(
-			'amp-pinterest',
+			$this->amp_tag,
 			self::URL_PATTERN,
 			[ $this, 'oembed' ],
 			-1
@@ -42,7 +52,7 @@ public function register_embed() {
 	 * Unregisters embed.
 	 */
 	public function unregister_embed() {
-		wp_embed_unregister_handler( 'amp-pinterest', -1 );
+		wp_embed_unregister_handler( $this->amp_tag, -1 );
 	}
 
 	/**
@@ -75,10 +85,8 @@ public function render( $args ) {
 			return '';
 		}
 
-		$this->did_convert_elements = true;
-
 		return AMP_HTML_Utils::build_tag(
-			'amp-pinterest',
+			$this->amp_tag,
 			[
 				'width'    => $this->args['width'],
 				'height'   => $this->args['height'],
@@ -87,4 +95,23 @@ public function render( $args ) {
 			]
 		);
 	}
+
+	/**
+	 * Get all raw embeds from the DOM.
+	 *
+	 * @param Document $dom Document.
+	 * @return DOMNodeList A list of DOMElement nodes.
+	 */
+	protected function get_raw_embed_nodes( Document $dom ) {
+		return $dom->xpath->query( sprintf( '//%s', $this->amp_tag ) );
+	}
+
+	/**
+	 * Make embed AMP compatible.
+	 *
+	 * @param DOMElement $node DOM element.
+	 */
+	protected function sanitize_raw_embed( DOMElement $node ) {
+		$this->unwrap_p_element( $node );
+	}
 }
diff --git a/includes/embeds/class-amp-playlist-embed-handler.php b/includes/embeds/class-amp-playlist-embed-handler.php
index 271f5ab8656..1bc6e7704ff 100644
--- a/includes/embeds/class-amp-playlist-embed-handler.php
+++ b/includes/embeds/class-amp-playlist-embed-handler.php
@@ -6,6 +6,9 @@
  * @since 0.7
  */
 
+use AmpProject\AmpWP\Embed\Registerable;
+use AmpProject\Dom\Document;
+
 /**
  * Class AMP_Playlist_Embed_Handler
  *
@@ -13,7 +16,7 @@
  *
  * @package AMP
  */
-class AMP_Playlist_Embed_Handler extends AMP_Base_Embed_Handler {
+class AMP_Playlist_Embed_Handler extends AMP_Base_Embed_Handler implements Registerable {
 
 	/**
 	 * The tag of the shortcode.
@@ -330,4 +333,22 @@ public function get_title( $track ) {
 
 		return '';
 	}
+
+	/**
+	 * Get all raw embeds from the DOM.
+	 *
+	 * @param Document $dom Document.
+	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
+	 */
+	protected function get_raw_embed_nodes( Document $dom ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+		return null;
+	}
+
+	/**
+	 * Make embed AMP compatible.
+	 *
+	 * @param DOMElement $node DOM element.
+	 */
+	protected function sanitize_raw_embed( DOMElement $node ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+	}
 }
diff --git a/includes/embeds/class-amp-reddit-embed-handler.php b/includes/embeds/class-amp-reddit-embed-handler.php
index 8199dde0910..b4e8f9212a0 100644
--- a/includes/embeds/class-amp-reddit-embed-handler.php
+++ b/includes/embeds/class-amp-reddit-embed-handler.php
@@ -6,70 +6,115 @@
  * @since 0.7
  */
 
+use AmpProject\Dom\Document;
+
 /**
  * Class AMP_Reddit_Embed_Handler
  */
 class AMP_Reddit_Embed_Handler extends AMP_Base_Embed_Handler {
+
 	/**
-	 * Regex matched to produce output amp-reddit.
+	 * Default AMP tag to be used when sanitizing embeds.
 	 *
-	 * @const string
+	 * @var string
 	 */
-	const URL_PATTERN = '#https?://(www\.)?reddit\.com/r/[^/]+/comments/.*#i';
+	protected $amp_tag = 'amp-embedly-card';
 
 	/**
-	 * Register embed.
+	 * Get all raw embeds from the DOM.
+	 *
+	 * @param Document $dom Document.
+	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
-	public function register_embed() {
-		wp_embed_register_handler( 'amp-reddit', self::URL_PATTERN, [ $this, 'oembed' ], -1 );
+	protected function get_raw_embed_nodes( Document $dom ) {
+		/*
+		 * The blockquote being queried has two anchor elements. The first one is what we need since it has the URL of the
+		 * Reddit page being embedded.
+		 */
+		return $dom->xpath->query( '//blockquote[ @class = "reddit-card" and //a[1][ starts-with( @href, "https://www.reddit.com" ) ] ]' );
 	}
 
 	/**
-	 * Unregister embed.
+	 * Make embed AMP compatible.
+	 *
+	 * @param DOMElement $node DOM element.
 	 */
-	public function unregister_embed() {
-		wp_embed_unregister_handler( 'amp-reddit', -1 );
+	protected function sanitize_raw_embed( DOMElement $node ) {
+		$anchor_node = $this->get_anchor_node( $node );
+		if ( null === $anchor_node ) {
+			return;
+		}
+
+		$reddit_url = $anchor_node->getAttribute( 'href' );
+		if ( empty( $reddit_url ) ) {
+			return;
+		}
+
+		$attributes = [
+			'layout'   => 'responsive',
+			'width'    => 100,
+			'height'   => 100,
+			'data-url' => $anchor_node->getAttribute( 'href' ),
+		];
+
+		$amp_node = AMP_DOM_Utils::create_node(
+			Document::fromNode( $node ),
+			$this->amp_tag,
+			$attributes
+		);
+
+		// Add the raw embed as the placeholder.
+		$placeholder_node = $node->cloneNode( true );
+		$placeholder_node->setAttribute( 'placeholder', '' );
+		$amp_node->appendChild( $placeholder_node );
+
+		$this->remove_script_sibling( $node, 'embed.redditmedia.com/widgets/platform.js' );
+		$node->parentNode->replaceChild( $amp_node, $node );
 	}
 
 	/**
-	 * Embed found with matching URL callback.
+	 * Get the first child anchor element from the blockquote element.
 	 *
-	 * @param array $matches URL regex matches.
-	 * @param array $attr    Additional parameters.
-	 * @param array $url     URL.
-	 * @return string Embed.
+	 * @param DOMElement $blockquote_node Blockquote element.
+	 * @return DOMElement|null Anchor element if found, otherwise null.
 	 */
-	public function oembed( $matches, $attr, $url ) {
-		return $this->render( [ 'url' => $url ] );
+	private function get_anchor_node( DOMElement $blockquote_node ) {
+		$first_child_element = $this->get_first_child_element( $blockquote_node );
+
+		if ( null === $first_child_element ) {
+			return null;
+		}
+
+		$anchor_node = null;
+
+		if ( 'a' === $first_child_element->nodeName ) {
+			// Anchor tag was not wrapped by `wpautop`.
+			$anchor_node = $first_child_element;
+		} elseif ( 'p' === $first_child_element->nodeName ) {
+			// If the anchor tag is wrapped by `wpautop`, it should be the first child of the `p` tag.
+			$first_child_element = $this->get_first_child_element( $first_child_element );
+
+			if ( null !== $first_child_element && 'a' === $first_child_element->nodeName ) {
+				$anchor_node = $first_child_element;
+			}
+		}
+
+		return $anchor_node;
 	}
 
 	/**
-	 * Output the Reddit amp element.
+	 * Get first child element for specified element.
 	 *
-	 * @param array $args parameters used for output.
-	 * @return string Rendered content.
+	 * @param DOMElement $node Element.
+	 * @return DOMElement|null First element if found, otherwise null.
 	 */
-	public function render( $args ) {
-		$args = wp_parse_args(
-			$args,
-			[
-				'url' => false,
-			]
-		);
-
-		if ( empty( $args['url'] ) ) {
-			return '';
+	private function get_first_child_element( DOMElement $node ) {
+		foreach ( $node->childNodes as $child_node ) {
+			if ( $child_node instanceof DOMElement ) {
+				return $child_node;
+			}
 		}
-
-		return AMP_HTML_Utils::build_tag(
-			'amp-embedly-card',
-			[
-				'layout'   => 'responsive',
-				'width'    => '100',
-				'height'   => '100',
-				'data-url' => $args['url'],
-			]
-		);
+		return null;
 	}
 }
 
diff --git a/includes/embeds/class-amp-scribd-embed-handler.php b/includes/embeds/class-amp-scribd-embed-handler.php
index 3cefd301ff0..4849cb5db46 100644
--- a/includes/embeds/class-amp-scribd-embed-handler.php
+++ b/includes/embeds/class-amp-scribd-embed-handler.php
@@ -6,72 +6,46 @@
  * @since 1.4
  */
 
+use AmpProject\Dom\Document;
+
 /**
  * Class AMP_Scribd_Embed_Handler
  */
 class AMP_Scribd_Embed_Handler extends AMP_Base_Embed_Handler {
 
 	/**
-	 * Registers embed.
+	 * Base URL used for identifying embeds.
+	 *
+	 * @var string
 	 */
-	public function register_embed() {
-		add_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10, 2 );
-	}
+	protected $base_embed_url = 'https://www.scribd.com/embeds/';
 
 	/**
-	 * Unregisters embed.
-	 */
-	public function unregister_embed() {
-		remove_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ] );
-	}
-
-	/**
-	 * Filter oEmbed HTML for Scribd to be AMP compatible.
+	 * Get all raw embeds from the DOM.
 	 *
-	 * @param string $cache Cache for oEmbed.
-	 * @param string $url   Embed URL.
-	 * @return string Embed.
+	 * @param Document $dom Document.
+	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
-	public function filter_embed_oembed_html( $cache, $url ) {
-		if ( ! in_array( wp_parse_url( $url, PHP_URL_HOST ), [ 'scribd.com', 'www.scribd.com' ], true ) ) {
-			return $cache;
-		}
-
-		return $this->sanitize_iframe( $cache );
+	protected function get_raw_embed_nodes( Document $dom ) {
+		return $dom->xpath->query( sprintf( '//iframe[ starts-with( @src, "%s" ) ]', $this->base_embed_url ) );
 	}
 
 	/**
-	 * Retrieves iframe element from HTML string and amends or appends the correct sandbox permissions.
+	 * Make embed AMP compatible.
 	 *
-	 * @param string $html HTML string.
-	 * @return string iframe with correct sandbox permissions.
+	 * @param DOMElement $node DOM element.
 	 */
-	private function sanitize_iframe( $html ) {
-		return preg_replace_callback(
-			'#^.*<iframe(?P<iframe_attributes>[^>]+?)></iframe>.*$#s',
-			function ( $matches ) {
-				$attrs = $matches['iframe_attributes'];
-
-				// Amend the required keywords to the iframe's sandbox.
-				$sandbox  = 'allow-popups allow-scripts';
-				$replaced = 0;
-				$attrs    = preg_replace(
-					'#(?<=\ssandbox=["\'])#',
-					"{$sandbox} ", // whitespace is necessary to separate prior permissions.
-					$attrs,
-					1,
-					$replaced
-				);
+	protected function sanitize_raw_embed( DOMElement $node ) {
+		$required_sandbox_permissions = 'allow-popups allow-scripts';
+		$node->setAttribute(
+			'sandbox',
+			$node->getAttribute( 'sandbox' ) . ' ' . $required_sandbox_permissions
+		);
+		$node->setAttribute( 'layout', 'responsive' );
 
-				// If no sandbox attribute was found, then add the attribute.
-				if ( 0 === $replaced ) {
-					$attrs .= sprintf( ' sandbox="%s"', $sandbox );
-				}
+		$this->remove_script_sibling( $node, null, 'scribd.com/javascripts/embed_code/inject.j' );
+		$this->unwrap_p_element( $node );
 
-				// The iframe sanitizer will convert this into an amp-iframe.
-				return "<iframe{$attrs}></iframe>";
-			},
-			$html
-		);
+		// The iframe sanitizer will further sanitize and convert this into an amp-iframe.
 	}
 }
diff --git a/includes/embeds/class-amp-soundcloud-embed-handler.php b/includes/embeds/class-amp-soundcloud-embed-handler.php
index c65bd5da358..54685998df5 100644
--- a/includes/embeds/class-amp-soundcloud-embed-handler.php
+++ b/includes/embeds/class-amp-soundcloud-embed-handler.php
@@ -5,6 +5,8 @@
  * @package AMP
  */
 
+use AmpProject\Dom\Document;
+
 /**
  * Class AMP_SoundCloud_Embed_Handler
  *
@@ -20,177 +22,97 @@ class AMP_SoundCloud_Embed_Handler extends AMP_Base_Embed_Handler {
 	protected $DEFAULT_HEIGHT = 200;
 
 	/**
-	 * Register embed.
-	 */
-	public function register_embed() {
-		add_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10, 2 );
-	}
-
-	/**
-	 * Unregister embed.
+	 * Base URL used for identifying embeds.
+	 *
+	 * @var string
 	 */
-	public function unregister_embed() {
-		remove_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10 );
-	}
+	protected $base_embed_url = 'https://w.soundcloud.com/player/';
 
 	/**
-	 * Render oEmbed.
-	 *
-	 * @see \WP_Embed::shortcode()
+	 * Default AMP tag to be used when sanitizing embeds.
 	 *
-	 * @codeCoverageIgnore
-	 * @deprecated Core's oEmbed handler is now used instead, with embed_oembed_html filter used to convert to AMP.
-	 * @param array  $matches URL pattern matches.
-	 * @param array  $attr    Shortcode attributes.
-	 * @param string $url     URL.
-	 * @return string Rendered oEmbed.
+	 * @var string
 	 */
-	public function oembed( $matches, $attr, $url ) {
-		_deprecated_function( __METHOD__, '0.6' );
-		return $this->render( $this->extract_params_from_iframe_src( $url ), $url );
-	}
+	protected $amp_tag = 'amp-soundcloud';
 
 	/**
-	 * Filter oEmbed HTML for SoundCloud to convert to AMP.
+	 * Get all raw embeds from the DOM.
 	 *
-	 * @param string $cache Cache for oEmbed.
-	 * @param string $url   Embed URL.
-	 * @return string Embed.
+	 * @param Document $dom Document.
+	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
-	public function filter_embed_oembed_html( $cache, $url ) {
-		if ( false === strpos( wp_parse_url( $url, PHP_URL_HOST ), 'soundcloud.com' ) ) {
-			return $cache;
-		}
-		return $this->parse_amp_component_from_iframe( $cache, $url );
+	protected function get_raw_embed_nodes( Document $dom ) {
+		return $dom->xpath->query( sprintf( '//iframe[ starts-with( @src, "%s" ) ]', $this->base_embed_url ) );
 	}
 
 	/**
-	 * Parse AMP component from iframe.
+	 * Make embed AMP compatible.
 	 *
-	 * @param string      $html HTML.
-	 * @param string|null $url  Embed URL, for fallback purposes.
-	 * @return string AMP component or empty if unable to determine SoundCloud ID.
+	 * @param DOMElement $node DOM element.
 	 */
-	private function parse_amp_component_from_iframe( $html, $url = null ) {
-		$props = $this->match_element_attributes( $html, 'iframe', [ 'src', 'title', 'width', 'height' ] );
-		if ( ! isset( $props ) || empty( $props['src'] ) ) {
-			return $html;
-		}
-
-		$src   = html_entity_decode( $props['src'], ENT_QUOTES );
-		$query = [];
-		parse_str( wp_parse_url( $src, PHP_URL_QUERY ), $query );
+	protected function sanitize_raw_embed( DOMElement $node ) {
+		$iframe_src = $node->getAttribute( 'src' );
 
+		parse_str( wp_parse_url( $iframe_src, PHP_URL_QUERY ), $query );
 		if ( empty( $query['url'] ) ) {
-			return $html;
-		}
-
-		$props = array_merge(
-			$props,
-			$this->extract_params_from_iframe_src( $query['url'] )
-		);
-		if ( isset( $query['visual'] ) ) {
-			$props['visual'] = $query['visual'];
+			return;
 		}
 
-		if ( $url && ! empty( $props['title'] ) ) {
-			$props['fallback'] = sprintf(
-				'<a fallback href="%s">%s</a>',
-				esc_url( $url ),
-				esc_html( $props['title'] )
-			);
+		$embed_id = $this->parse_embed_id_from_url( $query['url'] );
+		if ( null === $embed_id ) {
+			return;
 		}
 
-		return $this->render( $props, $url );
-	}
-
-	/**
-	 * Render embed.
-	 *
-	 * @param array  $args Args.
-	 * @param string $url  Embed URL for fallback purposes. Optional.
-	 * @return string Rendered embed.
-	 */
-	public function render( $args, $url ) {
-		$args = wp_parse_args(
-			$args,
-			[
-				'track_id'    => false,
-				'playlist_id' => false,
-				'height'      => null,
-				'width'       => null,
-				'visual'      => null,
-				'fallback'    => '',
-			]
-		);
-
-		$this->did_convert_elements = true;
-
 		$attributes = [];
-		if ( ! empty( $args['track_id'] ) ) {
-			$attributes['data-trackid'] = $args['track_id'];
-		} elseif ( ! empty( $args['playlist_id'] ) ) {
-			$attributes['data-playlistid'] = $args['playlist_id'];
-		} elseif ( $url ) {
-			return $this->render_embed_fallback( $url );
-		} else {
-			return '';
-		}
 
-		if ( isset( $args['visual'] ) ) {
-			$attributes['data-visual'] = rest_sanitize_boolean( $args['visual'] ) ? 'true' : 'false';
+		if ( isset( $embed_id['track_id'] ) ) {
+			$attributes['data-trackid'] = $embed_id['track_id'];
+		} elseif ( isset( $embed_id['playlist_id'] ) ) {
+			$attributes['data-playlistid'] = $embed_id['playlist_id'];
 		}
 
-		$attributes['height'] = $args['height'] ?: $this->args['height'];
-		if ( $args['width'] ) {
-			$attributes['width']  = $args['width'];
+		$attributes['height'] = $node->hasAttribute( 'height' )
+			? $node->getAttribute( 'height' )
+			: $this->args['height'];
+
+		if ( $node->hasAttribute( 'width' ) ) {
+			$attributes['width']  = $node->getAttribute( 'width' );
 			$attributes['layout'] = 'responsive';
 		} else {
 			$attributes['layout'] = 'fixed-height';
 		}
 
-		return AMP_HTML_Utils::build_tag(
-			'amp-soundcloud',
-			$attributes,
-			$args['fallback']
-		);
-	}
+		if ( isset( $query['visual'] ) ) {
+			$attributes['data-visual'] = rest_sanitize_boolean( $query['visual'] ) ? 'true' : 'false';
+		}
 
-	/**
-	 * Render embed fallback.
-	 *
-	 * @param string $url URL.
-	 * @return string Fallback link.
-	 */
-	private function render_embed_fallback( $url ) {
-		return AMP_HTML_Utils::build_tag(
-			'a',
-			[
-				'href'  => esc_url_raw( $url ),
-				'class' => 'amp-wp-embed-fallback',
-			],
-			esc_html( $url )
+		$amp_node = AMP_DOM_Utils::create_node(
+			Document::fromNode( $node ),
+			$this->amp_tag,
+			$attributes
 		);
+
+		$this->unwrap_p_element( $node );
+
+		$node->parentNode->replaceChild( $amp_node, $node );
 	}
 
 	/**
-	 * Get params from Soundcloud iframe src.
+	 * Get embed ID from Soundcloud iframe src.
 	 *
 	 * @param string $url URL.
-	 * @return array Params extracted from URL.
+	 * @return array|null Array with key being the embed type and value being the embed ID, or null if embed type and ID could not be found.
 	 */
-	private function extract_params_from_iframe_src( $url ) {
-		$parsed_url = wp_parse_url( $url );
-		if ( preg_match( '#tracks/(?P<track_id>\d+)#', $parsed_url['path'], $matches ) ) {
-			return [
-				'track_id' => $matches['track_id'],
-			];
+	private function parse_embed_id_from_url( $url ) {
+		if ( preg_match( '#/(?P<type>tracks|playlists)/(?P<id>\d+)#', $url, $matches ) ) {
+			if ( 'tracks' === $matches['type'] ) {
+				return [ 'track_id' => $matches['id'] ];
+			}
+			if ( 'playlists' === $matches['type'] ) {
+				return [ 'playlist_id' => $matches['id'] ];
+			}
 		}
-		if ( preg_match( '#playlists/(?P<playlist_id>\d+)#', $parsed_url['path'], $matches ) ) {
-			return [
-				'playlist_id' => $matches['playlist_id'],
-			];
-		}
-		return [];
+
+		return null;
 	}
 }
diff --git a/includes/embeds/class-amp-tiktok-embed-handler.php b/includes/embeds/class-amp-tiktok-embed-handler.php
index 7158f7da8a3..1cbb1bfadbd 100644
--- a/includes/embeds/class-amp-tiktok-embed-handler.php
+++ b/includes/embeds/class-amp-tiktok-embed-handler.php
@@ -13,65 +13,41 @@
 class AMP_TikTok_Embed_Handler extends AMP_Base_Embed_Handler {
 
 	/**
-	 * Registers embed.
-	 */
-	public function register_embed() {
-		// Not implemented.
-	}
-
-	/**
-	 * Unregisters embed.
-	 */
-	public function unregister_embed() {
-		// Not implemented.
-	}
-
-	/**
-	 * Sanitize TikTok embeds to be AMP compatible.
+	 * Default AMP tag to be used when sanitizing embeds.
 	 *
-	 * @param Document $dom DOM.
+	 * @var string
 	 */
-	public function sanitize_raw_embeds( Document $dom ) {
-		$nodes = $dom->xpath->query( '//blockquote[ contains( @class, "tiktok-embed" ) ]' );
-
-		foreach ( $nodes as $node ) {
-			if ( ! $this->is_raw_embed( $node ) ) {
-				continue;
-			}
-
-			$this->make_embed_amp_compatible( $node );
-		}
-	}
+	protected $amp_tag = 'amp-embedly-card';
 
 	/**
-	 * Determine if the node has already been sanitized.
+	 * Get all raw embeds from the DOM.
 	 *
-	 * @param DOMElement $node The DOMNode.
-	 * @return bool Whether the node is a raw embed.
+	 * @param Document $dom Document.
+	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
-	protected function is_raw_embed( DOMElement $node ) {
-		return ! $node->firstChild || ( $node->firstChild && 'amp-embedly-card' !== $node->firstChild->nodeName );
+	protected function get_raw_embed_nodes( Document $dom ) {
+		return $dom->xpath->query( '//blockquote[ contains( @class, "tiktok-embed" ) ]' );
 	}
 
 	/**
-	 * Make TikTok embed AMP compatible.
+	 * Make embed AMP compatible.
 	 *
-	 * @param DOMElement $blockquote_node The <blockquote> node to make AMP compatible.
+	 * @param DOMElement $node DOM element.
 	 */
-	protected function make_embed_amp_compatible( DOMElement $blockquote_node ) {
-		$dom       = $blockquote_node->ownerDocument;
-		$video_url = $blockquote_node->getAttribute( 'cite' );
+	protected function sanitize_raw_embed( DOMElement $node ) {
+		$dom       = $node->ownerDocument;
+		$video_url = $node->getAttribute( 'cite' );
 
 		// If there is no video ID, stop here as its needed for the `data-url` parameter.
 		if ( empty( $video_url ) ) {
 			return;
 		}
 
-		$this->remove_embed_script( $blockquote_node );
+		$this->remove_script_sibling( $node, 'tiktok.com/embed.js' );
 
 		$amp_node = AMP_DOM_Utils::create_node(
 			Document::fromNode( $dom ),
-			'amp-embedly-card',
+			$this->amp_tag,
 			[
 				'layout'             => 'responsive',
 				'height'             => 700,
@@ -82,7 +58,7 @@ protected function make_embed_amp_compatible( DOMElement $blockquote_node ) {
 		);
 
 		// Find existing <section> node to use as the placeholder.
-		foreach ( iterator_to_array( $blockquote_node->childNodes ) as $child ) {
+		foreach ( iterator_to_array( $node->childNodes ) as $child ) {
 			if ( ! ( $child instanceof DOMElement ) ) {
 				continue;
 			}
@@ -94,48 +70,13 @@ protected function make_embed_amp_compatible( DOMElement $blockquote_node ) {
 				 *
 				 * @var DOMElement $placeholder_node
 				 */
-				$placeholder_node = $blockquote_node->removeChild( $child );
+				$placeholder_node = $node->removeChild( $child );
 				$placeholder_node->setAttribute( 'placeholder', '' );
 				$amp_node->appendChild( $placeholder_node );
 				break;
 			}
 		}
 
-		$blockquote_node->parentNode->replaceChild( $amp_node, $blockquote_node );
-	}
-
-	/**
-	 * Remove the TikTok embed script if it exists.
-	 *
-	 * @param DOMElement $node The DOMNode to make AMP compatible.
-	 */
-	protected function remove_embed_script( DOMElement $node ) {
-		$next_element_sibling = $node->nextSibling;
-		while ( $next_element_sibling && ! ( $next_element_sibling instanceof DOMElement ) ) {
-			$next_element_sibling = $next_element_sibling->nextSibling;
-		}
-
-		$script_src = 'tiktok.com/embed.js';
-
-		// Handle case where script is wrapped in paragraph by wpautop.
-		if ( $next_element_sibling instanceof DOMElement && 'p' === $next_element_sibling->nodeName ) {
-			$children = $next_element_sibling->getElementsByTagName( '*' );
-			if ( 1 === $children->length && 'script' === $children->item( 0 )->nodeName && false !== strpos( $children->item( 0 )->getAttribute( 'src' ), $script_src ) ) {
-				$next_element_sibling->parentNode->removeChild( $next_element_sibling );
-				return;
-			}
-		}
-
-		// Handle case where script is immediately following.
-		$is_embed_script = (
-			$next_element_sibling instanceof DOMElement
-			&&
-			'script' === strtolower( $next_element_sibling->nodeName )
-			&&
-			false !== strpos( $next_element_sibling->getAttribute( 'src' ), $script_src )
-		);
-		if ( $is_embed_script ) {
-			$next_element_sibling->parentNode->removeChild( $next_element_sibling );
-		}
+		$node->parentNode->replaceChild( $amp_node, $node );
 	}
 }
diff --git a/includes/embeds/class-amp-tumblr-embed-handler.php b/includes/embeds/class-amp-tumblr-embed-handler.php
index ffa29c38367..914287d5e6f 100644
--- a/includes/embeds/class-amp-tumblr-embed-handler.php
+++ b/includes/embeds/class-amp-tumblr-embed-handler.php
@@ -6,54 +6,89 @@
  * @since 0.7
  */
 
+use AmpProject\Dom\Document;
+
 /**
  * Class AMP_Tumblr_Embed_Handler
  */
 class AMP_Tumblr_Embed_Handler extends AMP_Base_Embed_Handler {
 
 	/**
-	 * Register embed.
+	 * Default width.
+	 *
+	 * Tumblr embeds for web have a fixed width of 540px.
+	 * See <https://tumblr.zendesk.com/hc/en-us/articles/226261028-Embed-pro-tips>.
+	 *
+	 * @var int
 	 */
-	public function register_embed() {
-		add_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10, 2 );
-	}
+	protected $DEFAULT_WIDTH = 540;
 
 	/**
-	 * Unregister embed.
+	 * Base URL used for identifying embeds.
+	 *
+	 * @var string
 	 */
-	public function unregister_embed() {
-		remove_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10 );
+	protected $base_embed_url = 'https://embed.tumblr.com/embed/post/';
+
+	/**
+	 * Get all raw embeds from the DOM.
+	 *
+	 * @param Document $dom Document.
+	 * @return DOMNodeList A list of DOMElement nodes.
+	 */
+	protected function get_raw_embed_nodes( Document $dom ) {
+		return $dom->xpath->query( sprintf( '//div[ @class = "tumblr-post" and starts-with( @data-href, "%s" ) ]', $this->base_embed_url ) );
 	}
 
 	/**
-	 * Filter oEmbed HTML for Tumblr to prepare it for AMP.
+	 * Make embed AMP compatible.
 	 *
-	 * @param string $cache Cache for oEmbed.
-	 * @param string $url   Embed URL.
-	 * @return string Embed.
+	 * @param DOMElement $node DOM element.
 	 */
-	public function filter_embed_oembed_html( $cache, $url ) {
-		$parsed_url = wp_parse_url( $url );
-		if ( false === strpos( $parsed_url['host'], 'tumblr.com' ) ) {
-			return $cache;
-		}
+	protected function sanitize_raw_embed( DOMElement $node ) {
+		$dom        = Document::fromNode( $node );
+		$iframe_src = $node->getAttribute( 'data-href' );
+
+		$attributes = [
+			'src'       => $iframe_src,
+			'layout'    => 'responsive',
+			'width'     => $this->args['width'],
+			'height'    => $this->args['height'],
+			'resizable' => '',
+			'sandbox'   => 'allow-scripts allow-popups allow-same-origin',
+		];
+
+		$amp_node = AMP_DOM_Utils::create_node(
+			$dom,
+			$this->amp_tag,
+			$attributes
+		);
 
-		// @todo The iframe will not get sized properly.
-		if ( preg_match( '#data-href="(?P<href>https://embed.tumblr.com/embed/post/\w+/\w+)"#', $cache, $matches ) ) {
-			$cache = AMP_HTML_Utils::build_tag(
-				'amp-iframe',
-				[
-					'width'   => $this->args['width'],
-					'height'  => $this->args['height'],
-					'layout'  => 'responsive',
-					'sandbox' => 'allow-scripts allow-popups', // The allow-scripts is needed to allow the iframe to render; allow-popups needed to allow clicking.
-					'src'     => $matches['href'],
-				],
-				sprintf( '<a placeholder href="%s">Tumblr</a>', $url )
-			);
+		// Add an overflow node to allow the amp-iframe to resize.
+		$overflow_node = AMP_DOM_Utils::create_node(
+			$dom,
+			'div',
+			[
+				'overflow'   => '',
+				'tabindex'   => 0,
+				'role'       => 'button',
+				'aria-label' => esc_attr__( 'See more', 'amp' ),
+			]
+		);
+
+		$overflow_node->textContent = esc_html__( 'See more', 'amp' );
+		$amp_node->appendChild( $overflow_node );
+
+		// Append the original link as a placeholder node.
+		if ( $node->firstChild instanceof DOMElement && 'a' === $node->firstChild->nodeName ) {
+			$placeholder_node = $node->firstChild;
+			$placeholder_node->setAttribute( 'placeholder', '' );
+			$amp_node->appendChild( $placeholder_node );
 		}
 
-		return $cache;
+		$this->remove_script_sibling( $node, 'assets.tumblr.com/post.js' );
+
+		$node->parentNode->replaceChild( $amp_node, $node );
 	}
 }
 
diff --git a/includes/embeds/class-amp-twitter-embed-handler.php b/includes/embeds/class-amp-twitter-embed-handler.php
index 53327df3578..8f2f95dc7af 100644
--- a/includes/embeds/class-amp-twitter-embed-handler.php
+++ b/includes/embeds/class-amp-twitter-embed-handler.php
@@ -28,184 +28,194 @@ class AMP_Twitter_Embed_Handler extends AMP_Base_Embed_Handler {
 	 * @since 1.0
 	 * @var string
 	 */
-	const URL_PATTERN_TIMELINE = '#https?:\/\/twitter\.com(?:\/\#\!\/|\/)(?P<username>[a-zA-Z0-9_]{1,20})(?:$|\/(?P<type>likes|lists)(\/(?P<id>[a-zA-Z0-9_-]+))?)#i';
+	const URL_PATTERN_MOMENT = '#https?:\/\/twitter\.com\/i\/moments\/(?P<id>\d+)#i';
 
 	/**
-	 * Tag.
+	 * URL pattern for a Twitter timeline.
 	 *
-	 * @var string embed HTML blockquote tag to identify and replace with AMP version.
+	 * @since 1.0
+	 * @var string
 	 */
-	protected $sanitize_tag = 'blockquote';
+	const URL_PATTERN_TIMELINE = '#https?:\/\/twitter\.com(?:\/\#\!\/|\/)(?P<username>[a-zA-Z0-9_]{1,20})(?:$|\/(?P<type>likes|lists|timelines)(\/(?P<id>[a-zA-Z0-9_-]+))?|.+?)#i';
 
 	/**
-	 * Tag.
+	 * Default AMP tag to be used when sanitizing embeds.
 	 *
-	 * @var string AMP amp-facebook tag
+	 * @var string
 	 */
-	private $amp_tag = 'amp-twitter';
+	protected $amp_tag = 'amp-twitter';
 
 	/**
-	 * Registers embed.
+	 * Sanitize all embeds on the page to be AMP compatible.
+	 *
+	 * @param Document $dom DOM.
 	 */
-	public function register_embed() {
-		wp_embed_register_handler( 'amp-twitter-timeline', self::URL_PATTERN_TIMELINE, [ $this, 'oembed_timeline' ], -1 );
+	public function sanitize_raw_embeds( Document $dom ) {
+		$this->sanitize_tweet_embeds( $dom );
+		$this->sanitize_timeline_embeds( $dom );
+		$this->sanitize_moment_embeds( $dom );
 	}
 
 	/**
-	 * Unregisters embed.
+	 * Sanitize tweets.
+	 *
+	 * @param Document $dom Document.
 	 */
-	public function unregister_embed() {
-		wp_embed_unregister_handler( 'amp-twitter-timeline', -1 );
+	private function sanitize_tweet_embeds( Document $dom ) {
+		$nodes = $dom->xpath->query( '//blockquote[ @class = "twitter-tweet" ]' );
+		$this->sanitize_raw_embeds_with_type( 'tweet', $nodes );
 	}
 
 	/**
-	 * Render oEmbed for a timeline.
+	 * Sanitize timelines.
 	 *
-	 * @since 1.0
-	 *
-	 * @param array $matches URL pattern matches.
-	 * @return string Rendered oEmbed.
+	 * @param Document $dom Document.
 	 */
-	public function oembed_timeline( $matches ) {
-		if ( ! isset( $matches['username'] ) ) {
-			return '';
-		}
-
-		$attributes = [
-			'data-timeline-source-type' => 'profile',
-			'data-timeline-screen-name' => $matches['username'],
-		];
-
-		if ( isset( $matches['type'] ) ) {
-			switch ( $matches['type'] ) {
-				case 'likes':
-					$attributes['data-timeline-source-type'] = 'likes';
-					break;
-				case 'lists':
-					if ( ! isset( $matches['id'] ) ) {
-						return '';
-					}
-					$attributes['data-timeline-source-type']       = 'list';
-					$attributes['data-timeline-slug']              = $matches['id'];
-					$attributes['data-timeline-owner-screen-name'] = $attributes['data-timeline-screen-name'];
-					unset( $attributes['data-timeline-screen-name'] );
-					break;
-				default:
-					return '';
-			}
-		}
-
-		$attributes['layout'] = 'responsive';
-		$attributes['width']  = $this->args['width'];
-		$attributes['height'] = $this->args['height'];
-
-		$this->did_convert_elements = true;
-
-		return AMP_HTML_Utils::build_tag( $this->amp_tag, $attributes );
+	private function sanitize_timeline_embeds( Document $dom ) {
+		$nodes = $dom->xpath->query( '//a[ @class = "twitter-timeline" ]' );
+		$this->sanitize_raw_embeds_with_type( 'timeline', $nodes );
 	}
 
 	/**
-	 * Sanitized <blockquote class="twitter-tweet"> tags to <amp-twitter>.
+	 * Sanitize moments.
 	 *
-	 * @param Document $dom DOM.
+	 * @param Document $dom Document.
 	 */
-	public function sanitize_raw_embeds( Document $dom ) {
-		$nodes     = $dom->getElementsByTagName( $this->sanitize_tag );
-		$num_nodes = $nodes->length;
-
-		if ( 0 === $num_nodes ) {
-			return;
-		}
-
-		for ( $i = $num_nodes - 1; $i >= 0; $i-- ) {
-			$node = $nodes->item( $i );
-			if ( ! $node instanceof DOMElement ) {
-				continue;
-			}
-
-			if ( $this->is_tweet_raw_embed( $node ) ) {
-				$this->create_amp_twitter_and_replace_node( $dom, $node );
-			}
-		}
+	private function sanitize_moment_embeds( Document $dom ) {
+		$nodes = $dom->xpath->query( '//a[ @class = "twitter-moment" ]' );
+		$this->sanitize_raw_embeds_with_type( 'moment', $nodes );
 	}
 
 	/**
-	 * Checks whether it's a twitter blockquote or not.
+	 * Get all raw embeds from the DOM.
 	 *
-	 * @param DOMElement $node The DOMNode to adjust and replace.
-	 * @return bool Whether node is for raw embed.
+	 * @param Document $dom Document.
+	 * @return DOMNodeList|null A list of DOMElement nodes, or null if not implemented.
 	 */
-	private function is_tweet_raw_embed( $node ) {
-		// Skip processing blockquotes that have already been passed through while being wrapped with <amp-twitter>.
-		if ( $node->parentNode && 'amp-twitter' === $node->parentNode->nodeName ) {
-			return false;
-		}
-
-		$class_attr = $node->getAttribute( 'class' );
+	protected function get_raw_embed_nodes( Document $dom ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+		return null;
+	}
 
-		return null !== $class_attr && false !== strpos( $class_attr, 'twitter-tweet' );
+	/**
+	 * Make embed AMP compatible.
+	 *
+	 * @param DOMElement $node DOM element.
+	 */
+	protected function sanitize_raw_embed( DOMElement $node ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
 	}
 
 	/**
-	 * Make final modifications to DOMNode
+	 * Sanitize list of raw embeds based on the embed type.
 	 *
-	 * @param Document   $dom The HTML Document.
-	 * @param DOMElement $node The DOMNode to adjust and replace.
+	 * @param string      $embed_type The type of Twitter embed.
+	 * @param DOMNodeList $nodes List of DOMElement nodes.
 	 */
-	private function create_amp_twitter_and_replace_node( Document $dom, DOMElement $node ) {
-		$tweet_id = $this->get_tweet_id( $node );
-		if ( empty( $tweet_id ) ) {
-			return;
-		}
+	protected function sanitize_raw_embeds_with_type( $embed_type, DOMNodeList $nodes ) {
+		foreach ( $nodes as $node ) {
+			/**
+			 * Node.
+			 *
+			 * @var DOMElement $node
+			 */
+
+			if ( ! $this->is_raw_embed( $node ) ) {
+				continue;
+			}
 
-		$attributes = [
-			'width'        => $this->DEFAULT_WIDTH,
-			'height'       => $this->DEFAULT_HEIGHT,
-			'layout'       => 'responsive',
-			'data-tweetid' => $tweet_id,
-		];
+			$attributes = [
+				'width'  => $this->DEFAULT_WIDTH,
+				'height' => $this->DEFAULT_HEIGHT,
+				'layout' => 'responsive',
+			];
 
-		if ( $node->hasAttributes() ) {
-			foreach ( $node->attributes as $attr ) {
-				$attributes[ $attr->nodeName ] = $attr->nodeValue;
+			if ( $node->hasAttribute( 'data-width' ) ) {
+				$attributes['width'] = $node->getAttribute( 'data-width' );
+				$node->removeAttribute( 'data-width' );
 			}
-		}
 
-		$new_node = AMP_DOM_Utils::create_node(
-			$dom,
-			$this->amp_tag,
-			$attributes
-		);
+			if ( $node->hasAttribute( 'data-height' ) ) {
+				$attributes['height'] = $node->getAttribute( 'data-height' );
+				$node->removeAttribute( 'data-height' );
+			}
 
-		/**
-		 * Placeholder element to append to the new node.
-		 *
-		 * @var DOMElement $placeholder
-		 */
-		$placeholder = $node->cloneNode( true );
-		$placeholder->setAttribute( 'placeholder', '' );
+			switch ( $embed_type ) {
+				case 'tweet':
+					$tweet_id = $this->get_tweet_id( $node );
+					if ( ! $tweet_id ) {
+						return;
+					}
 
-		$new_node->appendChild( $placeholder );
+					$attributes['data-tweetid'] = $tweet_id;
+					break;
+				case 'timeline':
+					$timeline_attrs = $this->get_timeline_attributes( $node->getAttribute( 'href' ) );
+					if ( ! $timeline_attrs ) {
+						return;
+					}
 
-		$this->sanitize_embed_script( $node );
+					if (
+						( ! isset( $timeline_attrs['type'] ) && isset( $timeline_attrs['username'] ) ) ||
+						( isset( $timeline_attrs['type'] ) && in_array( $timeline_attrs['type'], [ 'likes', 'lists' ], true ) )
+					) {
+						$attributes['data-timeline-source-type'] = 'url';
+						$attributes['data-timeline-url']         = $node->getAttribute( 'href' );
+					}
+
+					break;
+				case 'moment':
+					$moment_id = $this->get_moment_id( $node->getAttribute( 'href' ) );
+					if ( ! $moment_id ) {
+						return;
+					}
+
+					$attributes['data-momentid'] = $moment_id;
+					break;
+				default:
+					return;
+			}
+
+			if ( $node->hasAttributes() ) {
+				foreach ( $node->attributes as $attr ) {
+					// Strip `data-` attributes and apply them to the AMP component.
+					if ( false !== strpos( $attr->nodeName, 'data-', 0 ) ) {
+						$attributes[ $attr->nodeName ] = $attr->nodeValue;
+						$node->removeAttribute( $attr->nodeName );
+					}
+				}
+			}
 
-		$node->parentNode->replaceChild( $new_node, $node );
+			$new_node = AMP_DOM_Utils::create_node(
+				Document::fromNode( $node ),
+				'amp-twitter',
+				$attributes
+			);
 
-		$this->did_convert_elements = true;
+			/**
+			 * Placeholder element to append to the new node.
+			 *
+			 * @var DOMElement $placeholder
+			 */
+			$placeholder = $node->cloneNode( true );
+			$placeholder->setAttribute( 'placeholder', '' );
+
+			$new_node->appendChild( $placeholder );
+
+			$this->remove_br_sibling_elements( $node );
+			$this->remove_script_sibling( $node, 'platform.twitter.com/widgets.js' );
+			// We can unwrap the <p> tag once the accompanied <script> is removed.
+			$this->unwrap_p_element( $node );
+
+			$node->parentNode->replaceChild( $new_node, $node );
+		}
 	}
 
 	/**
 	 * Extracts Tweet id.
 	 *
 	 * @param DOMElement $node The DOMNode to adjust and replace.
-	 * @return string Tweet ID, or an empty string if not found.
+	 * @return string|null Tweet ID, or null if not found.
 	 */
-	private function get_tweet_id( $node ) {
-		/**
-		 * DOMNode
-		 *
-		 * @var DOMNodeList $anchors
-		 */
+	private function get_tweet_id( DOMElement $node ) {
 		$anchors = $node->getElementsByTagName( 'a' );
 
 		/**
@@ -220,41 +230,50 @@ private function get_tweet_id( $node ) {
 			}
 		}
 
-		return '';
+		return null;
 	}
 
 	/**
-	 * Removes Twitter's embed <script> tag.
+	 * Parse Twitter timeline attributes from a URL.
 	 *
-	 * @param DOMElement $node The DOMNode to whose sibling is the Twitter script.
+	 * @param string $url URL.
+	 * @return array|null Timeline attributes, or null if the attributes were not found.
 	 */
-	private function sanitize_embed_script( $node ) {
-		$next_element_sibling = $node->nextSibling;
-		while ( $next_element_sibling && ! ( $next_element_sibling instanceof DOMElement ) ) {
-			$next_element_sibling = $next_element_sibling->nextSibling;
+	private function get_timeline_attributes( $url ) {
+		$found = preg_match( self::URL_PATTERN_TIMELINE, $url, $matches );
+		if ( $found ) {
+			return $matches;
 		}
 
-		$script_src = 'platform.twitter.com/widgets.js';
+		return null;
+	}
 
-		// Handle case where script is wrapped in paragraph by wpautop.
-		if ( $next_element_sibling instanceof DOMElement && 'p' === $next_element_sibling->nodeName ) {
-			$children = $next_element_sibling->getElementsByTagName( '*' );
-			if ( 1 === $children->length && 'script' === $children->item( 0 )->nodeName && false !== strpos( $children->item( 0 )->getAttribute( 'src' ), $script_src ) ) {
-				$next_element_sibling->parentNode->removeChild( $next_element_sibling );
-				return;
-			}
+	/**
+	 * Parse Twitter moment ID from a URL.
+	 *
+	 * @param string $url URL.
+	 * @return array|null Timeline attributes, or null if the moment ID was not found.
+	 */
+	private function get_moment_id( $url ) {
+		$found = preg_match( self::URL_PATTERN_MOMENT, $url, $matches );
+		if ( $found ) {
+			return $matches['id'];
 		}
 
-		// Handle case where script is immediately following.
-		$is_embed_script = (
-			$next_element_sibling instanceof DOMElement
-			&&
-			'script' === strtolower( $next_element_sibling->nodeName )
-			&&
-			false !== strpos( $next_element_sibling->getAttribute( 'src' ), $script_src )
-		);
-		if ( $is_embed_script ) {
+		return null;
+	}
+
+	/**
+	 * Remove all <br> sibling elements for specified node.
+	 *
+	 * @param DOMElement $node The node to remove <br> siblings from.
+	 */
+	private function remove_br_sibling_elements( DOMElement $node ) {
+		$next_element_sibling = $node->nextSibling;
+
+		while ( $next_element_sibling && $next_element_sibling instanceof DOMElement && 'br' === $next_element_sibling->nodeName ) {
 			$next_element_sibling->parentNode->removeChild( $next_element_sibling );
+			$next_element_sibling = $node->nextSibling;
 		}
 	}
 }
diff --git a/includes/embeds/class-amp-vimeo-embed-handler.php b/includes/embeds/class-amp-vimeo-embed-handler.php
index 1e20cc438cd..a37726c723f 100644
--- a/includes/embeds/class-amp-vimeo-embed-handler.php
+++ b/includes/embeds/class-amp-vimeo-embed-handler.php
@@ -5,6 +5,8 @@
  * @package AMP
  */
 
+use AmpProject\Dom\Document;
+
 /**
  * Class AMP_Vimeo_Embed_Handler
  *
@@ -12,13 +14,6 @@
  */
 class AMP_Vimeo_Embed_Handler extends AMP_Base_Embed_Handler {
 
-	/**
-	 * The embed URL pattern.
-	 *
-	 * @var string
-	 */
-	const URL_PATTERN = '#https?:\/\/(.+\.)?vimeo\.com\/.*#i';
-
 	/**
 	 * The aspect ratio.
 	 *
@@ -40,6 +35,20 @@ class AMP_Vimeo_Embed_Handler extends AMP_Base_Embed_Handler {
 	 */
 	protected $DEFAULT_HEIGHT = 338;
 
+	/**
+	 * Base URL used for identifying embeds.
+	 *
+	 * @var string
+	 */
+	protected $base_embed_url = 'https://player.vimeo.com/video/';
+
+	/**
+	 * Default AMP tag to be used when sanitizing embeds.
+	 *
+	 * @var string
+	 */
+	protected $amp_tag = 'amp-vimeo';
+
 	/**
 	 * AMP_Vimeo_Embed_Handler constructor.
 	 *
@@ -56,123 +65,41 @@ public function __construct( $args = [] ) {
 	}
 
 	/**
-	 * Register embed.
-	 */
-	public function register_embed() {
-		wp_embed_register_handler( 'amp-vimeo', self::URL_PATTERN, [ $this, 'oembed' ], -1 );
-		add_filter( 'wp_video_shortcode_override', [ $this, 'video_override' ], 10, 2 );
-	}
-
-	/**
-	 * Unregister embed.
-	 */
-	public function unregister_embed() {
-		wp_embed_unregister_handler( 'amp-vimeo', -1 );
-	}
-
-	/**
-	 * Render oEmbed.
-	 *
-	 * @see \WP_Embed::shortcode()
+	 * Get all raw embeds from the DOM.
 	 *
-	 * @param array  $matches URL pattern matches.
-	 * @param array  $attr    Shortcode attribues.
-	 * @param string $url     URL.
-	 * @param string $rawattr Unmodified shortcode attributes.
-	 * @return string Rendered oEmbed.
+	 * @param Document $dom Document.
+	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
-	public function oembed( $matches, $attr, $url, $rawattr ) {
-		$video_id = $this->get_video_id_from_url( $url );
-
-		return $this->render(
-			[
-				'url'      => $url,
-				'video_id' => $video_id,
-			]
-		);
+	protected function get_raw_embed_nodes( Document $dom ) {
+		return $dom->xpath->query( sprintf( '//iframe[ starts-with( @src, "%s" ) ]', $this->base_embed_url ) );
 	}
 
 	/**
-	 * Render.
+	 * Make embed AMP compatible.
 	 *
-	 * @param array $args Args.
-	 * @return string Rendered.
+	 * @param DOMElement $node DOM element.
 	 */
-	public function render( $args ) {
-		$args = wp_parse_args(
-			$args,
-			[
-				'video_id' => false,
-			]
-		);
+	protected function sanitize_raw_embed( DOMElement $node ) {
+		$iframe_src = $node->getAttribute( 'src' );
 
-		if ( empty( $args['video_id'] ) ) {
-			return AMP_HTML_Utils::build_tag(
-				'a',
-				[
-					'href'  => esc_url_raw( $args['url'] ),
-					'class' => 'amp-wp-embed-fallback',
-				],
-				esc_html( $args['url'] )
-			);
+		$video_id = strtok( substr( $iframe_src, strlen( $this->base_embed_url ) ), '/?#' );
+		if ( empty( $video_id ) ) {
+			return;
 		}
 
-		$this->did_convert_elements = true;
-
-		return AMP_HTML_Utils::build_tag(
-			'amp-vimeo',
+		$amp_node = AMP_DOM_Utils::create_node(
+			Document::fromNode( $node ),
+			$this->amp_tag,
 			[
-				'data-videoid' => $args['video_id'],
+				'data-videoid' => $video_id,
 				'layout'       => 'responsive',
 				'width'        => $this->args['width'],
 				'height'       => $this->args['height'],
 			]
 		);
-	}
-
-	/**
-	 * Determine the video ID from the URL.
-	 *
-	 * @param string $url URL.
-	 * @return int Video ID.
-	 */
-	private function get_video_id_from_url( $url ) {
-		$path = wp_parse_url( $url, PHP_URL_PATH );
 
-		// @todo This will not get the private key for unlisted videos (which look like https://vimeo.com/123456789/abcdef0123), but amp-vimeo doesn't support them currently anyway.
-		$video_id = '';
-		if ( $path && preg_match( ':/(\d+):', $path, $matches ) ) {
-			$video_id = $matches[1];
-		}
-
-		return $video_id;
-	}
-
-	/**
-	 * Override the output of Vimeo videos.
-	 *
-	 * This overrides the value in wp_video_shortcode().
-	 * The pattern matching is copied from WP_Widget_Media_Video::render().
-	 *
-	 * @param string $html Empty variable to be replaced with shortcode markup.
-	 * @param array  $attr The shortcode attributes.
-	 * @return string|null $markup The markup to output.
-	 */
-	public function video_override( $html, $attr ) {
-		if ( ! isset( $attr['src'] ) ) {
-			return $html;
-		}
-		$src           = $attr['src'];
-		$vimeo_pattern = '#^https?://(.+\.)?vimeo\.com/.*#';
-		if ( 1 !== preg_match( $vimeo_pattern, $src ) ) {
-			return $html;
-		}
-
-		$video_id = $this->get_video_id_from_url( $src );
-		if ( empty( $video_id ) ) {
-			return '';
-		}
+		$this->unwrap_p_element( $node );
 
-		return $this->render( compact( 'video_id' ) );
+		$node->parentNode->replaceChild( $amp_node, $node );
 	}
 }
diff --git a/includes/embeds/class-amp-vine-embed-handler.php b/includes/embeds/class-amp-vine-embed-handler.php
index 1848c58634f..efe1a346cd6 100644
--- a/includes/embeds/class-amp-vine-embed-handler.php
+++ b/includes/embeds/class-amp-vine-embed-handler.php
@@ -5,10 +5,13 @@
  * @package AMP
  */
 
+use AmpProject\AmpWP\Embed\Registerable;
+use AmpProject\Dom\Document;
+
 /**
  * Class AMP_Vine_Embed_Handler
  */
-class AMP_Vine_Embed_Handler extends AMP_Base_Embed_Handler {
+class AMP_Vine_Embed_Handler extends AMP_Base_Embed_Handler implements Registerable {
 	const URL_PATTERN = '#https?://vine\.co/v/([^/?]+)#i';
 
 	/**
@@ -25,18 +28,25 @@ class AMP_Vine_Embed_Handler extends AMP_Base_Embed_Handler {
 	 */
 	protected $DEFAULT_HEIGHT = 400;
 
+	/**
+	 * Default AMP tag to be used when sanitizing embeds.
+	 *
+	 * @var string
+	 */
+	protected $amp_tag = 'amp-vine';
+
 	/**
 	 * Registers embed.
 	 */
 	public function register_embed() {
-		wp_embed_register_handler( 'amp-vine', self::URL_PATTERN, [ $this, 'oembed' ], -1 );
+		wp_embed_register_handler( $this->amp_tag, self::URL_PATTERN, [ $this, 'oembed' ], -1 );
 	}
 
 	/**
 	 * Unregisters embed.
 	 */
 	public function unregister_embed() {
-		wp_embed_unregister_handler( 'amp-vine', -1 );
+		wp_embed_unregister_handler( $this->amp_tag, -1 );
 	}
 
 	/**
@@ -82,10 +92,8 @@ public function render( $args ) {
 			);
 		}
 
-		$this->did_convert_elements = true;
-
 		return AMP_HTML_Utils::build_tag(
-			'amp-vine',
+			$this->amp_tag,
 			[
 				'data-vineid' => $args['vine_id'],
 				'layout'      => 'responsive',
@@ -94,4 +102,23 @@ public function render( $args ) {
 			]
 		);
 	}
+
+	/**
+	 * Get all raw embeds from the DOM.
+	 *
+	 * @param Document $dom Document.
+	 * @return DOMNodeList A list of DOMElement nodes.
+	 */
+	protected function get_raw_embed_nodes( Document $dom ) {
+		return $dom->xpath->query( sprintf( '//%s', $this->amp_tag ) );
+	}
+
+	/**
+	 * Make embed AMP compatible.
+	 *
+	 * @param DOMElement $node DOM element.
+	 */
+	protected function sanitize_raw_embed( DOMElement $node ) {
+		$this->unwrap_p_element( $node );
+	}
 }
diff --git a/includes/embeds/class-amp-wordpress-tv-embed-handler.php b/includes/embeds/class-amp-wordpress-tv-embed-handler.php
index 512d38c7ef6..de34896c473 100644
--- a/includes/embeds/class-amp-wordpress-tv-embed-handler.php
+++ b/includes/embeds/class-amp-wordpress-tv-embed-handler.php
@@ -6,6 +6,8 @@
  * @since 1.4
  */
 
+use AmpProject\Dom\Document;
+
 /**
  * Class AMP_WordPress_TV_Embed_Handler
  *
@@ -14,39 +16,31 @@
 class AMP_WordPress_TV_Embed_Handler extends AMP_Base_Embed_Handler {
 
 	/**
-	 * The URL pattern to determine if an embed URL is for this type, copied from WP_oEmbed.
+	 * Base URL used for identifying embeds.
 	 *
-	 * @see https://github.com/WordPress/wordpress-develop/blob/e13480/src/wp-includes/class-wp-oembed.php#L64
-	 */
-	const URL_PATTERN = '#https?://wordpress\.tv/.*#i';
-
-	/**
-	 * Register embed.
+	 * @var string
 	 */
-	public function register_embed() {
-		add_filter( 'embed_oembed_html', [ $this, 'filter_oembed_html' ], 10, 2 );
-	}
+	protected $base_embed_url = 'https://video.wordpress.com/embed/';
 
 	/**
-	 * Unregister embed.
+	 * Get all raw embeds from the DOM.
+	 *
+	 * @param Document $dom Document.
+	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
-	public function unregister_embed() {
-		remove_filter( 'embed_oembed_html', [ $this, 'filter_oembed_html' ], 10 );
+	protected function get_raw_embed_nodes( Document $dom ) {
+		return $dom->xpath->query( sprintf( '//iframe[ starts-with( @src, "%s" ) ]', $this->base_embed_url ) );
 	}
 
 	/**
-	 * Filters the oembed HTML to make it valid AMP.
+	 * Make embed AMP compatible.
 	 *
-	 * @param mixed  $cache The cached rendered markup.
-	 * @param string $url   The embed URL.
-	 * @return string The filtered embed markup.
+	 * @param DOMElement $node DOM element.
 	 */
-	public function filter_oembed_html( $cache, $url ) {
-		if ( ! preg_match( self::URL_PATTERN, $url ) ) {
-			return $cache;
-		}
+	protected function sanitize_raw_embed( DOMElement $node ) {
+		$node->setAttribute( 'layout', 'responsive' );
 
-		$modified_block_content = preg_replace( '#<script(?:\s.*?)?>.*?</script>#s', '', $cache );
-		return null !== $modified_block_content ? $modified_block_content : $cache;
+		$this->remove_script_sibling( $node, 'v0.wordpress.com/js/next/videopress-iframe.js' );
+		$this->unwrap_p_element( $node );
 	}
 }
diff --git a/includes/embeds/class-amp-youtube-embed-handler.php b/includes/embeds/class-amp-youtube-embed-handler.php
index 2970a3ecaba..89467426f02 100644
--- a/includes/embeds/class-amp-youtube-embed-handler.php
+++ b/includes/embeds/class-amp-youtube-embed-handler.php
@@ -5,6 +5,8 @@
  * @package AMP
  */
 
+use AmpProject\Dom\Document;
+
 /**
  * Class AMP_YouTube_Embed_Handler
  *
@@ -12,16 +14,6 @@
  */
 class AMP_YouTube_Embed_Handler extends AMP_Base_Embed_Handler {
 
-	/**
-	 * URL pattern to match YouTube videos.
-	 *
-	 * Only handling single videos. Playlists are handled elsewhere.
-	 *
-	 * @deprecated No longer used.
-	 * @var string
-	 */
-	const URL_PATTERN = '#https?://(?:www\.)?(?:youtube.com/(?:v/|e/|embed/|watch[/\#?])|youtu\.be/).*#i';
-
 	/**
 	 * Ratio for calculating the default height from the content width.
 	 *
@@ -43,6 +35,20 @@ class AMP_YouTube_Embed_Handler extends AMP_Base_Embed_Handler {
 	 */
 	protected $DEFAULT_HEIGHT = 338;
 
+	/**
+	 * Default AMP tag to be used when sanitizing embeds.
+	 *
+	 * @var string
+	 */
+	protected $amp_tag = 'amp-youtube';
+
+	/**
+	 * List of domains that are applicable for this embed.
+	 *
+	 * @var string[]
+	 */
+	protected $applicable_domains = [ 'youtu.be', 'youtube.com', 'youtube-nocookie.com' ];
+
 	/**
 	 * AMP_YouTube_Embed_Handler constructor.
 	 *
@@ -60,119 +66,98 @@ public function __construct( $args = [] ) {
 	}
 
 	/**
-	 * Register embed.
-	 */
-	public function register_embed() {
-		add_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10, 2 );
-		add_filter( 'wp_video_shortcode_override', [ $this, 'video_override' ], 10, 2 );
-	}
-
-	/**
-	 * Unregister embed.
+	 * Get all raw embeds from the DOM.
+	 *
+	 * @param Document $dom Document.
+	 * @return DOMNodeList A list of DOMElement nodes.
 	 */
-	public function unregister_embed() {
-		remove_filter( 'embed_oembed_html', [ $this, 'filter_embed_oembed_html' ], 10 );
+	protected function get_raw_embed_nodes( Document $dom ) {
+		$query_segments = array_map(
+			static function ( $domain ) {
+				return sprintf( 'contains( @src, "%s" )', $domain );
+			},
+			$this->applicable_domains
+		);
+		$query          = implode( ' or ', $query_segments );
+		return $dom->xpath->query( sprintf( '//iframe[ %s ]', $query ) );
 	}
 
 	/**
-	 * Filter oEmbed HTML for YouTube to convert to AMP.
+	 * Make embed AMP compatible.
 	 *
-	 * @param string $cache Cache for oEmbed.
-	 * @param string $url   Embed URL.
-	 * @return string Embed.
+	 * @param DOMElement $node DOM element.
 	 */
-	public function filter_embed_oembed_html( $cache, $url ) {
-		$id = $this->get_video_id_from_url( $url );
-		if ( ! $id ) {
-			return $cache;
+	protected function sanitize_raw_embed( DOMElement $node ) {
+		$iframe_src = $node->getAttribute( 'src' );
+		$video_id   = $this->get_video_id_from_url( $iframe_src );
+
+		$attributes = [
+			'data-videoid' => $video_id,
+			'layout'       => 'responsive',
+			'width'        => $this->args['width'],
+			'height'       => $this->args['height'],
+		];
+
+		if ( ! empty( $node->getAttribute( 'title' ) ) ) {
+			$attributes['title'] = $node->getAttribute( 'title' );
 		}
 
-		$props = $this->parse_props( $cache, $url, $id );
-		if ( empty( $props ) ) {
-			return $cache;
+		if ( ! empty( $node->getAttribute( 'width' ) ) ) {
+			$attributes['width'] = $node->getAttribute( 'width' );
 		}
 
-		$props['video_id'] = $id;
-		return $this->render( $props, $url );
+		if ( ! empty( $node->getAttribute( 'height' ) ) ) {
+			$attributes['height'] = $node->getAttribute( 'height' );
+		}
+
+		$amp_node = AMP_DOM_Utils::create_node(
+			Document::fromNode( $node ),
+			$this->amp_tag,
+			$attributes
+		);
+
+		$this->append_placeholder( $amp_node, $video_id, isset( $attributes['title'] ) ? $attributes['title'] : null );
+
+		$this->unwrap_p_element( $node );
+
+		$node->parentNode->replaceChild( $amp_node, $node );
 	}
 
 	/**
-	 * Parse AMP component from iframe.
+	 * Append placeholder as a child of the AMP component.
 	 *
-	 * @param string $html     HTML.
-	 * @param string $url      Embed URL, for fallback purposes.
-	 * @param string $video_id YouTube video ID.
-	 * @return array|null Props for rendering the component, or null if unable to parse.
+	 * @param DOMElement $node AMP component.
+	 * @param string     $video_id Video ID.
+	 * @param string     $video_title Video title.
 	 */
-	private function parse_props( $html, $url, $video_id ) {
-		$props = $this->match_element_attributes( $html, 'iframe', [ 'title', 'height', 'width' ] );
-		if ( ! isset( $props ) ) {
-			return null;
-		}
-
+	private function append_placeholder( DOMElement $node, $video_id, $video_title ) {
 		$img_attributes = [
 			'src'        => esc_url_raw( sprintf( 'https://i.ytimg.com/vi/%s/hqdefault.jpg', $video_id ) ),
 			'layout'     => 'fill',
 			'object-fit' => 'cover',
 		];
-		if ( ! empty( $props['title'] ) ) {
-			$img_attributes['alt'] = $props['title'];
+		if ( $video_title ) {
+			$img_attributes['alt'] = $video_title;
 		}
-		$img = AMP_HTML_Utils::build_tag( 'img', $img_attributes );
 
-		$props['placeholder'] = AMP_HTML_Utils::build_tag(
-			'a',
-			[
-				'placeholder' => '',
-				'href'        => esc_url_raw( $url ),
-			],
-			$img
+		$img_node = AMP_DOM_Utils::create_node(
+			Document::fromNode( $node->ownerDocument ),
+			'img',
+			$img_attributes
 		);
 
-		return $props;
-	}
-
-	/**
-	 * Render embed.
-	 *
-	 * @param array  $args Args.
-	 * @param string $url  URL.
-	 * @return string Rendered.
-	 */
-	public function render( $args, $url ) {
-		$args = wp_parse_args(
-			$args,
+		$placeholder_node = AMP_DOM_Utils::create_node(
+			Document::fromNode( $node ),
+			'a',
 			[
-				'video_id'    => false,
-				'layout'      => 'responsive',
-				'width'       => $this->args['width'],
-				'height'      => $this->args['height'],
 				'placeholder' => '',
+				'href'        => esc_url_raw( sprintf( 'https://www.youtube.com/watch?v=%s', $video_id ) ),
 			]
 		);
 
-		if ( empty( $args['video_id'] ) ) {
-			return AMP_HTML_Utils::build_tag(
-				'a',
-				[
-					'href'  => esc_url_raw( $url ),
-					'class' => 'amp-wp-embed-fallback',
-				],
-				esc_html( $url )
-			);
-		}
-
-		$this->did_convert_elements = true;
-
-		$attributes = array_merge(
-			[ 'data-videoid' => $args['video_id'] ],
-			wp_array_slice_assoc( $args, [ 'layout', 'width', 'height' ] )
-		);
-		if ( ! empty( $args['title'] ) ) {
-			$attributes['title'] = $args['title'];
-		}
+		$placeholder_node->appendChild( $img_node );
 
-		return AMP_HTML_Utils::build_tag( 'amp-youtube', $attributes, $args['placeholder'] );
+		$node->appendChild( $placeholder_node );
 	}
 
 	/**
@@ -189,7 +174,7 @@ private function get_video_id_from_url( $url ) {
 		}
 
 		$domain = implode( '.', array_slice( explode( '.', $parsed_url['host'] ), -2 ) );
-		if ( ! in_array( $domain, [ 'youtu.be', 'youtube.com', 'youtube-nocookie.com' ], true ) ) {
+		if ( ! in_array( $domain, $this->applicable_domains, true ) ) {
 			return false;
 		}
 
@@ -207,7 +192,8 @@ private function get_video_id_from_url( $url ) {
 			// Support is also included for other query params which don't appear to be supported by YouTube anymore.
 			if ( isset( $query_vars['v'] ) ) {
 				return $query_vars['v'];
-			} elseif ( isset( $query_vars['vi'] ) ) {
+			}
+			if ( isset( $query_vars['vi'] ) ) {
 				return $query_vars['vi'];
 			}
 		}
@@ -232,26 +218,4 @@ private function get_video_id_from_url( $url ) {
 
 		return false;
 	}
-
-	/**
-	 * Override the output of YouTube videos.
-	 *
-	 * This overrides the value in wp_video_shortcode().
-	 * The pattern matching is copied from WP_Widget_Media_Video::render().
-	 *
-	 * @param string $html Empty variable to be replaced with shortcode markup.
-	 * @param array  $attr The shortcode attributes.
-	 * @return string|null $markup The markup to output.
-	 */
-	public function video_override( $html, $attr ) {
-		if ( ! isset( $attr['src'] ) ) {
-			return $html;
-		}
-		$video_id = $this->get_video_id_from_url( $attr['src'] );
-		if ( ! $video_id ) {
-			return $html;
-		}
-
-		return $this->render( compact( 'video_id' ), $attr['src'] );
-	}
 }
diff --git a/includes/sanitizers/class-amp-embed-sanitizer.php b/includes/sanitizers/class-amp-embed-sanitizer.php
index b0da8f73865..26fdc738157 100644
--- a/includes/sanitizers/class-amp-embed-sanitizer.php
+++ b/includes/sanitizers/class-amp-embed-sanitizer.php
@@ -36,14 +36,12 @@ public function __construct( $dom, $args = [] ) {
 	}
 
 	/**
-	 * Checks if each embed_handler has sanitize_raw_method and calls it.
+	 * Allow each embed handler sanitize their respective raw embeds.
 	 */
 	public function sanitize() {
 
 		foreach ( $this->embed_handlers as $embed_handler ) {
-			if ( method_exists( $embed_handler, 'sanitize_raw_embeds' ) ) {
-				$embed_handler->sanitize_raw_embeds( $this->dom, $this->args );
-			}
+			$embed_handler->sanitize_raw_embeds( $this->dom );
 		}
 	}
 }
diff --git a/includes/templates/class-amp-content.php b/includes/templates/class-amp-content.php
index 3038d542375..1174abeefeb 100644
--- a/includes/templates/class-amp-content.php
+++ b/includes/templates/class-amp-content.php
@@ -5,6 +5,8 @@
  * @package AMP
  */
 
+use AmpProject\AmpWP\Embed\Registerable;
+
 /**
  * Class AMP_Content
  *
@@ -184,7 +186,9 @@ private function register_embed_handlers( $embed_handler_classes ) {
 				continue;
 			}
 
-			$embed_handler->register_embed();
+			if ( $embed_handler instanceof Registerable ) {
+				$embed_handler->register_embed();
+			}
 			$embed_handlers[] = $embed_handler;
 		}
 
@@ -198,8 +202,9 @@ private function register_embed_handlers( $embed_handler_classes ) {
 	 */
 	private function unregister_embed_handlers( $embed_handlers ) {
 		foreach ( $embed_handlers as $embed_handler ) {
-			$this->add_scripts( $embed_handler->get_scripts() ); // @todo Why add_scripts here? Shouldn't it be array_diff()?
-			$embed_handler->unregister_embed();
+			if ( $embed_handler instanceof Registerable ) {
+				$embed_handler->unregister_embed();
+			}
 		}
 	}
 
diff --git a/src/Embed/Registerable.php b/src/Embed/Registerable.php
new file mode 100644
index 00000000000..d20d842cd43
--- /dev/null
+++ b/src/Embed/Registerable.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Interface Registerable.
+ *
+ * @package AmpProject\AmpWP
+ */
+
+namespace AmpProject\AmpWP\Embed;
+
+/**
+ * Indicates embed handlers that hook into WordPress to perform any actions necessary for the handler to output an
+ * AMP-compatible embed.
+ */
+interface Registerable {
+
+	/**
+	 * Register the embed.
+	 *
+	 * @return void
+	 */
+	public function register_embed();
+
+	/**
+	 * Unregister the embed.
+	 *
+	 * @return void
+	 */
+	public function unregister_embed();
+}
diff --git a/tests/php/test-amp-crowdsignal-embed-handler.php b/tests/php/test-amp-crowdsignal-embed-handler.php
index 3add20075fb..bac9adbd63a 100644
--- a/tests/php/test-amp-crowdsignal-embed-handler.php
+++ b/tests/php/test-amp-crowdsignal-embed-handler.php
@@ -44,34 +44,28 @@ public function get_conversion_data() {
 		$data = [
 			'poll.fm'          => [
 				'https://poll.fm/7012505',
-				'<p><iframe title="Which design do you prefer?" src="https://poll.fm/7012505/embed" frameborder="0" class="cs-iframe-embed"></iframe></p>',
+				'<iframe title="Which design do you prefer?" src="https://poll.fm/7012505/embed" frameborder="0" class="cs-iframe-embed"></iframe>' . PHP_EOL,
 				$poll_response,
 			],
 
 			'polldaddy_poll'   => [
 				'https://polldaddy.com/poll/7012505/',
-				'<p><iframe title="Which design do you prefer?" src="https://poll.fm/7012505/embed" frameborder="0" class="cs-iframe-embed"></iframe></p>',
+				'<iframe title="Which design do you prefer?" src="https://poll.fm/7012505/embed" frameborder="0" class="cs-iframe-embed"></iframe>' . PHP_EOL,
 				$poll_response,
 			],
 
 			'polldaddy_survey' => [
 				'https://rydk.polldaddy.com/s/test-survey',
-				'<p><a href="https://rydk.polldaddy.com/s/test-survey" target="_blank">View Survey</a></p>',
+				'<iframe src="https://rydk.survey.fm/test-survey?ft=1&amp;iframe=http://example.org/" layout="responsive" width="600" height="600" frameborder="0" scrolling="no" allowtransparency="true" sandbox="allow-scripts allow-same-origin"></iframe>' . PHP_EOL . PHP_EOL,
 				$survey_response,
 			],
-		];
 
-		/*
-		 * There is a bug with WordPress's oEmbed handling for Crowdsignal surveys.
-		 * See <https://core.trac.wordpress.org/ticket/46467>.
-		 */
-		if ( version_compare( get_bloginfo( 'version' ), '5.2.0', '>=' ) ) {
-			$data['survey.fm'] = [
+			'survey.fm'        => [
 				'https://rydk.survey.fm/test-survey',
-				'<p><a href="https://rydk.survey.fm/test-survey" target="_blank">View Survey</a></p>',
+				'<iframe src="https://rydk.survey.fm/test-survey?ft=1&amp;iframe=http://example.org/" layout="responsive" width="600" height="600" frameborder="0" scrolling="no" allowtransparency="true" sandbox="allow-scripts allow-same-origin"></iframe>' . PHP_EOL . PHP_EOL,
 				$survey_response,
-			];
-		}
+			],
+		];
 
 		return $data;
 	}
@@ -111,11 +105,15 @@ static function ( $pre, $r, $request_url ) use ( $oembed_response ) {
 
 		$embed = new AMP_Crowdsignal_Embed_Handler();
 		$embed->register_embed();
+
 		$filtered_content = apply_filters( 'the_content', $url );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
 
+		$content  = AMP_DOM_Utils::get_content_from_dom( $dom );
 		$expected = $this->adapt_iframe_title( $expected );
 
-		$this->assertEquals( trim( $expected ), trim( $filtered_content ) );
+		$this->assertEquals( $expected, $content );
 	}
 
 	private function adapt_iframe_title( $html ) {
diff --git a/tests/php/test-amp-dailymotion-embed-handler.php b/tests/php/test-amp-dailymotion-embed-handler.php
index 0e86c2655c3..906a85f229d 100644
--- a/tests/php/test-amp-dailymotion-embed-handler.php
+++ b/tests/php/test-amp-dailymotion-embed-handler.php
@@ -4,7 +4,55 @@
 
 class AMP_DailyMotion_Embed_Handler_Test extends WP_UnitTestCase {
 
-	use WithoutBlockPreRendering;
+	use WithoutBlockPreRendering {
+		setUp as public prevent_block_pre_render;
+	}
+
+	/**
+	 * Set up.
+	 */
+	public function setUp() {
+		$this->prevent_block_pre_render();
+
+		// Mock the HTTP request.
+		add_filter( 'pre_http_request', [ $this, 'mock_http_request' ], 10, 3 );
+	}
+
+	/**
+	 * Tear down.
+	 */
+	public function tearDown() {
+		remove_filter( 'pre_http_request', [ $this, 'mock_http_request' ] );
+		parent::tearDown();
+	}
+
+	/**
+	 * Mock HTTP request.
+	 *
+	 * @param mixed  $pre Whether to preempt an HTTP request's return value. Default false.
+	 * @param mixed  $r   HTTP request arguments.
+	 * @param string $url The request URL.
+	 * @return array Response data.
+	 */
+	public function mock_http_request( $pre, $r, $url ) {
+		if ( in_array( 'external-http', $_SERVER['argv'], true ) ) {
+			return $pre;
+		}
+
+		if ( false === strpos( $url, 'dailymotion.com' ) ) {
+			return $pre;
+		}
+
+		$body = '{"type":"video","version":"1.0","provider_name":"Dailymotion","provider_url":"https:\/\/www.dailymotion.com","title":"Snatched - Official Trailer 2 (HD)","description":"M\u00e1s info http:\/\/trailersyestrenos.es\/snatched-jonathan-levine\/ - TWITTER: https:\/\/twitter.com\/TrailersyEstren - FACEBOOK: https:\/\/www.facebook.com\/trailersyestrenos - GOOGLE+: https:\/\/www.google.com\/+TrailersyEstrenos  Sinopsis: Una madre y una hija se enfrentar\u00e1n a distintos problemas que surgen mientras est\u00e1n de vacaciones  Director: Jonathan Levine Reparto: Amy Schumer, Ike Barinholtz, Goldie Hawn, Christopher Meloni, Randall Park, Wanda Sykes, \u00d3scar Jaenada, Colin Quinn, Tom Bateman, Kevin Kane, Sharon M. Bell  (El trailer pertenece a la productora y distribuidora de la pel\u00edcula y ha sido subido sin \u00e1nimo de lucro)","author_name":"Trailers y Estrenos","author_url":"https:\/\/www.dailymotion.com\/TrailersyEstrenos","width":500,"height":212,"html":"<iframe frameborder=\"0\" width=\"500\" height=\"212\" src=\"https:\/\/www.dailymotion.com\/embed\/video\/x5awwth\" allowfullscreen allow=\"autoplay\"><\/iframe>","thumbnail_url":"https:\/\/s2.dmcdn.net\/v\/J7Emb1UwvEwLi4MKo\/x120","thumbnail_width":214,"thumbnail_height":120}';
+
+		return [
+			'body'     => $body,
+			'response' => [
+				'code'    => 200,
+				'message' => 'OK',
+			],
+		];
+	}
 
 	public function get_conversion_data() {
 		return [
@@ -15,12 +63,12 @@ public function get_conversion_data() {
 
 			'url_simple'     => [
 				'https://www.dailymotion.com/video/x5awwth' . PHP_EOL,
-				'<p><amp-dailymotion data-videoid="x5awwth" layout="responsive" width="600" height="338"></amp-dailymotion></p>' . PHP_EOL,
+				'<amp-dailymotion data-videoid="x5awwth" layout="responsive" width="500" height="212"></amp-dailymotion>' . PHP_EOL,
 			],
 
 			'url_with_title' => [
 				'http://www.dailymotion.com/video/x5awwth_snatched-official-trailer-2-hd_shortfilms' . PHP_EOL,
-				'<p><amp-dailymotion data-videoid="x5awwth" layout="responsive" width="600" height="338"></amp-dailymotion></p>' . PHP_EOL,
+				'<amp-dailymotion data-videoid="x5awwth" layout="responsive" width="500" height="212"></amp-dailymotion>' . PHP_EOL,
 			],
 		];
 	}
@@ -30,10 +78,14 @@ public function get_conversion_data() {
 	 */
 	public function test__conversion( $source, $expected ) {
 		$embed = new AMP_DailyMotion_Embed_Handler();
-		$embed->register_embed();
+
 		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
 
-		$this->assertEquals( $expected, $filtered_content );
+		$content = AMP_DOM_Utils::get_content_from_dom( $dom );
+
+		$this->assertEquals( $expected, $content );
 	}
 
 	public function get_scripts_data() {
@@ -54,10 +106,12 @@ public function get_scripts_data() {
 	 */
 	public function test__get_scripts( $source, $expected ) {
 		$embed = new AMP_DailyMotion_Embed_Handler();
-		$embed->register_embed();
-		$source = apply_filters( 'the_content', $source );
 
-		$validating_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( AMP_DOM_Utils::get_dom_from_content( $source ) );
+		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
+
+		$validating_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( $dom );
 		$validating_sanitizer->sanitize();
 
 		$scripts = array_merge(
diff --git a/tests/php/test-amp-facebook-embed-handler.php b/tests/php/test-amp-facebook-embed-handler.php
index 87817cc1fcf..68734c70c4a 100644
--- a/tests/php/test-amp-facebook-embed-handler.php
+++ b/tests/php/test-amp-facebook-embed-handler.php
@@ -96,7 +96,6 @@ public function get_scripts_data() {
 	 */
 	public function test__get_scripts( $source, $expected ) {
 		$embed = new AMP_Facebook_Embed_Handler();
-		$embed->register_embed();
 
 		$filtered_content = apply_filters( 'the_content', $source );
 		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
@@ -276,7 +275,6 @@ public function get_raw_embed_dataset() {
 	 */
 	public function test__raw_embed_sanitizer( $source, $expected ) {
 		$embed = new AMP_Facebook_Embed_Handler();
-		$embed->register_embed();
 
 		$filtered_content = apply_filters( 'the_content', $source );
 		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
diff --git a/tests/php/test-amp-instagram-embed-handler.php b/tests/php/test-amp-instagram-embed-handler.php
index 1534a9415c2..cab95de44ef 100644
--- a/tests/php/test-amp-instagram-embed-handler.php
+++ b/tests/php/test-amp-instagram-embed-handler.php
@@ -4,29 +4,97 @@
 
 class AMP_Instagram_Embed_Handler_Test extends WP_UnitTestCase {
 
-	use WithoutBlockPreRendering;
+	use WithoutBlockPreRendering {
+		setUp as public prevent_block_pre_render;
+	}
+
+	/**
+	 * Set up.
+	 */
+	public function setUp() {
+		$this->prevent_block_pre_render();
+
+		// Mock the HTTP request.
+		add_filter( 'pre_http_request', [ $this, 'mock_http_request' ], 10, 3 );
+	}
+
+	/**
+	 * Tear down.
+	 */
+	public function tearDown() {
+		remove_filter( 'pre_http_request', [ $this, 'mock_http_request' ] );
+		parent::tearDown();
+	}
+
+	/**
+	 * Mock HTTP request.
+	 *
+	 * @param mixed  $pre Whether to preempt an HTTP request's return value. Default false.
+	 * @param mixed  $r   HTTP request arguments.
+	 * @param string $url The request URL.
+	 * @return array Response data.
+	 */
+	public function mock_http_request( $pre, $r, $url ) {
+		if ( in_array( 'external-http', $_SERVER['argv'], true ) ) {
+			return $pre;
+		}
+
+		if ( false === strpos( $url, '7-l0z_p4A4' ) ) {
+			return $pre;
+		}
+
+		$body = '{"version": "1.0", "title": "Ice Bear requires more sprinkles.\ud83c\udf66#lastdaysofsummer #webarebears", "author_name": "cartoonnetworkofficial", "author_url": "https://www.instagram.com/cartoonnetworkofficial", "author_id": 1385592527, "media_id": "1080467317577973816_1385592527", "provider_name": "Instagram", "provider_url": "https://www.instagram.com", "type": "rich", "width": 658, "height": null, "html": "\u003cblockquote class=\"instagram-media\" data-instgrm-captioned data-instgrm-permalink=\"https://www.instagram.com/p/7-l0z_p4A4/?utm_source=ig_embed\u0026amp;utm_campaign=loading\" data-instgrm-version=\"12\" style=\" background:#FFF; border:0; border-radius:3px; box-shadow:0 0 1px 0 rgba(0,0,0,0.5),0 1px 10px 0 rgba(0,0,0,0.15); margin: 1px; max-width:658px; min-width:326px; padding:0; width:99.375%; width:-webkit-calc(100% - 2px); width:calc(100% - 2px);\"\u003e\u003cdiv style=\"padding:16px;\"\u003e \u003ca href=\"https://www.instagram.com/p/7-l0z_p4A4/?utm_source=ig_embed\u0026amp;utm_campaign=loading\" style=\" background:#FFFFFF; line-height:0; padding:0 0; text-align:center; text-decoration:none; width:100%;\" target=\"_blank\"\u003e \u003cdiv style=\" display: flex; flex-direction: row; align-items: center;\"\u003e \u003cdiv style=\"background-color: #F4F4F4; border-radius: 50%; flex-grow: 0; height: 40px; margin-right: 14px; width: 40px;\"\u003e\u003c/div\u003e \u003cdiv style=\"display: flex; flex-direction: column; flex-grow: 1; justify-content: center;\"\u003e \u003cdiv style=\" background-color: #F4F4F4; border-radius: 4px; flex-grow: 0; height: 14px; margin-bottom: 6px; width: 100px;\"\u003e\u003c/div\u003e \u003cdiv style=\" background-color: #F4F4F4; border-radius: 4px; flex-grow: 0; height: 14px; width: 60px;\"\u003e\u003c/div\u003e\u003c/div\u003e\u003c/div\u003e\u003cdiv style=\"padding: 19% 0;\"\u003e\u003c/div\u003e \u003cdiv style=\"display:block; height:50px; margin:0 auto 12px; width:50px;\"\u003e\u003csvg width=\"50px\" height=\"50px\" viewBox=\"0 0 60 60\" version=\"1.1\" xmlns=\"https://www.w3.org/2000/svg\" xmlns:xlink=\"https://www.w3.org/1999/xlink\"\u003e\u003cg stroke=\"none\" stroke-width=\"1\" fill=\"none\" fill-rule=\"evenodd\"\u003e\u003cg transform=\"translate(-511.000000, -20.000000)\" fill=\"#000000\"\u003e\u003cg\u003e\u003cpath d=\"M556.869,30.41 C554.814,30.41 553.148,32.076 553.148,34.131 C553.148,36.186 554.814,37.852 556.869,37.852 C558.924,37.852 560.59,36.186 560.59,34.131 C560.59,32.076 558.924,30.41 556.869,30.41 M541,60.657 C535.114,60.657 530.342,55.887 530.342,50 C530.342,44.114 535.114,39.342 541,39.342 C546.887,39.342 551.658,44.114 551.658,50 C551.658,55.887 546.887,60.657 541,60.657 M541,33.886 C532.1,33.886 524.886,41.1 524.886,50 C524.886,58.899 532.1,66.113 541,66.113 C549.9,66.113 557.115,58.899 557.115,50 C557.115,41.1 549.9,33.886 541,33.886 M565.378,62.101 C565.244,65.022 564.756,66.606 564.346,67.663 C563.803,69.06 563.154,70.057 562.106,71.106 C561.058,72.155 560.06,72.803 558.662,73.347 C557.607,73.757 556.021,74.244 553.102,74.378 C549.944,74.521 548.997,74.552 541,74.552 C533.003,74.552 532.056,74.521 528.898,74.378 C525.979,74.244 524.393,73.757 523.338,73.347 C521.94,72.803 520.942,72.155 519.894,71.106 C518.846,70.057 518.197,69.06 517.654,67.663 C517.244,66.606 516.755,65.022 516.623,62.101 C516.479,58.943 516.448,57.996 516.448,50 C516.448,42.003 516.479,41.056 516.623,37.899 C516.755,34.978 517.244,33.391 517.654,32.338 C518.197,30.938 518.846,29.942 519.894,28.894 C520.942,27.846 521.94,27.196 523.338,26.654 C524.393,26.244 525.979,25.756 528.898,25.623 C532.057,25.479 533.004,25.448 541,25.448 C548.997,25.448 549.943,25.479 553.102,25.623 C556.021,25.756 557.607,26.244 558.662,26.654 C560.06,27.196 561.058,27.846 562.106,28.894 C563.154,29.942 563.803,30.938 564.346,32.338 C564.756,33.391 565.244,34.978 565.378,37.899 C565.522,41.056 565.552,42.003 565.552,50 C565.552,57.996 565.522,58.943 565.378,62.101 M570.82,37.631 C570.674,34.438 570.167,32.258 569.425,30.349 C568.659,28.377 567.633,26.702 565.965,25.035 C564.297,23.368 562.623,22.342 560.652,21.575 C558.743,20.834 556.562,20.326 553.369,20.18 C550.169,20.033 549.148,20 541,20 C532.853,20 531.831,20.033 528.631,20.18 C525.438,20.326 523.257,20.834 521.349,21.575 C519.376,22.342 517.703,23.368 516.035,25.035 C514.368,26.702 513.342,28.377 512.574,30.349 C511.834,32.258 511.326,34.438 511.181,37.631 C511.035,40.831 511,41.851 511,50 C511,58.147 511.035,59.17 511.181,62.369 C511.326,65.562 511.834,67.743 512.574,69.651 C513.342,71.625 514.368,73.296 516.035,74.965 C517.703,76.634 519.376,77.658 521.349,78.425 C523.257,79.167 525.438,79.673 528.631,79.82 C531.831,79.965 532.853,80.001 541,80.001 C549.148,80.001 550.169,79.965 553.369,79.82 C556.562,79.673 558.743,79.167 560.652,78.425 C562.623,77.658 564.297,76.634 565.965,74.965 C567.633,73.296 568.659,71.625 569.425,69.651 C570.167,67.743 570.674,65.562 570.82,62.369 C570.966,59.17 571,58.147 571,50 C571,41.851 570.966,40.831 570.82,37.631\"\u003e\u003c/path\u003e\u003c/g\u003e\u003c/g\u003e\u003c/g\u003e\u003c/svg\u003e\u003c/div\u003e\u003cdiv style=\"padding-top: 8px;\"\u003e \u003cdiv style=\" color:#3897f0; font-family:Arial,sans-serif; font-size:14px; font-style:normal; font-weight:550; line-height:18px;\"\u003e View this post on Instagram\u003c/div\u003e\u003c/div\u003e\u003cdiv style=\"padding: 12.5% 0;\"\u003e\u003c/div\u003e \u003cdiv style=\"display: flex; flex-direction: row; margin-bottom: 14px; align-items: center;\"\u003e\u003cdiv\u003e \u003cdiv style=\"background-color: #F4F4F4; border-radius: 50%; height: 12.5px; width: 12.5px; transform: translateX(0px) translateY(7px);\"\u003e\u003c/div\u003e \u003cdiv style=\"background-color: #F4F4F4; height: 12.5px; transform: rotate(-45deg) translateX(3px) translateY(1px); width: 12.5px; flex-grow: 0; margin-right: 14px; margin-left: 2px;\"\u003e\u003c/div\u003e \u003cdiv style=\"background-color: #F4F4F4; border-radius: 50%; height: 12.5px; width: 12.5px; transform: translateX(9px) translateY(-18px);\"\u003e\u003c/div\u003e\u003c/div\u003e\u003cdiv style=\"margin-left: 8px;\"\u003e \u003cdiv style=\" background-color: #F4F4F4; border-radius: 50%; flex-grow: 0; height: 20px; width: 20px;\"\u003e\u003c/div\u003e \u003cdiv style=\" width: 0; height: 0; border-top: 2px solid transparent; border-left: 6px solid #f4f4f4; border-bottom: 2px solid transparent; transform: translateX(16px) translateY(-4px) rotate(30deg)\"\u003e\u003c/div\u003e\u003c/div\u003e\u003cdiv style=\"margin-left: auto;\"\u003e \u003cdiv style=\" width: 0px; border-top: 8px solid #F4F4F4; border-right: 8px solid transparent; transform: translateY(16px);\"\u003e\u003c/div\u003e \u003cdiv style=\" background-color: #F4F4F4; flex-grow: 0; height: 12px; width: 16px; transform: translateY(-4px);\"\u003e\u003c/div\u003e \u003cdiv style=\" width: 0; height: 0; border-top: 8px solid #F4F4F4; border-left: 8px solid transparent; transform: translateY(-4px) translateX(8px);\"\u003e\u003c/div\u003e\u003c/div\u003e\u003c/div\u003e\u003c/a\u003e \u003cp style=\" margin:8px 0 0 0; padding:0 4px;\"\u003e \u003ca href=\"https://www.instagram.com/p/7-l0z_p4A4/?utm_source=ig_embed\u0026amp;utm_campaign=loading\" style=\" color:#000; font-family:Arial,sans-serif; font-size:14px; font-style:normal; font-weight:normal; line-height:17px; text-decoration:none; word-wrap:break-word;\" target=\"_blank\"\u003eIce Bear requires more sprinkles.\ud83c\udf66#lastdaysofsummer #webarebears\u003c/a\u003e\u003c/p\u003e \u003cp style=\" color:#c9c8cd; font-family:Arial,sans-serif; font-size:14px; line-height:17px; margin-bottom:0; margin-top:8px; overflow:hidden; padding:8px 0 7px; text-align:center; text-overflow:ellipsis; white-space:nowrap;\"\u003eA post shared by \u003ca href=\"https://www.instagram.com/cartoonnetworkofficial/?utm_source=ig_embed\u0026amp;utm_campaign=loading\" style=\" color:#c9c8cd; font-family:Arial,sans-serif; font-size:14px; font-style:normal; font-weight:normal; line-height:17px;\" target=\"_blank\"\u003e Cartoon Network\u003c/a\u003e (@cartoonnetworkofficial) on \u003ctime style=\" font-family:Arial,sans-serif; font-size:14px; line-height:17px;\" datetime=\"2015-09-23T15:22:43+00:00\"\u003eSep 23, 2015 at 8:22am PDT\u003c/time\u003e\u003c/p\u003e\u003c/div\u003e\u003c/blockquote\u003e\n\u003cscript async src=\"//www.instagram.com/embed.js\"\u003e\u003c/script\u003e", "thumbnail_url": "https://scontent-lga3-1.cdninstagram.com/v/t51.2885-15/sh0.08/e35/s640x640/11906204_1475523516088375_164900015_n.jpg?_nc_ht=scontent-lga3-1.cdninstagram.com\u0026_nc_cat=107\u0026_nc_ohc=eKlJu6SefhcAX_CwEfY\u0026oh=2ad53afd14a8357251b2b945f4ff28a3\u0026oe=5F1369B7", "thumbnail_width": 640, "thumbnail_height": 640}';
+
+		return [
+			'body'     => $body,
+			'response' => [
+				'code'    => 200,
+				'message' => 'OK',
+			],
+		];
+	}
 
 	public function get_conversion_data() {
 		return [
-			'no_embed'      => [
+			'no_embed'                           => [
 				'<p>Hello world.</p>',
 				'<p>Hello world.</p>' . PHP_EOL,
 			],
-			'simple_url'    => [
-				'https://instagram.com/p/7-l0z_p4A4/' . PHP_EOL,
-				'<p><amp-instagram data-shortcode="7-l0z_p4A4" data-captioned layout="responsive" width="600" height="600"></amp-instagram></p>' . PHP_EOL,
+			'simple_url'                         => [
+				'https://instagram.com/p/7-l0z_p4A4/',
+				'<amp-instagram data-shortcode="7-l0z_p4A4" layout="responsive" width="600" height="600" data-captioned=""></amp-instagram>' . PHP_EOL . PHP_EOL,
 			],
-			'simple_tv_url' => [
+			'simple_tv_url'                      => [
 				'https://instagram.com/tv/7-l0z_p4A4/' . PHP_EOL,
-				'<p><amp-instagram data-shortcode="7-l0z_p4A4" data-captioned layout="responsive" width="600" height="600"></amp-instagram></p>' . PHP_EOL,
+				'<amp-instagram data-shortcode="7-l0z_p4A4" layout="responsive" width="600" height="600" data-captioned=""></amp-instagram>' . PHP_EOL . PHP_EOL,
 			],
-			'short_url'     => [
+			'short_url'                          => [
 				'https://instagr.am/p/7-l0z_p4A4' . PHP_EOL,
-				'<p><amp-instagram data-shortcode="7-l0z_p4A4" data-captioned layout="responsive" width="600" height="600"></amp-instagram></p>' . PHP_EOL,
+				'<amp-instagram data-shortcode="7-l0z_p4A4" layout="responsive" width="600" height="600" data-captioned=""></amp-instagram>' . PHP_EOL . PHP_EOL,
 			],
-			'short_tv_url'  => [
+			'short_tv_url'                       => [
 				'https://instagr.am/tv/7-l0z_p4A4' . PHP_EOL,
-				'<p><amp-instagram data-shortcode="7-l0z_p4A4" data-captioned layout="responsive" width="600" height="600"></amp-instagram></p>' . PHP_EOL,
+				'<amp-instagram data-shortcode="7-l0z_p4A4" layout="responsive" width="600" height="600" data-captioned=""></amp-instagram>' . PHP_EOL . PHP_EOL,
+			],
+
+			'embed_blockquote_without_instagram' => [
+				'<blockquote><p>lorem ipsum</p></blockquote>',
+				'<blockquote>' . PHP_EOL . '<p>lorem ipsum</p>' . PHP_EOL . '</blockquote>' . PHP_EOL,
+			],
+
+			'blockquote_embed'                   => [
+				wpautop( '<blockquote class="instagram-media" data-instgrm-permalink="https://www.instagram.com/p/BhsgU3jh6xE/"><div style="padding: 8px;">Lorem ipsum</div></blockquote> <script async defer src="//www.instagram.com/embed.js"></script>' ), // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript, WordPress.Arrays.ArrayDeclarationSpacing.ArrayItemNoNewLine
+				'<amp-instagram data-shortcode="BhsgU3jh6xE" layout="responsive" width="600" height="600"></amp-instagram>' . PHP_EOL . PHP_EOL,
+			],
+
+			'blockquote_tv_embed'                => [
+				wpautop( '<blockquote class="instagram-media" data-instgrm-permalink="https://www.instagram.com/tv/BhsgU3jh6xE/"><div style="padding: 8px;">Lorem ipsum</div></blockquote> <script async defer src="//www.instagram.com/embed.js"></script>' ), // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript, WordPress.Arrays.ArrayDeclarationSpacing.ArrayItemNoNewLine
+				'<amp-instagram data-shortcode="BhsgU3jh6xE" layout="responsive" width="600" height="600"></amp-instagram>' . PHP_EOL . PHP_EOL,
+			],
+
+			'blockquote_embed_with_caption'      => [
+				wpautop( '<blockquote class="instagram-media" data-instgrm-permalink="https://www.instagram.com/p/BhsgU3jh6xE/" data-instgrm-captioned><div style="padding: 8px;">Lorem ipsum</div></blockquote> <script async defer src="//www.instagram.com/embed.js"></script>' ), // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript, WordPress.Arrays.ArrayDeclarationSpacing.ArrayItemNoNewLine
+				'<amp-instagram data-shortcode="BhsgU3jh6xE" layout="responsive" width="600" height="600" data-captioned=""></amp-instagram>' . PHP_EOL . PHP_EOL,
 			],
 		];
 	}
@@ -41,9 +109,14 @@ public function get_conversion_data() {
 	public function test__conversion( $source, $expected ) {
 		$embed = new AMP_Instagram_Embed_Handler();
 		$embed->register_embed();
+
 		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
 
-		$this->assertEquals( $expected, $filtered_content );
+		$content = AMP_DOM_Utils::get_content_from_dom( $dom );
+
+		$this->assertEquals( $expected, $content );
 	}
 
 	/**
@@ -74,9 +147,12 @@ public function get_scripts_data() {
 	public function test__get_scripts( $source, $expected ) {
 		$embed = new AMP_Instagram_Embed_Handler();
 		$embed->register_embed();
-		$source = apply_filters( 'the_content', $source );
 
-		$validating_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( AMP_DOM_Utils::get_dom_from_content( $source ) );
+		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
+
+		$validating_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( $dom );
 		$validating_sanitizer->sanitize();
 
 		$scripts = array_merge(
@@ -86,67 +162,4 @@ public function test__get_scripts( $source, $expected ) {
 
 		$this->assertEquals( $expected, $scripts );
 	}
-
-	/**
-	 * Data for test__raw_embed_sanitizer.
-	 *
-	 * @return array
-	 */
-	public function get_raw_embed_dataset() {
-		return [
-			'no_embed'                               => [
-				'<p>Hello world.</p>',
-				'<p>Hello world.</p>',
-			],
-			'embed_blockquote_without_instagram'     => [
-				'<blockquote><p>lorem ipsum</p></blockquote>',
-				'<blockquote><p>lorem ipsum</p></blockquote>',
-			],
-
-			'blockquote_embed'                       => [
-				wpautop( '<blockquote class="instagram-media" data-instgrm-permalink="https://www.instagram.com/p/BhsgU3jh6xE/"><div style="padding: 8px;">Lorem ipsum</div></blockquote> <script async defer src="//www.instagram.com/embed.js"></script>' ), // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript, WordPress.Arrays.ArrayDeclarationSpacing.ArrayItemNoNewLine
-				'<amp-instagram data-shortcode="BhsgU3jh6xE" layout="responsive" width="600" height="600"></amp-instagram>' . "\n\n",
-			],
-
-			'blockquote_tv_embed'                    => [
-				wpautop( '<blockquote class="instagram-media" data-instgrm-permalink="https://www.instagram.com/tv/BhsgU3jh6xE/"><div style="padding: 8px;">Lorem ipsum</div></blockquote> <script async defer src="//www.instagram.com/embed.js"></script>' ), // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript, WordPress.Arrays.ArrayDeclarationSpacing.ArrayItemNoNewLine
-				'<amp-instagram data-shortcode="BhsgU3jh6xE" layout="responsive" width="600" height="600"></amp-instagram>' . "\n\n",
-			],
-
-			'blockquote_embed_notautop'              => [
-				'<blockquote class="instagram-media" data-instgrm-permalink="https://www.instagram.com/p/BhsgU3jh6xE/"><div style="padding: 8px;">Lorem ipsum</div></blockquote> <script async defer src="//www.instagram.com/embed.js"></script>', // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript, WordPress.Arrays.ArrayDeclarationSpacing.ArrayItemNoNewLine
-				'<amp-instagram data-shortcode="BhsgU3jh6xE" layout="responsive" width="600" height="600"></amp-instagram> ',
-			],
-
-			'blockquote_embed_with_caption'          => [
-				wpautop( '<blockquote class="instagram-media" data-instgrm-permalink="https://www.instagram.com/p/BhsgU3jh6xE/" data-instgrm-captioned><div style="padding: 8px;">Lorem ipsum</div></blockquote> <script async defer src="//www.instagram.com/embed.js"></script>' ), // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript, WordPress.Arrays.ArrayDeclarationSpacing.ArrayItemNoNewLine
-				'<amp-instagram data-shortcode="BhsgU3jh6xE" layout="responsive" width="600" height="600" data-captioned=""></amp-instagram>' . "\n\n",
-			],
-
-			'blockquote_embed_with_caption_notautop' => [
-				'<blockquote class="instagram-media" data-instgrm-permalink="https://www.instagram.com/p/BhsgU3jh6xE/" data-instgrm-captioned><div style="padding: 8px;">Lorem ipsum</div></blockquote> <script async defer src="//www.instagram.com/embed.js"></script>', // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript, WordPress.Arrays.ArrayDeclarationSpacing.ArrayItemNoNewLine
-				'<amp-instagram data-shortcode="BhsgU3jh6xE" layout="responsive" width="600" height="600" data-captioned=""></amp-instagram> ',
-			],
-		];
-	}
-
-	/**
-	 * Test raw_embed_sanitizer.
-	 *
-	 * @param string $source  Content.
-	 * @param string $expected Expected content.
-	 * @dataProvider get_raw_embed_dataset
-	 * @covers AMP_Instagram_Embed_Handler::sanitize_raw_embeds()
-	 */
-	public function test__raw_embed_sanitizer( $source, $expected ) {
-		$dom   = AMP_DOM_Utils::get_dom_from_content( $source );
-		$embed = new AMP_Instagram_Embed_Handler();
-
-		$embed->sanitize_raw_embeds( $dom );
-
-		$content = AMP_DOM_Utils::get_content_from_dom( $dom );
-		$content = preg_replace( '/(?<=>)\s+(?=<)/', '', $content );
-
-		$this->assertEquals( $expected, $content );
-	}
 }
diff --git a/tests/php/test-amp-issuu-embed-handler.php b/tests/php/test-amp-issuu-embed-handler.php
new file mode 100644
index 00000000000..6a72b7fda94
--- /dev/null
+++ b/tests/php/test-amp-issuu-embed-handler.php
@@ -0,0 +1,85 @@
+<?php
+
+use AmpProject\AmpWP\Tests\WithoutBlockPreRendering;
+
+class AMP_Issuu_Embed_Handler_Test extends WP_UnitTestCase {
+
+	use WithoutBlockPreRendering {
+		setUp as prevent_block_pre_render;
+	}
+
+	/**
+	 * Set up.
+	 */
+	public function setUp() {
+		$this->prevent_block_pre_render();
+
+		// Mock the HTTP request.
+		add_filter( 'pre_http_request', [ $this, 'mock_http_request' ], 10, 3 );
+	}
+
+	/**
+	 * Tear down.
+	 */
+	public function tearDown() {
+		remove_filter( 'pre_http_request', [ $this, 'mock_http_request' ] );
+		parent::tearDown();
+	}
+
+	/**
+	 * Mock HTTP request.
+	 *
+	 * @param mixed  $pre Whether to preempt an HTTP request's return value. Default false.
+	 * @param mixed  $r   HTTP request arguments.
+	 * @param string $url The request URL.
+	 * @return array Response data.
+	 */
+	public function mock_http_request( $pre, $r, $url ) {
+		if ( in_array( 'external-http', $_SERVER['argv'], true ) ) {
+			return $pre;
+		}
+
+		if ( false === strpos( $url, 'issuu.com' ) ) {
+			return $pre;
+		}
+
+		$body = '{"version":"1.0","type":"rich","width":500,"height":324,"title":"A Seat at the Table Syllabus","description":"","url":"https://issuu.com/ajcwfu/docs/seatatthetablefinal","author_name":"ajcwfu","author_url":"https://issuu.com/ajcwfu","provider_name":"Issuu","provider_url":"https://issuu.com","html":"<div data-url=\"https://issuu.com/ajcwfu/docs/seatatthetablefinal\" style=\"width: 500px; height: 324px;\" class=\"issuuembed\"></div><script type=\"text/javascript\" src=\"//e.issuu.com/embed.js\" async=\"true\"></script>","thumbnail_url":"https://image.issuu.com/170209231446-0e77cd67a4a596188ee591ddd6dbdb61/jpg/page_1_thumb_large.jpg","thumbnail_width":320,"thumbnail_height":414}'; // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript
+
+		return [
+			'body'     => $body,
+			'response' => [
+				'code'    => 200,
+				'message' => 'OK',
+			],
+		];
+	}
+
+	public function get_conversion_data() {
+		return [
+			'no_embed'  => [
+				'<p>Hello world.</p>',
+				'<p>Hello world.</p>' . PHP_EOL,
+			],
+
+			'url_embed' => [
+				'https://issuu.com/ajcwfu/docs/seatatthetablefinal' . PHP_EOL,
+				'<amp-iframe width="500" height="324" src="https://issuu.com/ajcwfu/docs/seatatthetablefinal" sandbox="allow-scripts allow-same-origin"></amp-iframe>' . PHP_EOL . PHP_EOL,
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider get_conversion_data
+	 */
+	public function test__conversion( $source, $expected ) {
+		$embed = new AMP_Issuu_Embed_Handler();
+
+		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
+
+		$content = AMP_DOM_Utils::get_content_from_dom( $dom );
+
+		$this->assertEquals( $expected, $content );
+	}
+}
diff --git a/tests/php/test-amp-pinterest-embed-handler.php b/tests/php/test-amp-pinterest-embed-handler.php
index b15c6f222eb..c48cfbdf089 100644
--- a/tests/php/test-amp-pinterest-embed-handler.php
+++ b/tests/php/test-amp-pinterest-embed-handler.php
@@ -14,11 +14,11 @@ public function get_conversion_data() {
 			],
 			'simple_url_https' => [
 				'https://www.pinterest.com/pin/606156431067611861/' . PHP_EOL,
-				'<p><amp-pinterest width="450" height="750" data-do="embedPin" data-url="https://www.pinterest.com/pin/606156431067611861/"></amp-pinterest></p>' . PHP_EOL,
+				'<amp-pinterest width="450" height="750" data-do="embedPin" data-url="https://www.pinterest.com/pin/606156431067611861/"></amp-pinterest>' . PHP_EOL,
 			],
 			'simple_url_http'  => [
 				'http://www.pinterest.com/pin/606156431067611861/' . PHP_EOL,
-				'<p><amp-pinterest width="450" height="750" data-do="embedPin" data-url="http://www.pinterest.com/pin/606156431067611861/"></amp-pinterest></p>' . PHP_EOL,
+				'<amp-pinterest width="450" height="750" data-do="embedPin" data-url="http://www.pinterest.com/pin/606156431067611861/"></amp-pinterest>' . PHP_EOL,
 			],
 		];
 	}
@@ -29,9 +29,14 @@ public function get_conversion_data() {
 	public function test__conversion( $source, $expected ) {
 		$embed = new AMP_Pinterest_Embed_Handler();
 		$embed->register_embed();
+
 		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
+
+		$content = AMP_DOM_Utils::get_content_from_dom( $dom );
 
-		$this->assertEquals( $expected, $filtered_content );
+		$this->assertEquals( $expected, $content );
 	}
 
 	public function get_scripts_data() {
@@ -53,9 +58,12 @@ public function get_scripts_data() {
 	public function test__get_scripts( $source, $expected ) {
 		$embed = new AMP_Pinterest_Embed_Handler();
 		$embed->register_embed();
-		$source = apply_filters( 'the_content', $source );
 
-		$validating_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( AMP_DOM_Utils::get_dom_from_content( $source ) );
+		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
+
+		$validating_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( $dom );
 		$validating_sanitizer->sanitize();
 
 		$scripts = array_merge(
diff --git a/tests/php/test-amp-reddit-embed-handler.php b/tests/php/test-amp-reddit-embed-handler.php
new file mode 100644
index 00000000000..b28d0664afb
--- /dev/null
+++ b/tests/php/test-amp-reddit-embed-handler.php
@@ -0,0 +1,130 @@
+<?php
+
+use AmpProject\AmpWP\Tests\WithoutBlockPreRendering;
+
+class AMP_Reddit_Embed_Handler_Test extends WP_UnitTestCase {
+
+	use WithoutBlockPreRendering {
+		setUp as prevent_block_pre_render;
+	}
+
+	/**
+	 * Set up.
+	 */
+	public function setUp() {
+		$this->prevent_block_pre_render();
+
+		// Mock the HTTP request.
+		add_filter( 'pre_http_request', [ $this, 'mock_http_request' ], 10, 3 );
+	}
+
+	/**
+	 * Tear down.
+	 */
+	public function tearDown() {
+		remove_filter( 'pre_http_request', [ $this, 'mock_http_request' ] );
+		parent::tearDown();
+	}
+
+	/**
+	 * Mock HTTP request.
+	 *
+	 * @param mixed  $pre Whether to preempt an HTTP request's return value. Default false.
+	 * @param mixed  $r   HTTP request arguments.
+	 * @param string $url The request URL.
+	 * @return array Response data.
+	 */
+	public function mock_http_request( $pre, $r, $url ) {
+		if ( in_array( 'external-http', $_SERVER['argv'], true ) ) {
+			return $pre;
+		}
+
+		if ( false === strpos( $url, 'reddit.com' ) ) {
+			return $pre;
+		}
+
+		$body = '{"provider_url": "https://www.reddit.com/", "version": "1.0", "title": "Sticky bun for you!", "provider_name": "reddit", "type": "rich", "html": "\n    \u003Cblockquote class=\"reddit-card\" \u003E\n      \u003Ca href=\"https://www.reddit.com/r/aww/comments/gnl55y/sticky_bun_for_you/?ref_source=embed\u0026amp;ref=share\"\u003ESticky bun for you!\u003C/a\u003E from\n      \u003Ca href=\"https://www.reddit.com/r/aww/\"\u003Eaww\u003C/a\u003E\n    \u003C/blockquote\u003E\n    \u003Cscript async src=\"https://embed.redditmedia.com/widgets/platform.js\" charset=\"UTF-8\"\u003E\u003C/script\u003E\n", "author_name": "rnielsen776"}';
+
+		return [
+			'body'     => $body,
+			'response' => [
+				'code'    => 200,
+				'message' => 'OK',
+			],
+		];
+	}
+
+	public function get_conversion_data() {
+		return [
+			'no_embed'   => [
+				'<p>Hello world.</p>',
+				'<p>Hello world.</p>' . PHP_EOL,
+			],
+
+			'url_simple' => [
+				'https://www.reddit.com/r/aww/comments/gnl55y/sticky_bun_for_you/' . PHP_EOL,
+				'<amp-embedly-card layout="responsive" width="100" height="100" data-url="https://www.reddit.com/r/aww/comments/gnl55y/sticky_bun_for_you/?ref_source=embed&amp;ref=share"><blockquote class="reddit-card" placeholder=""><p>' . PHP_EOL . '      <a href="https://www.reddit.com/r/aww/comments/gnl55y/sticky_bun_for_you/?ref_source=embed&amp;ref=share">Sticky bun for you!</a> from<br>' . PHP_EOL . '      <a href="https://www.reddit.com/r/aww/">aww</a>' . PHP_EOL . '    </p></blockquote></amp-embedly-card>' . PHP_EOL . PHP_EOL,
+			],
+
+			'shortcode'  => [
+				'[embed]https://www.reddit.com/r/aww/comments/gnl55y/sticky_bun_for_you/[/embed]' . PHP_EOL,
+				'<amp-embedly-card layout="responsive" width="100" height="100" data-url="https://www.reddit.com/r/aww/comments/gnl55y/sticky_bun_for_you/?ref_source=embed&amp;ref=share"><blockquote class="reddit-card" placeholder=""><p>' . PHP_EOL . '      <a href="https://www.reddit.com/r/aww/comments/gnl55y/sticky_bun_for_you/?ref_source=embed&amp;ref=share">Sticky bun for you!</a> from<br>' . PHP_EOL . '      <a href="https://www.reddit.com/r/aww/">aww</a>' . PHP_EOL . '    </p></blockquote></amp-embedly-card>' . PHP_EOL . PHP_EOL,
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider get_conversion_data
+	 */
+	public function test__conversion( $source, $expected ) {
+		$embed = new AMP_Reddit_Embed_Handler();
+
+		$filtered_content = apply_filters( 'the_content', $source );
+
+		if ( "<br />\n" === substr( $filtered_content, 0, 7 ) ) {
+			// Remove prepended break line tag and new line.
+			$filtered_content = substr( $filtered_content, 7 );
+		}
+
+		$dom = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
+
+		$content = AMP_DOM_Utils::get_content_from_dom( $dom );
+
+		$this->assertEquals( $expected, $content );
+	}
+
+	public function get_scripts_data() {
+		return [
+			'not_converted' => [
+				'<p>Hello World.</p>',
+				[],
+			],
+			'converted'     => [
+				'https://www.reddit.com/r/aww/comments/gnl55y/sticky_bun_for_you/' . PHP_EOL,
+				[ 'amp-embedly-card' => true ],
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider get_scripts_data
+	 */
+	public function test__get_scripts( $source, $expected ) {
+		$embed = new AMP_Reddit_Embed_Handler();
+
+		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
+
+		$validating_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( $dom );
+		$validating_sanitizer->sanitize();
+
+		$scripts = array_merge(
+			$embed->get_scripts(),
+			$validating_sanitizer->get_scripts()
+		);
+
+		$this->assertEquals( $expected, $scripts );
+	}
+}
diff --git a/tests/php/test-amp-scribd-embed-handler.php b/tests/php/test-amp-scribd-embed-handler.php
index 59466a78dd0..d109e0cca4b 100644
--- a/tests/php/test-amp-scribd-embed-handler.php
+++ b/tests/php/test-amp-scribd-embed-handler.php
@@ -84,7 +84,7 @@ public function get_conversion_data() {
 
 			'document_embed' => [
 				$this->scribd_doc_url . PHP_EOL,
-				'<p><iframe title="Synthesis of Knowledge: Effects of Fire and Thinning Treatments on Understory Vegetation in Dry U.S. Forests" class="scribd_iframe_embed" src="https://www.scribd.com/embeds/110799637/content" data-aspect-ratio="1.2941176470588236" scrolling="no" id="110799637" width="500" height="750" frameborder="0" sandbox="allow-popups allow-scripts"></iframe></p>' . PHP_EOL,
+				'<iframe title="Synthesis of Knowledge: Effects of Fire and Thinning Treatments on Understory Vegetation in Dry U.S. Forests" class="scribd_iframe_embed" src="https://www.scribd.com/embeds/110799637/content" data-aspect-ratio="1.2941176470588236" scrolling="no" id="110799637" width="500" height="750" frameborder="0" sandbox=" allow-popups allow-scripts" layout="responsive"></iframe>' . PHP_EOL,
 			],
 		];
 
@@ -92,7 +92,7 @@ public function get_conversion_data() {
 		if ( version_compare( strtok( get_bloginfo( 'version' ), '-' ), '5.1', '<' ) ) {
 			$data['document_embed'] = [
 				$this->scribd_doc_url . PHP_EOL,
-				'<p><iframe class="scribd_iframe_embed" src="https://www.scribd.com/embeds/110799637/content" data-aspect-ratio="1.2941176470588236" scrolling="no" id="110799637" width="500" height="750" frameborder="0" sandbox="allow-popups allow-scripts"></iframe></p>' . PHP_EOL,
+				'<iframe class="scribd_iframe_embed" src="https://www.scribd.com/embeds/110799637/content" data-aspect-ratio="1.2941176470588236" scrolling="no" id="110799637" width="500" height="750" frameborder="0" sandbox=" allow-popups allow-scripts" layout="responsive"></iframe>' . PHP_EOL,
 			];
 		}
 
@@ -102,8 +102,6 @@ public function get_conversion_data() {
 	/**
 	 * Test conversion.
 	 *
-	 * @covers AMP_Scribd_Embed_Handler::filter_embed_oembed_html()
-	 * @covers AMP_Scribd_Embed_Handler::sanitize_iframe()
 	 * @dataProvider get_conversion_data
 	 *
 	 * @param $source
@@ -111,10 +109,14 @@ public function get_conversion_data() {
 	 */
 	public function test__conversion( $source, $expected ) {
 		$embed = new AMP_Scribd_Embed_Handler();
-		$embed->register_embed();
+
 		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
+
+		$content = AMP_DOM_Utils::get_content_from_dom( $dom );
 
-		$this->assertEquals( $expected, $filtered_content );
+		$this->assertEquals( $expected, $content );
 	}
 
 	/**
@@ -146,10 +148,12 @@ public function get_scripts_data() {
 	 */
 	public function test__get_scripts( $source, $expected ) {
 		$embed = new AMP_Scribd_Embed_Handler();
-		$embed->register_embed();
-		$source = apply_filters( 'the_content', $source );
 
-		$validating_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( AMP_DOM_Utils::get_dom_from_content( $source ) );
+		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
+
+		$validating_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( $dom );
 		$validating_sanitizer->sanitize();
 
 		$scripts = array_merge(
diff --git a/tests/php/test-amp-soundcloud-embed-handler.php b/tests/php/test-amp-soundcloud-embed-handler.php
index 5a26d7f53d4..8504a517072 100644
--- a/tests/php/test-amp-soundcloud-embed-handler.php
+++ b/tests/php/test-amp-soundcloud-embed-handler.php
@@ -81,7 +81,6 @@ public function mock_http_request( $preempt, $r, $url ) {
 		if ( false === strpos( $url, 'soundcloud.com' ) ) {
 			return $preempt;
 		}
-		unset( $r );
 
 		if ( false !== strpos( $url, 'sets' ) ) {
 			$body = $this->playlist_oembed_response;
@@ -115,12 +114,12 @@ public function get_embed_conversion_data() {
 
 			'track_simple'    => [
 				$this->track_url . PHP_EOL,
-				'<p><amp-soundcloud data-trackid="90097394" data-visual="true" height="400" width="500" layout="responsive">' . ( function_exists( 'wp_filter_oembed_iframe_title_attribute' ) ? '<a fallback href="https://soundcloud.com/jack-villano-villano/mozart-requiem-in-d-minor">Mozart &#8211; Requiem in D minor Complete Full by Jack Villano Villano</a>' : '' ) . '</amp-soundcloud></p>' . PHP_EOL,
+				'<amp-soundcloud data-trackid="90097394" height="400" width="500" layout="responsive" data-visual="true"></amp-soundcloud>' . PHP_EOL,
 			],
 
 			'playlist_simple' => [
 				$this->playlist_url . PHP_EOL,
-				'<p><amp-soundcloud data-playlistid="40936190" data-visual="true" height="450" width="500" layout="responsive">' . ( function_exists( 'wp_filter_oembed_iframe_title_attribute' ) ? '<a fallback href="https://soundcloud.com/classical-music-playlist/sets/classical-music-essential-collection">Classical Music &#8211; The Essential Collection by Classical Music</a>' : '' ) . '</amp-soundcloud></p>' . PHP_EOL,
+				'<amp-soundcloud data-playlistid="40936190" height="450" width="500" layout="responsive" data-visual="true"></amp-soundcloud>' . PHP_EOL,
 			],
 		];
 	}
@@ -129,18 +128,20 @@ public function get_embed_conversion_data() {
 	 * Test conversion.
 	 *
 	 * @dataProvider get_embed_conversion_data
-	 * @covers AMP_SoundCloud_Embed_Handler::filter_embed_oembed_html()
-	 * @covers AMP_SoundCloud_Embed_Handler::render()
 	 *
 	 * @param string $source   Source.
 	 * @param string $expected Expected.
 	 */
 	public function test_embed_conversion( $source, $expected ) {
 		$embed = new AMP_SoundCloud_Embed_Handler();
-		$embed->register_embed();
+
 		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
+
+		$content = AMP_DOM_Utils::get_content_from_dom( $dom );
 
-		$this->assertEquals( $expected, $filtered_content );
+		$this->assertEquals( $expected, $content );
 	}
 
 	/**
@@ -176,10 +177,12 @@ public function get_scripts_data() {
 	 */
 	public function test__get_scripts( $source, $expected ) {
 		$embed = new AMP_SoundCloud_Embed_Handler();
-		$embed->register_embed();
-		$source = apply_filters( 'the_content', $source );
 
-		$validating_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( AMP_DOM_Utils::get_dom_from_content( $source ) );
+		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
+
+		$validating_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( $dom );
 		$validating_sanitizer->sanitize();
 
 		$scripts = array_merge(
diff --git a/tests/php/test-amp-tumblr-embed-handler.php b/tests/php/test-amp-tumblr-embed-handler.php
new file mode 100644
index 00000000000..83c8e24750f
--- /dev/null
+++ b/tests/php/test-amp-tumblr-embed-handler.php
@@ -0,0 +1,119 @@
+<?php
+
+use AmpProject\AmpWP\Tests\WithoutBlockPreRendering;
+
+class AMP_Tumblr_Embed_Handler_Test extends WP_UnitTestCase {
+
+	use WithoutBlockPreRendering {
+		setUp as prevent_block_pre_render;
+	}
+
+	/**
+	 * Set up.
+	 */
+	public function setUp() {
+		$this->prevent_block_pre_render();
+
+		// Mock the HTTP request.
+		add_filter( 'pre_http_request', [ $this, 'mock_http_request' ], 10, 3 );
+	}
+
+	/**
+	 * Tear down.
+	 */
+	public function tearDown() {
+		remove_filter( 'pre_http_request', [ $this, 'mock_http_request' ] );
+		parent::tearDown();
+	}
+
+	/**
+	 * Mock HTTP request.
+	 *
+	 * @param mixed  $pre Whether to preempt an HTTP request's return value. Default false.
+	 * @param mixed  $r   HTTP request arguments.
+	 * @param string $url The request URL.
+	 * @return array Response data.
+	 */
+	public function mock_http_request( $pre, $r, $url ) {
+		if ( in_array( 'external-http', $_SERVER['argv'], true ) ) {
+			return $pre;
+		}
+
+		if ( false === strpos( $url, 'tumblr.com' ) ) {
+			return $pre;
+		}
+
+		$body = '{"cache_age":3600,"url":"https:\/\/ifpaintingscouldtext.tumblr.com\/post\/92003045635\/grant-wood-american-gothic-1930","provider_url":"https:\/\/www.tumblr.com","provider_name":"Tumblr","author_name":"If Paintings Could Text","version":"1.0","author_url":"https:\/\/ifpaintingscouldtext.tumblr.com\/","type":"rich","html":"\u003Cdiv class=\u0022tumblr-post\u0022 data-href=\u0022https:\/\/embed.tumblr.com\/embed\/post\/2JT2XTaiTxO08wh21dqQrw\/92003045635\u0022 data-did=\u00227ce4825965cbd8bfd208f6aae43de7a528859aee\u0022  \u003E\u003Ca href=\u0022https:\/\/ifpaintingscouldtext.tumblr.com\/post\/92003045635\/grant-wood-american-gothic-1930\u0022\u003Ehttps:\/\/ifpaintingscouldtext.tumblr.com\/post\/92003045635\/grant-wood-american-gothic-1930\u003C\/a\u003E\u003C\/div\u003E\u003Cscript async src=\u0022https:\/\/assets.tumblr.com\/post.js\u0022\u003E\u003C\/script\u003E","height":null,"width":540}';
+
+		return [
+			'body'     => $body,
+			'response' => [
+				'code'    => 200,
+				'message' => 'OK',
+			],
+		];
+	}
+
+	public function get_conversion_data() {
+		return [
+			'no_embed'   => [
+				'<p>Hello world.</p>',
+				'<p>Hello world.</p>' . PHP_EOL,
+			],
+
+			'url_simple' => [
+				'https://ifpaintingscouldtext.tumblr.com/post/92003045635/grant-wood-american-gothic-1930' . PHP_EOL,
+				'<amp-iframe src="https://embed.tumblr.com/embed/post/2JT2XTaiTxO08wh21dqQrw/92003045635" layout="responsive" width="540" height="480" resizable="" sandbox="allow-scripts allow-popups allow-same-origin"><div overflow="" tabindex="0" role="button" aria-label="See more">See more</div><a href="https://ifpaintingscouldtext.tumblr.com/post/92003045635/grant-wood-american-gothic-1930" placeholder="">https://ifpaintingscouldtext.tumblr.com/post/92003045635/grant-wood-american-gothic-1930</a></amp-iframe>' . PHP_EOL . PHP_EOL,
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider get_conversion_data
+	 */
+	public function test__conversion( $source, $expected ) {
+		$embed = new AMP_Tumblr_Embed_Handler();
+
+		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
+
+		$content = AMP_DOM_Utils::get_content_from_dom( $dom );
+
+		$this->assertEquals( $expected, $content );
+	}
+
+	public function get_scripts_data() {
+		return [
+			'not_converted' => [
+				'<p>Hello World.</p>',
+				[],
+			],
+			'converted'     => [
+				'https://ifpaintingscouldtext.tumblr.com/post/92003045635/grant-wood-american-gothic-1930' . PHP_EOL,
+				[ 'amp-iframe' => true ],
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider get_scripts_data
+	 */
+	public function test__get_scripts( $source, $expected ) {
+		$embed = new AMP_Tumblr_Embed_Handler();
+
+		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
+
+		$validating_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( $dom );
+		$validating_sanitizer->sanitize();
+
+		$scripts = array_merge(
+			$embed->get_scripts(),
+			$validating_sanitizer->get_scripts()
+		);
+
+		$this->assertEquals( $expected, $scripts );
+	}
+}
diff --git a/tests/php/test-amp-twitter-embed-handler.php b/tests/php/test-amp-twitter-embed-handler.php
index d652da70fef..2a3b4450aed 100644
--- a/tests/php/test-amp-twitter-embed-handler.php
+++ b/tests/php/test-amp-twitter-embed-handler.php
@@ -18,20 +18,6 @@ class AMP_Twitter_Embed_Handler_Test extends WP_UnitTestCase {
 		setUp as public prevent_block_pre_render;
 	}
 
-	/**
-	 * oEmbed response for the tweet ID 987437752164737025.
-	 *
-	 * @var string
-	 */
-	protected $oembed_response_1 = '{"url":"https:\/\/twitter.com\/WordPress\/status\/987437752164737025","author_name":"WordPress","author_url":"https:\/\/twitter.com\/WordPress","html":"\u003Cblockquote class=\"twitter-tweet\" data-width=\"500\" data-dnt=\"true\"\u003E\u003Cp lang=\"en\" dir=\"ltr\"\u003ECelebrate the WordPress 15th Anniversary on May 27 \u003Ca href=\"https:\/\/t.co\/jv62WkI9lr\"\u003Ehttps:\/\/t.co\/jv62WkI9lr\u003C\/a\u003E \u003Ca href=\"https:\/\/t.co\/4ZECodSK78\"\u003Epic.twitter.com\/4ZECodSK78\u003C\/a\u003E\u003C\/p\u003E&mdash; WordPress (@WordPress) \u003Ca href=\"https:\/\/twitter.com\/WordPress\/status\/987437752164737025?ref_src=twsrc%5Etfw\"\u003EApril 20, 2018\u003C\/a\u003E\u003C\/blockquote\u003E\n\u003Cscript async src=\"https:\/\/platform.twitter.com\/widgets.js\" charset=\"utf-8\"\u003E\u003C\/script\u003E\n","width":500,"height":null,"type":"rich","cache_age":"3153600000","provider_name":"Twitter","provider_url":"https:\/\/twitter.com","version":"1.0"}';
-
-	/**
-	 * oEmbed response for the tweet ID 705219971425574912.
-	 *
-	 * @var string
-	 */
-	protected $oembed_response_2 = '{"url":"https:\/\/twitter.com\/sengineland\/status\/705219971425574912","author_name":"Search Engine Land","author_url":"https:\/\/twitter.com\/sengineland","html":"\u003Cblockquote class=\"twitter-tweet\" data-width=\"500\" data-dnt=\"true\"\u003E\u003Cp lang=\"en\" dir=\"ltr\"\u003EOn our way to the \u003Ca href=\"https:\/\/twitter.com\/hashtag\/GoogleDance?src=hash&amp;ref_src=twsrc%5Etfw\"\u003E#GoogleDance\u003C\/a\u003E! \u003Ca href=\"https:\/\/twitter.com\/hashtag\/SMX?src=hash&amp;ref_src=twsrc%5Etfw\"\u003E#SMX\u003C\/a\u003E \uD83D\uDC83\uD83C\uDFFB \u003Ca href=\"https:\/\/t.co\/N8kZ9M3eN4\"\u003Epic.twitter.com\/N8kZ9M3eN4\u003C\/a\u003E\u003C\/p\u003E&mdash; Search Engine Land (@sengineland) \u003Ca href=\"https:\/\/twitter.com\/sengineland\/status\/705219971425574912?ref_src=twsrc%5Etfw\"\u003EMarch 3, 2016\u003C\/a\u003E\u003C\/blockquote\u003E\n\u003Cscript async src=\"https:\/\/platform.twitter.com\/widgets.js\" charset=\"utf-8\"\u003E\u003C\/script\u003E\n","width":500,"height":null,"type":"rich","cache_age":"3153600000","provider_name":"Twitter","provider_url":"https:\/\/twitter.com","version":"1.0"}';
-
 	/**
 	 * Set up each test.
 	 */
@@ -69,13 +55,21 @@ public function mock_http_request( $preempt, $r, $url ) {
 		}
 
 		if ( false !== strpos( $url, '987437752164737025' ) ) {
-			$body = $this->oembed_response_1;
+			$body = '{"url":"https:\/\/twitter.com\/WordPress\/status\/987437752164737025","author_name":"WordPress","author_url":"https:\/\/twitter.com\/WordPress","html":"\u003Cblockquote class=\"twitter-tweet\" data-width=\"500\" data-dnt=\"true\"\u003E\u003Cp lang=\"en\" dir=\"ltr\"\u003ECelebrate the WordPress 15th Anniversary on May 27 \u003Ca href=\"https:\/\/t.co\/jv62WkI9lr\"\u003Ehttps:\/\/t.co\/jv62WkI9lr\u003C\/a\u003E \u003Ca href=\"https:\/\/t.co\/4ZECodSK78\"\u003Epic.twitter.com\/4ZECodSK78\u003C\/a\u003E\u003C\/p\u003E&mdash; WordPress (@WordPress) \u003Ca href=\"https:\/\/twitter.com\/WordPress\/status\/987437752164737025?ref_src=twsrc%5Etfw\"\u003EApril 20, 2018\u003C\/a\u003E\u003C\/blockquote\u003E\n\u003Cscript async src=\"https:\/\/platform.twitter.com\/widgets.js\" charset=\"utf-8\"\u003E\u003C\/script\u003E\n","width":500,"height":null,"type":"rich","cache_age":"3153600000","provider_name":"Twitter","provider_url":"https:\/\/twitter.com","version":"1.0"}';
+		} elseif ( false !== strpos( $url, '705219971425574912' ) ) {
+			$body = '{"url":"https:\/\/twitter.com\/sengineland\/status\/705219971425574912","author_name":"Search Engine Land","author_url":"https:\/\/twitter.com\/sengineland","html":"\u003Cblockquote class=\"twitter-tweet\" data-width=\"500\" data-dnt=\"true\"\u003E\u003Cp lang=\"en\" dir=\"ltr\"\u003EOn our way to the \u003Ca href=\"https:\/\/twitter.com\/hashtag\/GoogleDance?src=hash&amp;ref_src=twsrc%5Etfw\"\u003E#GoogleDance\u003C\/a\u003E! \u003Ca href=\"https:\/\/twitter.com\/hashtag\/SMX?src=hash&amp;ref_src=twsrc%5Etfw\"\u003E#SMX\u003C\/a\u003E \uD83D\uDC83\uD83C\uDFFB \u003Ca href=\"https:\/\/t.co\/N8kZ9M3eN4\"\u003Epic.twitter.com\/N8kZ9M3eN4\u003C\/a\u003E\u003C\/p\u003E&mdash; Search Engine Land (@sengineland) \u003Ca href=\"https:\/\/twitter.com\/sengineland\/status\/705219971425574912?ref_src=twsrc%5Etfw\"\u003EMarch 3, 2016\u003C\/a\u003E\u003C\/blockquote\u003E\n\u003Cscript async src=\"https:\/\/platform.twitter.com\/widgets.js\" charset=\"utf-8\"\u003E\u003C\/script\u003E\n","width":500,"height":null,"type":"rich","cache_age":"3153600000","provider_name":"Twitter","provider_url":"https:\/\/twitter.com","version":"1.0"}';
+		} elseif ( false !== strpos( $url, 'moments%2F625792726546558977' ) ) {
+			$body = '{"url":"https:\/\/twitter.com\/i\/moments\/625792726546558977","title":"Michelle Obama Opens Special Olympics","html":"\u003Ca class=\"twitter-moment\" data-width=\"500\" data-dnt=\"true\" href=\"https:\/\/twitter.com\/i\/moments\/625792726546558977?ref_src=twsrc%5Etfw\"\u003EMichelle Obama Opens Special Olympics\u003C\/a\u003E\n\u003Cscript async src=\"https:\/\/platform.twitter.com\/widgets.js\" charset=\"utf-8\"\u003E\u003C\/script\u003E\n","width":500,"height":null,"type":"rich","cache_age":"3153600000","provider_name":"Twitter","provider_url":"https:\/\/twitter.com","version":"1.0"}';
+		} elseif ( false !== strpos( $url, 'lists%2Fweb-gdes' ) ) {
+			$body = '{"url":"https:\/\/twitter.com\/robertnyman\/lists\/web-gdes","title":"Web GDEs","html":"\u003Ca class=\"twitter-timeline\" data-width=\"500\" data-height=\"750\" data-dnt=\"true\" href=\"https:\/\/twitter.com\/robertnyman\/lists\/web-gdes?ref_src=twsrc%5Etfw\"\u003EA Twitter List by robertnyman\u003C\/a\u003E\n\u003Cscript async src=\"https:\/\/platform.twitter.com\/widgets.js\" charset=\"utf-8\"\u003E\u003C\/script\u003E\n","width":500,"height":null,"type":"rich","cache_age":"3153600000","provider_name":"Twitter","provider_url":"https:\/\/twitter.com","version":"1.0"}';
+		} elseif ( false !== strpos( $url, 'wordpress%2Flikes' ) ) { // phpcs:ignore WordPress.WP.CapitalPDangit.Misspelled
+			$body = '{"url":"https:\/\/twitter.com\/WordPress\/likes","title":"","html":"\u003Ca class=\"twitter-timeline\" data-width=\"500\" data-height=\"750\" data-dnt=\"true\" href=\"https:\/\/twitter.com\/WordPress\/likes?ref_src=twsrc%5Etfw\"\u003ETweets Liked by @WordPress\u003C\/a\u003E\n\u003Cscript async src=\"https:\/\/platform.twitter.com\/widgets.js\" charset=\"utf-8\"\u003E\u003C\/script\u003E\n","width":500,"height":null,"type":"rich","cache_age":"3153600000","provider_name":"Twitter","provider_url":"https:\/\/twitter.com","version":"1.0"}';
+		} elseif ( false !== strpos( $url, 'twitter.com%2Fwordpress' ) ) {
+			$body = '{"url":"https:\/\/twitter.com\/WordPress","title":"","html":"\u003Ca class=\"twitter-timeline\" data-width=\"500\" data-height=\"750\" data-dnt=\"true\" href=\"https:\/\/twitter.com\/WordPress?ref_src=twsrc%5Etfw\"\u003ETweets by WordPress\u003C\/a\u003E\n\u003Cscript async src=\"https:\/\/platform.twitter.com\/widgets.js\" charset=\"utf-8\"\u003E\u003C\/script\u003E\n","width":500,"height":null,"type":"rich","cache_age":"3153600000","provider_name":"Twitter","provider_url":"https:\/\/twitter.com","version":"1.0"}';
 		} else {
-			$body = $this->oembed_response_2;
+			$body = '';
 		}
 
-		unset( $r );
-
 		return [
 			'body'          => $body,
 			'headers'       => [],
@@ -95,33 +89,64 @@ public function mock_http_request( $preempt, $r, $url ) {
 	 */
 	public function get_conversion_data() {
 		return [
-			'no_embed'                  => [
+			'no_embed'                                => [
 				'<p>Hello world.</p>',
 				'<p>Hello world.</p>' . PHP_EOL,
 			],
-			'url_simple'                => [
-				'https://twitter.com/wordpress/status/987437752164737025' . PHP_EOL,
-				"<amp-twitter width=\"600\" height=\"480\" layout=\"responsive\" data-tweetid=\"987437752164737025\" class=\"twitter-tweet\" data-width=\"500\" data-dnt=\"true\"><blockquote class=\"twitter-tweet\" data-width=\"500\" data-dnt=\"true\" placeholder=\"\">\n<p lang=\"en\" dir=\"ltr\">Celebrate the WordPress 15th Anniversary on May 27 <a href=\"https://t.co/jv62WkI9lr\">https://t.co/jv62WkI9lr</a> <a href=\"https://t.co/4ZECodSK78\">pic.twitter.com/4ZECodSK78</a></p>\n<p>— WordPress (@WordPress) <a href=\"https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw\">April 20, 2018</a></p></blockquote></amp-twitter>\n\n",
+
+			'embed_blockquote_without_twitter'        => [
+				'<blockquote>lorem ipsum</blockquote>',
+				'<blockquote><p>lorem ipsum</p></blockquote>' . PHP_EOL,
 			],
-			'url_with_big_tweet_id'     => [
+
+			'url_simple'                              => [
+				'https://twitter.com/wordpress/status/987437752164737025',
+				'<amp-twitter width="500" height="480" layout="responsive" data-tweetid="987437752164737025" data-dnt="true"><blockquote class="twitter-tweet" placeholder="">' . PHP_EOL . '<p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>' . PHP_EOL . '<p>— WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></p></blockquote></amp-twitter>' . PHP_EOL . PHP_EOL,
+			],
+
+			'url_with_big_tweet_id'                   => [
 				'https://twitter.com/wordpress/status/705219971425574912' . PHP_EOL,
-				"<amp-twitter width=\"600\" height=\"480\" layout=\"responsive\" data-tweetid=\"705219971425574912\" class=\"twitter-tweet\" data-width=\"500\" data-dnt=\"true\"><blockquote class=\"twitter-tweet\" data-width=\"500\" data-dnt=\"true\" placeholder=\"\">\n<p lang=\"en\" dir=\"ltr\">On our way to the <a href=\"https://twitter.com/hashtag/GoogleDance?src=hash&amp;ref_src=twsrc%5Etfw\">#GoogleDance</a>! <a href=\"https://twitter.com/hashtag/SMX?src=hash&amp;ref_src=twsrc%5Etfw\">#SMX</a> 💃🏻 <a href=\"https://t.co/N8kZ9M3eN4\">pic.twitter.com/N8kZ9M3eN4</a></p>\n<p>— Search Engine Land (@sengineland) <a href=\"https://twitter.com/sengineland/status/705219971425574912?ref_src=twsrc%5Etfw\">March 3, 2016</a></p></blockquote></amp-twitter>\n\n",
+				'<amp-twitter width="500" height="480" layout="responsive" data-tweetid="705219971425574912" data-dnt="true"><blockquote class="twitter-tweet" placeholder="">' . PHP_EOL . '<p lang="en" dir="ltr">On our way to the <a href="https://twitter.com/hashtag/GoogleDance?src=hash&amp;ref_src=twsrc%5Etfw">#GoogleDance</a>! <a href="https://twitter.com/hashtag/SMX?src=hash&amp;ref_src=twsrc%5Etfw">#SMX</a> 💃🏻 <a href="https://t.co/N8kZ9M3eN4">pic.twitter.com/N8kZ9M3eN4</a></p>' . PHP_EOL . '<p>— Search Engine Land (@sengineland) <a href="https://twitter.com/sengineland/status/705219971425574912?ref_src=twsrc%5Etfw">March 3, 2016</a></p></blockquote></amp-twitter>' . PHP_EOL . PHP_EOL,
 			],
-			'timeline_url_with_profile' => [
+
+			'timeline_url_with_profile'               => [
 				'https://twitter.com/wordpress' . PHP_EOL,
-				"<p><amp-twitter data-timeline-source-type=\"profile\" data-timeline-screen-name=\"wordpress\" layout=\"responsive\" width=\"600\" height=\"480\"></amp-twitter></p>\n",
+				'<amp-twitter width="500" height="750" layout="responsive" data-timeline-source-type="url" data-timeline-url="https://twitter.com/WordPress?ref_src=twsrc%5Etfw" data-dnt="true"><a class="twitter-timeline" href="https://twitter.com/WordPress?ref_src=twsrc%5Etfw" placeholder="">Tweets by WordPress</a></amp-twitter>' . PHP_EOL,
 			],
-			'timeline_url_with_likes'   => [
+
+			'timeline_url_with_likes'                 => [
 				'https://twitter.com/wordpress/likes' . PHP_EOL,
-				"<p><amp-twitter data-timeline-source-type=\"likes\" data-timeline-screen-name=\"wordpress\" layout=\"responsive\" width=\"600\" height=\"480\"></amp-twitter></p>\n",
-			],
-			'timeline_url_with_list'    => [
-				'https://twitter.com/wordpress/lists/random_list' . PHP_EOL,
-				"<p><amp-twitter data-timeline-source-type=\"list\" data-timeline-slug=\"random_list\" data-timeline-owner-screen-name=\"wordpress\" layout=\"responsive\" width=\"600\" height=\"480\"></amp-twitter></p>\n",
+				'<amp-twitter width="500" height="750" layout="responsive" data-timeline-source-type="url" data-timeline-url="https://twitter.com/WordPress/likes?ref_src=twsrc%5Etfw" data-dnt="true"><a class="twitter-timeline" href="https://twitter.com/WordPress/likes?ref_src=twsrc%5Etfw" placeholder="">Tweets Liked by @WordPress</a></amp-twitter>' . PHP_EOL,
 			],
-			'timeline_url_with_list2'   => [
+
+			'timeline_url_with_list'                  => [
 				'https://twitter.com/robertnyman/lists/web-gdes' . PHP_EOL,
-				"<p><amp-twitter data-timeline-source-type=\"list\" data-timeline-slug=\"web-gdes\" data-timeline-owner-screen-name=\"robertnyman\" layout=\"responsive\" width=\"600\" height=\"480\"></amp-twitter></p>\n",
+				'<amp-twitter width="500" height="750" layout="responsive" data-timeline-source-type="url" data-timeline-url="https://twitter.com/robertnyman/lists/web-gdes?ref_src=twsrc%5Etfw" data-dnt="true"><a class="twitter-timeline" href="https://twitter.com/robertnyman/lists/web-gdes?ref_src=twsrc%5Etfw" placeholder="">A Twitter List by robertnyman</a></amp-twitter>' . PHP_EOL,
+			],
+
+			'moment_url'                              => [
+				'https://twitter.com/i/moments/625792726546558977' . PHP_EOL,
+				'<amp-twitter width="500" height="480" layout="responsive" data-momentid="625792726546558977" data-dnt="true"><a class="twitter-moment" href="https://twitter.com/i/moments/625792726546558977?ref_src=twsrc%5Etfw" placeholder="">Michelle Obama Opens Special Olympics</a></amp-twitter>' . PHP_EOL,
+			],
+
+			'blockquote_embed'                        => [
+				wpautop( '<blockquote class="twitter-tweet" data-lang="en"><p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>-- WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></blockquote> <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>' ), // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript, WordPress.Arrays.ArrayDeclarationSpacing.ArrayItemNoNewLine
+				'<amp-twitter width="600" height="480" layout="responsive" data-tweetid="987437752164737025" data-lang="en"><blockquote class="twitter-tweet" placeholder="">' . PHP_EOL . '<p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>' . PHP_EOL . '<p>— WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></p>' . PHP_EOL . '</blockquote></amp-twitter>' . PHP_EOL . PHP_EOL,
+			],
+
+			'blockquote_embed_with_data_conversation' => [
+				wpautop( '<blockquote class="twitter-tweet" data-conversation="none"><p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>&mdash; WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></blockquote> <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>' ), // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript, WordPress.Arrays.ArrayDeclarationSpacing.ArrayItemNoNewLine
+				'<amp-twitter width="600" height="480" layout="responsive" data-tweetid="987437752164737025" data-conversation="none"><blockquote class="twitter-tweet" placeholder="">' . PHP_EOL . '<p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>' . PHP_EOL . '<p>— WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></p>' . PHP_EOL . '</blockquote></amp-twitter>' . PHP_EOL . PHP_EOL,
+			],
+
+			'blockquote_embed_with_data_theme'        => [
+				wpautop( '<blockquote class="twitter-tweet" data-theme="en"><p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>&mdash; WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></blockquote> <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>' ), // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript, WordPress.Arrays.ArrayDeclarationSpacing.ArrayItemNoNewLine
+				'<amp-twitter width="600" height="480" layout="responsive" data-tweetid="987437752164737025" data-theme="en"><blockquote class="twitter-tweet" placeholder="">' . PHP_EOL . '<p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>' . PHP_EOL . '<p>— WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></p>' . PHP_EOL . '</blockquote></amp-twitter>' . PHP_EOL . PHP_EOL,
+			],
+
+			'blockquote_embed_not_autop'              => [
+				'<blockquote class="twitter-tweet" data-lang="en"><p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>-- WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></blockquote> <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>', // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript, WordPress.Arrays.ArrayDeclarationSpacing.ArrayItemNoNewLine
+				'<amp-twitter width="600" height="480" layout="responsive" data-tweetid="987437752164737025" data-lang="en"><blockquote class="twitter-tweet" placeholder="">' . PHP_EOL . '<p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>' . PHP_EOL . '<p>— WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></p></blockquote></amp-twitter>' . PHP_EOL . PHP_EOL,
 			],
 		];
 	}
@@ -135,7 +160,6 @@ public function get_conversion_data() {
 	 */
 	public function test__conversion( $source, $expected ) {
 		$embed = new AMP_Twitter_Embed_Handler();
-		$embed->register_embed();
 
 		$filtered_content = apply_filters( 'the_content', $source );
 		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
@@ -169,7 +193,6 @@ public function get_scripts_data() {
 	 */
 	public function test__get_scripts( $source, $expected ) {
 		$embed = new AMP_Twitter_Embed_Handler();
-		$embed->register_embed();
 
 		$filtered_content = apply_filters( 'the_content', $source );
 		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
@@ -185,61 +208,4 @@ public function test__get_scripts( $source, $expected ) {
 
 		$this->assertEquals( $expected, $scripts );
 	}
-
-	/**
-	 * Data for test__raw_embed_sanitizer.
-	 *
-	 * @return array Data.
-	 */
-	public function get_raw_embed_dataset() {
-		return [
-			'no_embed'                                => [
-				'<p>Hello world.</p>',
-				'<p>Hello world.</p>',
-			],
-			'embed_blockquote_without_twitter'        => [
-				'<blockquote>lorem ipsum</blockquote>',
-				'<blockquote>lorem ipsum</blockquote>',
-			],
-
-			'blockquote_embed'                        => [
-				wpautop( '<blockquote class="twitter-tweet" data-lang="en"><p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>-- WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></blockquote> <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>' ), // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript, WordPress.Arrays.ArrayDeclarationSpacing.ArrayItemNoNewLine
-				'<amp-twitter width="600" height="480" layout="responsive" data-tweetid="987437752164737025" class="twitter-tweet" data-lang="en"><blockquote class="twitter-tweet" data-lang="en" placeholder="">' . "\n" . '<p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>' . "\n" . '<p>-- WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></p></blockquote></amp-twitter>' . "\n\n",
-			],
-
-			'blockquote_embed_with_data_conversation' => [
-				wpautop( '<blockquote class="twitter-tweet" data-conversation="none"><p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>&mdash; WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></blockquote> <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>' ), // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript, WordPress.Arrays.ArrayDeclarationSpacing.ArrayItemNoNewLine
-				'<amp-twitter width="600" height="480" layout="responsive" data-tweetid="987437752164737025" class="twitter-tweet" data-conversation="none"><blockquote class="twitter-tweet" data-conversation="none" placeholder="">' . "\n" . '<p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>' . "\n" . '<p>— WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></p></blockquote></amp-twitter>' . "\n\n",
-			],
-
-			'blockquote_embed_with_data_theme'        => [
-				wpautop( '<blockquote class="twitter-tweet" data-theme="en"><p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>&mdash; WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></blockquote> <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>' ), // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript, WordPress.Arrays.ArrayDeclarationSpacing.ArrayItemNoNewLine
-				'<amp-twitter width="600" height="480" layout="responsive" data-tweetid="987437752164737025" class="twitter-tweet" data-theme="en"><blockquote class="twitter-tweet" data-theme="en" placeholder="">' . "\n" . '<p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>' . "\n" . '<p>— WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></p></blockquote></amp-twitter>' . "\n\n",
-			],
-
-			'blockquote_embed_not_autop'              => [
-				'<blockquote class="twitter-tweet" data-lang="en"><p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>-- WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></blockquote> <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>', // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript, WordPress.Arrays.ArrayDeclarationSpacing.ArrayItemNoNewLine
-				'<amp-twitter width="600" height="480" layout="responsive" data-tweetid="987437752164737025" class="twitter-tweet" data-lang="en"><blockquote class="twitter-tweet" data-lang="en" placeholder=""><p lang="en" dir="ltr">Celebrate the WordPress 15th Anniversary on May 27 <a href="https://t.co/jv62WkI9lr">https://t.co/jv62WkI9lr</a> <a href="https://t.co/4ZECodSK78">pic.twitter.com/4ZECodSK78</a></p>-- WordPress (@WordPress) <a href="https://twitter.com/WordPress/status/987437752164737025?ref_src=twsrc%5Etfw">April 20, 2018</a></blockquote></amp-twitter> ',
-			],
-		];
-	}
-
-	/**
-	 * Test raw_embed_sanitizer.
-	 *
-	 * @param string $source  Content.
-	 * @param string $expected Expected content.
-	 * @dataProvider get_raw_embed_dataset
-	 * @covers AMP_Twitter_Embed_Handler::sanitize_raw_embeds()
-	 */
-	public function test__raw_embed_sanitizer( $source, $expected ) {
-		$dom   = AMP_DOM_Utils::get_dom_from_content( $source );
-		$embed = new AMP_Twitter_Embed_Handler();
-
-		$embed->sanitize_raw_embeds( $dom );
-
-		$content = AMP_DOM_Utils::get_content_from_dom( $dom );
-
-		$this->assertEquals( $expected, $content );
-	}
 }
diff --git a/tests/php/test-amp-vimeo-embed-handler.php b/tests/php/test-amp-vimeo-embed-handler.php
index 1da50eadc2c..291d4a3d088 100644
--- a/tests/php/test-amp-vimeo-embed-handler.php
+++ b/tests/php/test-amp-vimeo-embed-handler.php
@@ -30,17 +30,17 @@ public function get_conversion_data() {
 
 			'url_simple'   => [
 				'https://vimeo.com/172355597' . PHP_EOL,
-				'<p><amp-vimeo data-videoid="172355597" layout="responsive" width="600" height="338"></amp-vimeo></p>' . PHP_EOL,
+				'<amp-vimeo data-videoid="172355597" layout="responsive" width="600" height="338"></amp-vimeo>' . PHP_EOL,
 			],
 
 			'url_unlisted' => [
 				'https://vimeo.com/172355597/abcdef0123' . PHP_EOL,
-				'<p><amp-vimeo data-videoid="172355597" layout="responsive" width="600" height="338"></amp-vimeo></p>' . PHP_EOL,
+				'<amp-vimeo data-videoid="172355597" layout="responsive" width="600" height="338"></amp-vimeo>' . PHP_EOL,
 			],
 
 			'url_player'   => [
 				'https://player.vimeo.com/video/172355597' . PHP_EOL,
-				'<p><amp-vimeo data-videoid="172355597" layout="responsive" width="600" height="338"></amp-vimeo></p>' . PHP_EOL,
+				'<amp-vimeo data-videoid="172355597" layout="responsive" width="600" height="338"></amp-vimeo>' . PHP_EOL,
 			],
 		];
 	}
@@ -55,10 +55,14 @@ public function get_conversion_data() {
 	 */
 	public function test__conversion( $source, $expected ) {
 		$embed = new AMP_Vimeo_Embed_Handler();
-		$embed->register_embed();
+
 		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
+
+		$content = AMP_DOM_Utils::get_content_from_dom( $dom );
 
-		$this->assertEquals( $expected, $filtered_content );
+		$this->assertEquals( $expected, $content );
 	}
 
 	/**
@@ -90,10 +94,12 @@ public function get_scripts_data() {
 	 */
 	public function test__get_scripts( $source, $expected ) {
 		$embed = new AMP_Vimeo_Embed_Handler();
-		$embed->register_embed();
-		$source = apply_filters( 'the_content', $source );
 
-		$validating_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( AMP_DOM_Utils::get_dom_from_content( $source ) );
+		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
+
+		$validating_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( $dom );
 		$validating_sanitizer->sanitize();
 
 		$scripts = array_merge(
@@ -103,63 +109,4 @@ public function test__get_scripts( $source, $expected ) {
 
 		$this->assertEquals( $expected, $scripts );
 	}
-
-	/**
-	 * Gets the test data for test_video_override().
-	 *
-	 * @return array The test data.
-	 */
-	public function get_video_override_data() {
-		return [
-			'no_src_empty_html'    => [
-				'',
-				[ 'foo' => 'baz' ],
-				null,
-			],
-			'no_src_with_html'     => [
-				'Initial HTML here',
-				[ 'foo' => 'baz' ],
-				null,
-			],
-			'non_vimeo_src'        => [
-				'Initial HTML here',
-				[ 'src' => 'https://youtube.com/1234567' ],
-				null,
-			],
-			'non_numeric_video_id' => [
-				'Initial HTML here',
-				[ 'src' => 'https://vimeo.com/abcdefg' ],
-				'',
-			],
-			'valid_video_id'       => [
-				'Initial HTML here',
-				[ 'src' => 'https://vimeo.com/1234567' ],
-				'<amp-vimeo data-videoid="1234567" layout="responsive" width="600" height="338"></amp-vimeo>',
-			],
-			'http_url'             => [
-				'Initial HTML here',
-				[ 'src' => 'https://vimeo.com/1234567' ],
-				'<amp-vimeo data-videoid="1234567" layout="responsive" width="600" height="338"></amp-vimeo>',
-			],
-		];
-	}
-
-	/**
-	 * Test video_override().
-	 *
-	 * @dataProvider get_video_override_data
-	 * @covers AMP_Vimeo_Embed_Handler::video_override()
-	 *
-	 * @param string $html     The initial HTML.
-	 * @param array  $attr     The attributes of the shortcode.
-	 * @param string $expected The expected return value.
-	 */
-	public function test_video_override( $html, $attr, $expected ) {
-		if ( null === $expected ) {
-			$expected = $html;
-		}
-
-		$embed = new AMP_Vimeo_Embed_Handler();
-		$this->assertEquals( $expected, $embed->video_override( $html, $attr ) );
-	}
 }
diff --git a/tests/php/test-amp-vine-embed-handler.php b/tests/php/test-amp-vine-embed-handler.php
index 0c2194c101a..a732f9ef3e9 100644
--- a/tests/php/test-amp-vine-embed-handler.php
+++ b/tests/php/test-amp-vine-embed-handler.php
@@ -14,7 +14,7 @@ public function get_conversion_data() {
 			],
 			'simple_url' => [
 				'https://vine.co/v/MdKjXez002d' . PHP_EOL,
-				'<p><amp-vine data-vineid="MdKjXez002d" layout="responsive" width="400" height="400"></amp-vine></p>' . PHP_EOL,
+				'<amp-vine data-vineid="MdKjXez002d" layout="responsive" width="400" height="400"></amp-vine>' . PHP_EOL,
 			],
 		];
 	}
@@ -25,9 +25,14 @@ public function get_conversion_data() {
 	public function test__conversion( $source, $expected ) {
 		$embed = new AMP_Vine_Embed_Handler();
 		$embed->register_embed();
+
 		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
+
+		$content = AMP_DOM_Utils::get_content_from_dom( $dom );
 
-		$this->assertEquals( $expected, $filtered_content );
+		$this->assertEquals( $expected, $content );
 	}
 
 	public function get_scripts_data() {
@@ -49,9 +54,12 @@ public function get_scripts_data() {
 	public function test__get_scripts( $source, $expected ) {
 		$embed = new AMP_Vine_Embed_Handler();
 		$embed->register_embed();
-		$source = apply_filters( 'the_content', $source );
 
-		$validating_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( AMP_DOM_Utils::get_dom_from_content( $source ) );
+		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
+
+		$validating_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( $dom );
 		$validating_sanitizer->sanitize();
 
 		$scripts = array_merge(
diff --git a/tests/php/test-class-amp-gfycat-embed-handler.php b/tests/php/test-class-amp-gfycat-embed-handler.php
index bb0db5571ca..d0205f18d04 100644
--- a/tests/php/test-class-amp-gfycat-embed-handler.php
+++ b/tests/php/test-class-amp-gfycat-embed-handler.php
@@ -35,7 +35,7 @@ static function( $pre, $url ) {
 				if ( false === strpos( $url, 'tautwhoppingcougar' ) ) {
 					return $pre;
 				}
-				return '<iframe src=\'https://gfycat.com/ifr/tautwhoppingcougar\' frameborder=\'0\' scrolling=\'no\' width=\'100\' height=\'100\'  allowfullscreen></iframe>';
+				return '<iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted" title="Melanie Raccoon riding bike-side angle (reddit)" src=\'https://gfycat.com/ifr/tautwhoppingcougar#?secret=Brq0P9wYCr\' data-secret=\'Brq0P9wYCr\' frameborder=\'0\' scrolling=\'no\' width=\'100%\' height=\'100%\'></iframe>';
 			},
 			10,
 			2
@@ -56,17 +56,17 @@ public function get_conversion_data() {
 
 			'url_simple'      => [
 				'https://gfycat.com/tautwhoppingcougar' . PHP_EOL,
-				'<p><amp-gfycat width="100" height="100" data-gfyid="tautwhoppingcougar"></amp-gfycat></p>' . PHP_EOL,
+				'<amp-gfycat data-gfyid="tautwhoppingcougar" layout="fill"></amp-gfycat>' . PHP_EOL,
 			],
 
 			'url_with_detail' => [
 				'https://gfycat.com/gifs/detail/tautwhoppingcougar' . PHP_EOL,
-				'<p><amp-gfycat width="100" height="100" data-gfyid="tautwhoppingcougar"></amp-gfycat></p>' . PHP_EOL,
+				'<amp-gfycat data-gfyid="tautwhoppingcougar" layout="fill"></amp-gfycat>' . PHP_EOL,
 			],
 
 			'url_with_params' => [
 				'https://gfycat.com/gifs/detail/tautwhoppingcougar?foo=bar' . PHP_EOL,
-				'<p><amp-gfycat width="100" height="100" data-gfyid="tautwhoppingcougar"></amp-gfycat></p>' . PHP_EOL,
+				'<amp-gfycat data-gfyid="tautwhoppingcougar" layout="fill"></amp-gfycat>' . PHP_EOL,
 			],
 
 		];
@@ -81,10 +81,14 @@ public function get_conversion_data() {
 	 */
 	public function test__conversion( $source, $expected ) {
 		$embed = new AMP_Gfycat_Embed_Handler();
-		$embed->register_embed();
+
 		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
+
+		$content = AMP_DOM_Utils::get_content_from_dom( $dom );
 
-		$this->assertEquals( $expected, $filtered_content );
+		$this->assertEquals( $expected, $content );
 	}
 
 	/**
@@ -114,10 +118,12 @@ public function get_scripts_data() {
 	 */
 	public function test__get_scripts( $source, $expected ) {
 		$embed = new AMP_Gfycat_Embed_Handler();
-		$embed->register_embed();
-		$source = apply_filters( 'the_content', $source );
 
-		$validating_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( AMP_DOM_Utils::get_dom_from_content( $source ) );
+		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
+
+		$validating_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( $dom );
 		$validating_sanitizer->sanitize();
 
 		$scripts = array_merge(
diff --git a/tests/php/test-class-amp-hulu-embed-handler.php b/tests/php/test-class-amp-hulu-embed-handler.php
index 69bbaa730dd..1796a2b5111 100644
--- a/tests/php/test-class-amp-hulu-embed-handler.php
+++ b/tests/php/test-class-amp-hulu-embed-handler.php
@@ -66,12 +66,12 @@ public function get_conversion_data() {
 		return [
 			'url_simple'      => [
 				'https://www.hulu.com/watch/771496',
-				'<p><amp-hulu width="500" height="289" data-eid="771496"></amp-hulu></p>' . PHP_EOL,
+				'<amp-hulu data-eid="_hHzwnAcj3RrXMJFDDvkuw" layout="responsive" width="500" height="289"></amp-hulu>' . PHP_EOL,
 			],
 
 			'url_with_params' => [
 				'https://www.hulu.com/watch/771496?foo=bar',
-				'<p><amp-hulu width="500" height="289" data-eid="771496"></amp-hulu></p>' . PHP_EOL,
+				'<amp-hulu data-eid="_hHzwnAcj3RrXMJFDDvkuw" layout="responsive" width="500" height="289"></amp-hulu>' . PHP_EOL,
 			],
 
 		];
@@ -86,14 +86,18 @@ public function get_conversion_data() {
 	 */
 	public function test__conversion( $url, $expected ) {
 		$embed = new AMP_Hulu_Embed_Handler();
-		$embed->register_embed();
+
 		$filtered_content = apply_filters( 'the_content', $url );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
 
 		if ( self::is_external_http_test_suite() && "<p>$url</p>" === trim( $filtered_content ) ) {
 			$this->markTestSkipped( 'Endpoint is down.' );
 		}
 
-		$this->assertEquals( $expected, $filtered_content );
+		$content = AMP_DOM_Utils::get_content_from_dom( $dom );
+
+		$this->assertEquals( $expected, $content );
 	}
 
 	/**
@@ -123,14 +127,16 @@ public function get_scripts_data() {
 	 */
 	public function test__get_scripts( $url, $expected ) {
 		$embed = new AMP_Hulu_Embed_Handler();
-		$embed->register_embed();
+
 		$filtered_content = apply_filters( 'the_content', $url );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
 
 		if ( self::is_external_http_test_suite() && "<p>$url</p>" === trim( $filtered_content ) ) {
 			$this->markTestSkipped( 'Endpoint is down.' );
 		}
 
-		$validating_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( AMP_DOM_Utils::get_dom_from_content( $filtered_content ) );
+		$validating_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( $dom );
 		$validating_sanitizer->sanitize();
 
 		$scripts = array_merge(
diff --git a/tests/php/test-class-amp-imgur-embed-handler.php b/tests/php/test-class-amp-imgur-embed-handler.php
index 7286c876976..dfc149ffd19 100644
--- a/tests/php/test-class-amp-imgur-embed-handler.php
+++ b/tests/php/test-class-amp-imgur-embed-handler.php
@@ -57,9 +57,6 @@ static function( $pre, $r, $url ) {
 	 * @return array
 	 */
 	public function get_conversion_data() {
-		$width  = 500;
-		$height = 750;
-
 		return [
 			'no_embed'        => [
 				'<p>Hello world.</p>',
@@ -68,17 +65,17 @@ public function get_conversion_data() {
 
 			'url_simple'      => [
 				'https://imgur.com/fmHGADZ' . PHP_EOL,
-				'<p><amp-imgur width="' . $width . '" height="' . $height . '" data-imgur-id="fmHGADZ"></amp-imgur></p>' . PHP_EOL,
+				'<amp-imgur data-imgur-id="fmHGADZ" layout="responsive" width="540" height="500"></amp-imgur>' . PHP_EOL . PHP_EOL,
 			],
 
 			'url_with_detail' => [
 				'https://imgur.com/gallery/1ApvcWB' . PHP_EOL,
-				'<p><amp-imgur width="' . $width . '" height="' . $height . '" data-imgur-id="1ApvcWB"></amp-imgur></p>' . PHP_EOL,
+				'<amp-imgur data-imgur-id="a/1ApvcWB" layout="responsive" width="540" height="500"></amp-imgur>' . PHP_EOL . PHP_EOL,
 			],
 
 			'url_with_params' => [
 				'https://imgur.com/gallery/1ApvcWB?foo=bar' . PHP_EOL,
-				'<p><amp-imgur width="' . $width . '" height="' . $height . '" data-imgur-id="1ApvcWB"></amp-imgur></p>' . PHP_EOL,
+				'<amp-imgur data-imgur-id="a/1ApvcWB" layout="responsive" width="540" height="500"></amp-imgur>' . PHP_EOL . PHP_EOL,
 			],
 
 		];
@@ -93,10 +90,14 @@ public function get_conversion_data() {
 	 */
 	public function test__conversion( $source, $expected ) {
 		$embed = new AMP_Imgur_Embed_Handler();
-		$embed->register_embed();
+
 		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
+
+		$content = AMP_DOM_Utils::get_content_from_dom( $dom );
 
-		$this->assertEquals( $expected, $filtered_content );
+		$this->assertEquals( $expected, $content );
 	}
 
 	/**
@@ -126,10 +127,12 @@ public function get_scripts_data() {
 	 */
 	public function test__get_scripts( $source, $expected ) {
 		$embed = new AMP_Imgur_Embed_Handler();
-		$embed->register_embed();
-		$source = apply_filters( 'the_content', $source );
 
-		$validating_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( AMP_DOM_Utils::get_dom_from_content( $source ) );
+		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
+
+		$validating_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( $dom );
 		$validating_sanitizer->sanitize();
 
 		$scripts = array_merge(
diff --git a/tests/php/test-class-amp-tiktok-embed-handler.php b/tests/php/test-class-amp-tiktok-embed-handler.php
index 1439edb1802..8e61fc0a74d 100644
--- a/tests/php/test-class-amp-tiktok-embed-handler.php
+++ b/tests/php/test-class-amp-tiktok-embed-handler.php
@@ -93,11 +93,10 @@ public function get_conversion_data() {
 	 */
 	public function test_conversion( $source, $expected ) {
 		if ( version_compare( '5.4-alpha', get_bloginfo( 'version' ), '>' ) ) {
-			$this->markTestSkipped( 'The TikTok embed is only available in 5.4-alpha (until 5.4 is stable)' );
+			$this->markTestSkipped( 'The TikTok embed is only available in 5.4-alpha and above.' );
 		}
 
 		$embed = new AMP_TikTok_Embed_Handler();
-		$embed->register_embed();
 
 		$filtered_content = apply_filters( 'the_content', $source );
 		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
diff --git a/tests/php/test-class-amp-wordpress-tv-embed-handler.php b/tests/php/test-class-amp-wordpress-tv-embed-handler.php
index 4089c50eca7..602bfb5dac1 100644
--- a/tests/php/test-class-amp-wordpress-tv-embed-handler.php
+++ b/tests/php/test-class-amp-wordpress-tv-embed-handler.php
@@ -47,9 +47,9 @@ public function mock_http_request( $preempt, $r, $url ) {
 		if ( false === strpos( $url, 'wordpress.tv' ) ) {
 			return $preempt;
 		}
-		unset( $r );
+
 		return [
-			'body'          => '{"type":"video","version":"1.0","title":null,"width":500,"height":281,"html":"<iframe width=\'500\' height=\'281\' src=\'https:\\/\\/video.wordpress.com\\/embed\\/yFCmLMGL?hd=0\' frameborder=\'0\' allowfullscreen><\\/iframe><script src=\'https:\\/\\/v0.wordpress.com\\/js\\/next\\/videopress-iframe.js?m=1435166243\'></script>"}', // phpcs:ignore
+			'body'          => '{"type":"video","version":"1.0","title":null,"width":500,"height":281,"html":"<iframe width=\'500\' height=\'281\' src=\'https:\/\/video.wordpress.com\/embed\/yFCmLMGL?hd=1\' frameborder=\'0\' allowfullscreen><\/iframe><script src=\'https:\/\/v0.wordpress.com\/js\/next\/videopress-iframe.js?m=1435166243\'><\/script>"}', // phpcs:ignore
 			'headers'       => [],
 			'response'      => [
 				'code'    => 200,
@@ -61,99 +61,46 @@ public function mock_http_request( $preempt, $r, $url ) {
 	}
 
 	/**
-	 * Test that the script tag that VideoPress adds is removed by the sanitizer.
-	 *
-	 * @covers AMP_WordPress_TV_Embed_Handler::filter_oembed_html()
-	 */
-	public function test_script_removal() {
-		$handler = new AMP_WordPress_TV_Embed_Handler();
-		$handler->unregister_embed(); // Make sure we are on the initial clean state.
-
-		$wordpress_tv_block = '
-			<!-- wp:core-embed/wordpress-tv {"url":"https://wordpress.tv/2019/10/08/the-history-of-wordpress-in-four-minutes/","type":"video","providerNameSlug":"","className":"wp-embed-aspect-16-9 wp-has-aspect-ratio"} -->
-				<figure class="wp-block-embed-wordpress-tv wp-block-embed is-type-video wp-embed-aspect-16-9 wp-has-aspect-ratio">
-					<div class="wp-block-embed__wrapper">
-						https://wordpress.tv/2019/10/08/the-history-of-wordpress-in-four-minutes/
-					</div>
-				</figure>
-			<!-- /wp:core-embed/wordpress-tv -->
-		';
-
-		$handler->register_embed();
-		$rendered = apply_filters( 'the_content', $wordpress_tv_block );
-		$this->assertStringContains( '<iframe', $rendered );
-		$this->assertStringContains( 'video.wordpress.com/embed', $rendered );
-		$this->assertStringNotContains( '<script', $rendered );
-	}
-
-	/**
-	 * Gets the test data for test_filter_oembed_html().
+	 * Gets the test data for test_conversion().
 	 *
 	 * @return array The test data.
 	 */
-	public function get_filter_oembed_data() {
-		$embed_without_script = '<p>Example Embed</p>';
-		$embed_with_script    = $embed_without_script . '<script>doThis();</script>';
-
+	public function get_conversion_data() {
 		return [
-			'wrong_embed_url_domain'                => [
-				$embed_without_script,
-				'https://incorrect.com',
-				null,
+			'no_embed'                      => [
+				'<p>Hello world.</p>',
+				'<p>Hello world.</p>' . PHP_EOL,
 			],
-			'wrong_embed_url_wordpress_com'         => [
-				$embed_without_script,
+
+			'wrong_embed_url_wordpress_com' => [
 				'https://wordpress.com/123',
-				null,
-			],
-			'wrong_embed_url_no_protocol'           => [
-				$embed_without_script,
-				'//wordpress.tv/',
-				null,
-			],
-			'correct_embed_url_http'                => [
-				$embed_with_script,
-				'https://wordpress.tv/123',
-				$embed_without_script,
-			],
-			'correct_embed_url_https'               => [
-				$embed_with_script,
-				'https://wordpress.tv/123',
-				$embed_without_script,
+				'<p>https://wordpress.com/123</p>' . PHP_EOL,
 			],
-			'correct_embed_url_no_script'           => [
-				$embed_without_script,
-				'https://wordpress.tv/123',
-				null,
-			],
-			'correct_embed_url_text_script_not_tag' => [
-				'This is the script for the play',
-				'https://wordpress.tv/123',
-				null,
+
+			'correct_url'                   => [
+				'https://wordpress.tv/2019/10/08/the-history-of-wordpress-in-four-minutes/',
+				'<iframe width="500" height="281" src="https://video.wordpress.com/embed/yFCmLMGL?hd=1" frameborder="0" allowfullscreen layout="responsive"></iframe>' . PHP_EOL,
 			],
 		];
 	}
 
 	/**
-	 * Test filter_oembed_html
+	 * Test conversion.
 	 *
-	 * @dataProvider get_filter_oembed_data
-	 * @covers AMP_WordPress_TV_Embed_Handler::filter_oembed_html()
+	 * @dataProvider get_conversion_data
 	 *
-	 * @param mixed  $cache    The cached markup.
-	 * @param string $url      The URL of the embed.
+	 * @param string $source Source.
 	 * @param string $expected The expected return value.
 	 */
-	public function test_filter_oembed_html( $cache, $url, $expected ) {
-		if ( null === $expected ) {
-			$expected = $cache;
-		}
+	public function test_conversion( $source, $expected ) {
+		$embed = new AMP_WordPress_TV_Embed_Handler();
+
+		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$embed->sanitize_raw_embeds( $dom );
 
-		$handler = new AMP_WordPress_TV_Embed_Handler();
-		$this->assertEquals(
-			$expected,
-			$handler->filter_oembed_html( $cache, $url )
-		);
+		$content = AMP_DOM_Utils::get_content_from_dom( $dom );
 
+		$this->assertEquals( $expected, $content );
 	}
 }
diff --git a/tests/php/test-class-amp-youtube-embed-handler.php b/tests/php/test-class-amp-youtube-embed-handler.php
index 71ef3e825ec..c8560f12bb6 100644
--- a/tests/php/test-class-amp-youtube-embed-handler.php
+++ b/tests/php/test-class-amp-youtube-embed-handler.php
@@ -87,8 +87,6 @@ public function mock_http_request( $preempt, $r, $url ) {
 			return $preempt;
 		}
 
-		unset( $r );
-
 		return [
 			'body'          => $this->youtube_oembed_response,
 			'headers'       => [],
@@ -101,47 +99,7 @@ public function mock_http_request( $preempt, $r, $url ) {
 		];
 	}
 
-	/**
-	 * Test video_override().
-	 *
-	 * @covers AMP_YouTube_Embed_Handler::video_override()
-	 */
-	public function test_video_override() {
-		remove_all_filters( 'wp_video_shortcode_override' );
-		$this->handler->register_embed();
-		$youtube_id   = 'XOY3ZUO6P0k';
-		$youtube_src  = 'https://youtu.be/' . $youtube_id;
-		$attr_youtube = [
-			'src' => $youtube_src,
-		];
-
-		$youtube_shortcode = $this->handler->video_override( '', $attr_youtube );
-		$this->assertStringContains( '<amp-youtube', $youtube_shortcode );
-		$this->assertStringContains( $youtube_id, $youtube_shortcode );
-
-		$vimeo_id        = '64086087';
-		$vimeo_src       = 'https://vimeo.com/' . $vimeo_id;
-		$attr_vimeo      = [
-			'src' => $vimeo_src,
-		];
-		$vimeo_shortcode = $this->handler->video_override( '', $attr_vimeo );
-		$this->assertEquals( '', $vimeo_shortcode );
-
-		$daily_motion_id        = 'x6bacgf';
-		$daily_motion_src       = 'http://www.dailymotion.com/video/' . $daily_motion_id;
-		$attr_daily_motion      = [
-			'src' => $daily_motion_src,
-		];
-		$daily_motion_shortcode = $this->handler->video_override( '', $attr_daily_motion );
-		$this->assertEquals( '', $daily_motion_shortcode );
-		$no_attributes = $this->handler->video_override( '', [] );
-		$this->assertEquals( '', $no_attributes );
-		remove_all_filters( 'wp_video_shortcode_override' );
-	}
-
 	public function get_conversion_data() {
-		$loading_attribute = version_compare( get_bloginfo( 'version' ), '5.5-alpha', '>' ) ? 'loading="lazy" ' : '';
-
 		return [
 			'no_embed'                         => [
 				'<p>Hello world.</p>',
@@ -150,32 +108,32 @@ public function get_conversion_data() {
 
 			'url_simple'                       => [
 				'https://www.youtube.com/watch?v=kfVsfOSbJY0' . PHP_EOL,
-				'<p><amp-youtube data-videoid="kfVsfOSbJY0" layout="responsive" width="500" height="281" title="Rebecca Black - Friday"><a placeholder href="https://www.youtube.com/watch?v=kfVsfOSbJY0"><img ' . $loading_attribute . 'src="https://i.ytimg.com/vi/kfVsfOSbJY0/hqdefault.jpg" layout="fill" object-fit="cover" alt="Rebecca Black - Friday"></img></a></amp-youtube></p>' . PHP_EOL,
-				'<p><amp-youtube data-videoid="kfVsfOSbJY0" layout="responsive" width="500" height="281"><a placeholder href="https://www.youtube.com/watch?v=kfVsfOSbJY0"><img ' . $loading_attribute . 'src="https://i.ytimg.com/vi/kfVsfOSbJY0/hqdefault.jpg" layout="fill" object-fit="cover"></img></a></amp-youtube></p>' . PHP_EOL,
+				'<amp-youtube data-videoid="kfVsfOSbJY0" layout="responsive" width="500" height="281" title="Rebecca Black - Friday"><a placeholder="" href="https://www.youtube.com/watch?v=kfVsfOSbJY0"><img src="https://i.ytimg.com/vi/kfVsfOSbJY0/hqdefault.jpg" layout="fill" object-fit="cover" alt="Rebecca Black - Friday"></a></amp-youtube>' . PHP_EOL,
+				'<amp-youtube data-videoid="kfVsfOSbJY0" layout="responsive" width="500" height="281"><a placeholder="" href="https://www.youtube.com/watch?v=kfVsfOSbJY0"><img src="https://i.ytimg.com/vi/kfVsfOSbJY0/hqdefault.jpg" layout="fill" object-fit="cover"></a></amp-youtube>' . PHP_EOL,
 			],
 
 			'url_short'                        => [
 				'https://youtu.be/kfVsfOSbJY0' . PHP_EOL,
-				'<p><amp-youtube data-videoid="kfVsfOSbJY0" layout="responsive" width="500" height="281" title="Rebecca Black - Friday"><a placeholder href="https://youtu.be/kfVsfOSbJY0"><img ' . $loading_attribute . 'src="https://i.ytimg.com/vi/kfVsfOSbJY0/hqdefault.jpg" layout="fill" object-fit="cover" alt="Rebecca Black - Friday"></img></a></amp-youtube></p>' . PHP_EOL,
-				'<p><amp-youtube data-videoid="kfVsfOSbJY0" layout="responsive" width="500" height="281"><a placeholder href="https://youtu.be/kfVsfOSbJY0"><img ' . $loading_attribute . 'src="https://i.ytimg.com/vi/kfVsfOSbJY0/hqdefault.jpg" layout="fill" object-fit="cover"></img></a></amp-youtube></p>' . PHP_EOL,
+				'<amp-youtube data-videoid="kfVsfOSbJY0" layout="responsive" width="500" height="281" title="Rebecca Black - Friday"><a placeholder="" href="https://www.youtube.com/watch?v=kfVsfOSbJY0"><img src="https://i.ytimg.com/vi/kfVsfOSbJY0/hqdefault.jpg" layout="fill" object-fit="cover" alt="Rebecca Black - Friday"></a></amp-youtube>' . PHP_EOL,
+				'<amp-youtube data-videoid="kfVsfOSbJY0" layout="responsive" width="500" height="281"><a placeholder="" href="https://www.youtube.com/watch?v=kfVsfOSbJY0"><img src="https://i.ytimg.com/vi/kfVsfOSbJY0/hqdefault.jpg" layout="fill" object-fit="cover"></a></amp-youtube>' . PHP_EOL,
 			],
 
 			'url_with_querystring'             => [
 				'http://www.youtube.com/watch?v=kfVsfOSbJY0&hl=en&fs=1&w=425&h=349' . PHP_EOL,
-				'<p><amp-youtube data-videoid="kfVsfOSbJY0" layout="responsive" width="500" height="281" title="Rebecca Black - Friday"><a placeholder href="http://www.youtube.com/watch?v=kfVsfOSbJY0&amp;hl=en&amp;fs=1&amp;w=425&amp;h=349"><img ' . $loading_attribute . 'src="https://i.ytimg.com/vi/kfVsfOSbJY0/hqdefault.jpg" layout="fill" object-fit="cover" alt="Rebecca Black - Friday"></img></a></amp-youtube></p>' . PHP_EOL,
-				'<p><amp-youtube data-videoid="kfVsfOSbJY0" layout="responsive" width="500" height="281"><a placeholder href="http://www.youtube.com/watch?v=kfVsfOSbJY0&amp;hl=en&amp;fs=1&amp;w=425&amp;h=349"><img ' . $loading_attribute . 'src="https://i.ytimg.com/vi/kfVsfOSbJY0/hqdefault.jpg" layout="fill" object-fit="cover"></img></a></amp-youtube></p>' . PHP_EOL,
+				'<amp-youtube data-videoid="kfVsfOSbJY0" layout="responsive" width="500" height="281" title="Rebecca Black - Friday"><a placeholder="" href="https://www.youtube.com/watch?v=kfVsfOSbJY0"><img src="https://i.ytimg.com/vi/kfVsfOSbJY0/hqdefault.jpg" layout="fill" object-fit="cover" alt="Rebecca Black - Friday"></a></amp-youtube>' . PHP_EOL,
+				'<amp-youtube data-videoid="kfVsfOSbJY0" layout="responsive" width="500" height="281"><a placeholder="" href="https://www.youtube.com/watch?v=kfVsfOSbJY0"><img src="https://i.ytimg.com/vi/kfVsfOSbJY0/hqdefault.jpg" layout="fill" object-fit="cover"></a></amp-youtube>' . PHP_EOL,
 			],
 
 			// Several reports of invalid URLs that have multiple `?` in the URL.
 			'url_with_querystring_and_extra_?' => [
 				'http://www.youtube.com/watch?v=kfVsfOSbJY0?hl=en&fs=1&w=425&h=349' . PHP_EOL,
-				'<p>http://www.youtube.com/watch?v=kfVsfOSbJY0?hl=en&#038;fs=1&#038;w=425&#038;h=349</p>' . PHP_EOL,
+				'<p>http://www.youtube.com/watch?v=kfVsfOSbJY0?hl=en&amp;fs=1&amp;w=425&amp;h=349</p>' . PHP_EOL,
 			],
 
 			'embed_url'                        => [
 				'https://www.youtube.com/embed/kfVsfOSbJY0' . PHP_EOL,
-				'<p><amp-youtube data-videoid="kfVsfOSbJY0" layout="responsive" width="500" height="281" title="Rebecca Black - Friday"><a placeholder href="https://youtube.com/watch?v=kfVsfOSbJY0"><img ' . $loading_attribute . 'src="https://i.ytimg.com/vi/kfVsfOSbJY0/hqdefault.jpg" layout="fill" object-fit="cover" alt="Rebecca Black - Friday"></img></a></amp-youtube></p>' . PHP_EOL,
-				'<p><amp-youtube data-videoid="kfVsfOSbJY0" layout="responsive" width="500" height="281"><a placeholder href="https://youtube.com/watch?v=kfVsfOSbJY0"><img src="https://i.ytimg.com/vi/kfVsfOSbJY0/hqdefault.jpg" layout="fill" object-fit="cover"></img></a></amp-youtube></p>' . PHP_EOL,
+				'<amp-youtube data-videoid="kfVsfOSbJY0" layout="responsive" width="500" height="281" title="Rebecca Black - Friday"><a placeholder="" href="https://www.youtube.com/watch?v=kfVsfOSbJY0"><img src="https://i.ytimg.com/vi/kfVsfOSbJY0/hqdefault.jpg" layout="fill" object-fit="cover" alt="Rebecca Black - Friday"></a></amp-youtube>' . PHP_EOL,
+				'<amp-youtube data-videoid="kfVsfOSbJY0" layout="responsive" width="500" height="281"><a placeholder="" href="https://www.youtube.com/watch?v=kfVsfOSbJY0"><img src="https://i.ytimg.com/vi/kfVsfOSbJY0/hqdefault.jpg" layout="fill" object-fit="cover"></a></amp-youtube>' . PHP_EOL,
 			],
 		];
 	}
@@ -184,16 +142,19 @@ public function get_conversion_data() {
 	 * @dataProvider get_conversion_data
 	 */
 	public function test__conversion( $source, $expected, $fallback_for_expected = null ) {
-		$this->handler->register_embed();
 		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$this->handler->sanitize_raw_embeds( $dom );
+
+		$content = AMP_DOM_Utils::get_content_from_dom( $dom );
 
 		if (
 			version_compare( strtok( get_bloginfo( 'version' ), '-' ), '5.1', '<' )
 			&& null !== $fallback_for_expected
 		) {
-			$this->assertEquals( $fallback_for_expected, $filtered_content );
+			$this->assertEquals( $fallback_for_expected, $content );
 		} else {
-			$this->assertEquals( $expected, $filtered_content );
+			$this->assertEquals( $expected, $content );
 		}
 	}
 
@@ -317,10 +278,11 @@ public function get_scripts_data() {
 	 * @dataProvider get_scripts_data
 	 */
 	public function test__get_scripts( $source, $expected ) {
-		$this->handler->register_embed();
-		$source = apply_filters( 'the_content', $source );
+		$filtered_content = apply_filters( 'the_content', $source );
+		$dom              = AMP_DOM_Utils::get_dom_from_content( $filtered_content );
+		$this->handler->sanitize_raw_embeds( $dom );
 
-		$validating_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( AMP_DOM_Utils::get_dom_from_content( $source ) );
+		$validating_sanitizer = new AMP_Tag_And_Attribute_Sanitizer( $dom );
 		$validating_sanitizer->sanitize();
 
 		$scripts = array_merge(