diff --git a/tests/phpunit/tests/comment/commentForm.php b/tests/phpunit/tests/comment/commentForm.php
index eef2e9ac7c008..10b44eaedc94c 100644
--- a/tests/phpunit/tests/comment/commentForm.php
+++ b/tests/phpunit/tests/comment/commentForm.php
@@ -23,9 +23,9 @@ public function test_default_markup_for_submit_button_and_wrapper() {
 
 		$form = get_echo( 'comment_form', array( $args, $p ) );
 
-		$button = '<input name="foo-name" type="submit" id="foo-id" class="foo-class" value="foo-label" />';
+		$button = '<input name="foo-name" type="submit" id="foo-id" class="foo-class wp-block-button__link" value="foo-label" />';
 		$hidden = get_comment_id_fields( $p );
-		$this->assertMatchesRegularExpression( '|<p class="form\-submit">\s*' . $button . '\s*' . $hidden . '\s*|', $form );
+		$this->assertMatchesRegularExpression( '|<p class="form\-submit wp\-block\-button">\s*' . $button . '\s*' . $hidden . '\s*|', $form );
 	}
 
 	public function test_custom_submit_button() {
@@ -58,7 +58,7 @@ public function test_custom_submit_field() {
 
 		$form = get_echo( 'comment_form', array( $args, $p ) );
 
-		$button = '<input name="foo-name" type="submit" id="foo-id" class="foo-class" value="foo-label" />';
+		$button = '<input name="foo-name" type="submit" id="foo-id" class="foo-class wp-block-button__link" value="foo-label" />';
 		$hidden = get_comment_id_fields( $p );
 		$this->assertMatchesRegularExpression( '|<p class="my\-custom\-submit\-field">\s*' . $button . '\s*' . $hidden . '\s*|', $form );
 	}