diff --git a/phpunit/blocks/render-query-test.php b/phpunit/blocks/render-query-test.php
index 23094e2d3809cb..2d81bfdb513b33 100644
--- a/phpunit/blocks/render-query-test.php
+++ b/phpunit/blocks/render-query-test.php
@@ -145,8 +145,10 @@ public function test_enhanced_query_markup_rendering_at_bottom_on_custom_html_el
 			<!-- wp:post-template {"align":"wide"} -->
 				<!-- wp:test/plugin-block /-->
 			<!-- /wp:post-template -->
+			<span>Helper to get last HTML Tag</span>
 		</aside>
 		<!-- /wp:query -->
+
 HTML;
 
 		// Set main query to single post.
@@ -160,13 +162,16 @@ public function test_enhanced_query_markup_rendering_at_bottom_on_custom_html_el
 
 		$output = do_blocks( $content );
 
-		$aside_closing_tag    = '</aside>';
-		$pos                  = strrpos( $output, $aside_closing_tag );
-		$last_closing_tag_pos = strrpos( $output, '>', -( strlen( $output ) - $pos ) );
-		$last_opening_tag_pos = strrpos( $output, '<', -( strlen( $output ) - $last_closing_tag_pos ) );
-		$previous_tag         = substr( $output, $last_opening_tag_pos, $last_closing_tag_pos - $last_opening_tag_pos + 1 );
+		$p = new WP_HTML_Tag_Processor( $output );
+
+		$p->next_tag( 'span' );
 
-		$this->assertSame( '</div>', $previous_tag );
+		// Test that there is a div added just after the last tag inside the aside.
+		$this->assertSame( $p->next_tag(), true );
+		// Test that that div is the accesibility one.
+		$this->assertSame( 'screen-reader-text', $p->get_attribute( 'class' ) );
+		$this->assertSame( 'context.core.query.message', $p->get_attribute( 'data-wp-text' ) );
+		$this->assertSame( 'polite', $p->get_attribute( 'aria-live' ) );
 	}
 
 	/**