diff --git a/src/wp-includes/html-api/class-wp-html-processor.php b/src/wp-includes/html-api/class-wp-html-processor.php
index 51b6a5679eb76..000715f9133a6 100644
--- a/src/wp-includes/html-api/class-wp-html-processor.php
+++ b/src/wp-includes/html-api/class-wp-html-processor.php
@@ -361,7 +361,7 @@ public function get_last_error() {
 	public function next_tag( $query = null ) {
 		if ( null === $query ) {
 			while ( $this->step() ) {
-				if ( ! $this->is_tag_closer() ) {
+				if ( $this->get_token_type() === '#tag' ) {
 					return true;
 				}
 			}
@@ -384,6 +384,9 @@ public function next_tag( $query = null ) {
 
 		if ( ! ( array_key_exists( 'breadcrumbs', $query ) && is_array( $query['breadcrumbs'] ) ) ) {
 			while ( $this->step() ) {
+				if ( $this->get_token_type() !== '#tag' ) {
+					continue;
+				}
 				if ( ! $this->is_tag_closer() ) {
 					return true;
 				}
@@ -405,6 +408,9 @@ public function next_tag( $query = null ) {
 		$match_offset = isset( $query['match_offset'] ) ? (int) $query['match_offset'] : 1;
 
 		while ( $match_offset > 0 && $this->step() ) {
+			if ( $this->get_token_type() !== '#tag' ) {
+				continue;
+			}
 			if ( $this->matches_breadcrumbs( $breadcrumbs ) && 0 === --$match_offset ) {
 				return true;
 			}
@@ -428,13 +434,7 @@ public function next_tag( $query = null ) {
 	 * @return bool
 	 */
 	public function next_token() {
-		$found_a_token = parent::next_token();
-
-		if ( '#tag' === $this->get_token_type() ) {
-			$this->step( self::PROCESS_CURRENT_NODE );
-		}
-
-		return $found_a_token;
+		return $this->step();
 	}
 
 	/**
@@ -535,13 +535,14 @@ public function step( $node_to_process = self::PROCESS_NEXT_NODE ) {
 		}
 
 		if ( self::PROCESS_NEXT_NODE === $node_to_process ) {
-			while ( parent::next_token() && '#tag' !== $this->get_token_type() ) {
-				continue;
-			}
+			parent::next_token();
 		}
 
 		// Finish stepping when there are no more tokens in the document.
-		if ( null === $this->get_tag() ) {
+		if (
+			$this->parser_state === self::STATE_COMPLETE ||
+			$this->parser_state === self::STATE_INCOMPLETE_INPUT
+		) {
 			return false;
 		}
 
@@ -619,6 +620,19 @@ public function get_breadcrumbs() {
 	 * @return bool Whether an element was found.
 	 */
 	private function step_in_body() {
+		switch ( $this->get_token_type() ) {
+			case '#text':
+				$this->reconstruct_active_formatting_elements();
+				return true;
+
+			case '#cdata-section':
+			case '#comment':
+			case '#doctype':
+			case '#presumptuous-tag':
+			case '#funky-comment':
+				return true;
+		}
+
 		$tag_name = $this->get_tag();
 		$op_sigil = $this->is_tag_closer() ? '-' : '+';
 		$op       = "{$op_sigil}{$tag_name}";
@@ -1251,6 +1265,9 @@ public function seek( $bookmark_name ) {
 			case 'forward':
 				// When moving forwards, reparse the document until reaching the same location as the original bookmark.
 				while ( $this->step() ) {
+					if ( $this->get_token_type() !== '#tag' ) {
+						continue;
+					}
 					if ( $bookmark_starts_at === $this->bookmarks[ $this->state->current_token->bookmark_name ]->start ) {
 						return true;
 					}
diff --git a/tests/phpunit/tests/html-api/wpHtmlProcessor.php b/tests/phpunit/tests/html-api/wpHtmlProcessor.php
index 26dc7b0bdb826..507fda08d946e 100644
--- a/tests/phpunit/tests/html-api/wpHtmlProcessor.php
+++ b/tests/phpunit/tests/html-api/wpHtmlProcessor.php
@@ -53,9 +53,15 @@ public function test_warns_that_the_static_creator_methods_should_be_called_inst
 	 */
 	public function test_get_tag_is_null_once_document_is_finished() {
 		$processor = WP_HTML_Processor::create_fragment( '<div class="test">Test</div>' );
-		$processor->next_tag();
+		// Opener
+		$this->assertTrue( $processor->next_tag() );
 		$this->assertSame( 'DIV', $processor->get_tag() );
 
+		// Closer
+		$this->assertTrue( $processor->next_tag() );
+		$this->assertSame( 'DIV', $processor->get_tag() );
+
+		// End of document
 		$this->assertFalse( $processor->next_tag() );
 		$this->assertNull( $processor->get_tag() );
 	}
diff --git a/tests/phpunit/tests/html-api/wpHtmlProcessorSemanticRules.php b/tests/phpunit/tests/html-api/wpHtmlProcessorSemanticRules.php
index 7362a588cf3f4..1e478f2111341 100644
--- a/tests/phpunit/tests/html-api/wpHtmlProcessorSemanticRules.php
+++ b/tests/phpunit/tests/html-api/wpHtmlProcessorSemanticRules.php
@@ -124,7 +124,7 @@ public static function data_article_container_group() {
 	public function test_in_body_skips_unexpected_button_closer() {
 		$processor = WP_HTML_Processor::create_fragment( '<div>Test</button></div>' );
 
-		$processor->step();
+		$processor->next_tag();
 		$this->assertSame( 'DIV', $processor->get_tag(), 'Did not stop at initial DIV tag.' );
 		$this->assertFalse( $processor->is_tag_closer(), 'Did not find that initial DIV tag is an opener.' );
 
@@ -132,7 +132,7 @@ public function test_in_body_skips_unexpected_button_closer() {
 		 * When encountering the BUTTON closing tag, there is no BUTTON in the stack of open elements.
 		 * It should be ignored as there's no BUTTON to close.
 		 */
-		$this->assertTrue( $processor->step(), 'Found no further tags when it should have found the closing DIV' );
+		$this->assertTrue( $processor->next_tag(), 'Found no further tags when it should have found the closing DIV' );
 		$this->assertSame( 'DIV', $processor->get_tag(), "Did not skip unexpected BUTTON; stopped at {$processor->get_tag()}." );
 		$this->assertTrue( $processor->is_tag_closer(), 'Did not find that the terminal DIV tag is a closer.' );
 	}