diff --git a/question/behaviour/rendererbase.php b/question/behaviour/rendererbase.php
index 983b7ce53c6..21de819f65c 100644
--- a/question/behaviour/rendererbase.php
+++ b/question/behaviour/rendererbase.php
@@ -234,14 +234,15 @@ abstract class qbehaviour_renderer extends plugin_renderer_base {
             'type' => 'submit',
             'id' => $qa->get_behaviour_field_name('submit'),
             'name' => $qa->get_behaviour_field_name('submit'),
-            'value' => get_string('check', 'question'),
+            'value' => 1,
             'class' => 'submit btn btn-secondary',
             'data-savescrollposition' => 'true',
         );
         if ($options->readonly) {
             $attributes['disabled'] = 'disabled';
         }
-        $output = html_writer::empty_tag('input', $attributes);
+        $output = html_writer::tag('button',
+            $options->add_question_identifier_to_label(get_string('check', 'question'), true), $attributes);
         if (!$options->readonly) {
             $this->page->requires->js_call_amd('core_question/question_engine', 'initSubmitButton', [$attributes['id']]);
         }
diff --git a/question/engine/tests/helpers.php b/question/engine/tests/helpers.php
index 3138de059e2..402e2c10b5b 100644
--- a/question/engine/tests/helpers.php
+++ b/question/engine/tests/helpers.php
@@ -1229,7 +1229,7 @@ abstract class qbehaviour_walkthrough_test_base extends question_testcase {
         } else if ($enabled === false) {
             $expectedattributes['disabled'] = 'disabled';
         }
-        return new question_contains_tag_with_attributes('input', $expectedattributes, $forbiddenattributes);
+        return new question_contains_tag_with_attributes('button', $expectedattributes, $forbiddenattributes);
     }
 
     /**