diff --git a/internal/brokers/testdata/TestGetAuthenticationModes/golden/does_not_error_out_when_no_authentication_modes_are_returned b/internal/brokers/testdata/TestGetAuthenticationModes/golden/does_not_error_out_when_no_authentication_modes_are_returned
index fe51488c7..b753d7566 100644
--- a/internal/brokers/testdata/TestGetAuthenticationModes/golden/does_not_error_out_when_no_authentication_modes_are_returned
+++ b/internal/brokers/testdata/TestGetAuthenticationModes/golden/does_not_error_out_when_no_authentication_modes_are_returned
@@ -1 +1,6 @@
+MODES:
 []
+
+VALIDATORS:
+	required-value:
+		value: { required: true, supportedValues: [value_type other_value_type] }
diff --git a/internal/brokers/testdata/TestGetAuthenticationModes/golden/get_authentication_modes_and_generate_validator_ignoring_whitespaces b/internal/brokers/testdata/TestGetAuthenticationModes/golden/get_authentication_modes_and_generate_validator_ignoring_whitespaces
new file mode 100644
index 000000000..14696ad9e
--- /dev/null
+++ b/internal/brokers/testdata/TestGetAuthenticationModes/golden/get_authentication_modes_and_generate_validator_ignoring_whitespaces
@@ -0,0 +1,6 @@
+MODES:
+[{"id":"mode1","label":"Mode 1"}]
+
+VALIDATORS:
+	layout-with-spaces:
+		value: { required: true, supportedValues: [value_type other_value_type] }
diff --git a/internal/brokers/testdata/TestGetAuthenticationModes/golden/get_authentication_modes_and_generate_validators b/internal/brokers/testdata/TestGetAuthenticationModes/golden/get_authentication_modes_and_generate_validators
new file mode 100644
index 000000000..485742860
--- /dev/null
+++ b/internal/brokers/testdata/TestGetAuthenticationModes/golden/get_authentication_modes_and_generate_validators
@@ -0,0 +1,8 @@
+MODES:
+[{"id":"mode1","label":"Mode 1"}]
+
+VALIDATORS:
+	optional-value:
+		value: { required: false, supportedValues: [value_type other_value_type] }
+	required-value:
+		value: { required: true, supportedValues: [value_type other_value_type] }
diff --git a/internal/brokers/testdata/TestGetAuthenticationModes/golden/get_authentication_modes_and_ignores_invalid_ui_layout b/internal/brokers/testdata/TestGetAuthenticationModes/golden/get_authentication_modes_and_ignores_invalid_ui_layout
new file mode 100644
index 000000000..e5b84eb58
--- /dev/null
+++ b/internal/brokers/testdata/TestGetAuthenticationModes/golden/get_authentication_modes_and_ignores_invalid_ui_layout
@@ -0,0 +1,6 @@
+MODES:
+[{"id":"mode1","label":"Mode 1"}]
+
+VALIDATORS:
+	required-value:
+		value: { required: true, supportedValues: [value_type other_value_type] }
diff --git a/internal/brokers/testdata/TestGetAuthenticationModes/golden/get_multiple_authentication_modes_and_generate_validators b/internal/brokers/testdata/TestGetAuthenticationModes/golden/get_multiple_authentication_modes_and_generate_validators
new file mode 100644
index 000000000..4fa4e2190
--- /dev/null
+++ b/internal/brokers/testdata/TestGetAuthenticationModes/golden/get_multiple_authentication_modes_and_generate_validators
@@ -0,0 +1,8 @@
+MODES:
+[{"id":"mode1","label":"Mode 1"},{"id":"mode2","label":"Mode 2"}]
+
+VALIDATORS:
+	optional-value:
+		value: { required: false, supportedValues: [value_type other_value_type] }
+	required-value:
+		value: { required: true, supportedValues: [value_type other_value_type] }
diff --git a/internal/brokers/testdata/TestGetAuthenticationModes/golden/successfully_get_authentication_modes b/internal/brokers/testdata/TestGetAuthenticationModes/golden/successfully_get_authentication_modes
deleted file mode 100644
index 3264a7bdf..000000000
--- a/internal/brokers/testdata/TestGetAuthenticationModes/golden/successfully_get_authentication_modes
+++ /dev/null
@@ -1,2 +0,0 @@
-- id: mode1
-  label: Mode 1
diff --git a/internal/brokers/testdata/TestSelectAuthenticationMode/golden/successfully_select_form_authentication_mode b/internal/brokers/testdata/TestSelectAuthenticationMode/golden/successfully_select_form_authentication_mode
deleted file mode 100644
index e625073b2..000000000
--- a/internal/brokers/testdata/TestSelectAuthenticationMode/golden/successfully_select_form_authentication_mode
+++ /dev/null
@@ -1,5 +0,0 @@
-button: ""
-entry: chars_password
-label: Success form
-type: form
-wait: ""
diff --git a/internal/brokers/testdata/TestSelectAuthenticationMode/golden/successfully_select_mode_with_missing_optional_value b/internal/brokers/testdata/TestSelectAuthenticationMode/golden/successfully_select_mode_with_missing_optional_value
new file mode 100644
index 000000000..c25370053
--- /dev/null
+++ b/internal/brokers/testdata/TestSelectAuthenticationMode/golden/successfully_select_mode_with_missing_optional_value
@@ -0,0 +1 @@
+type: optional-value
diff --git a/internal/brokers/testdata/TestSelectAuthenticationMode/golden/successfully_select_mode_with_optional_value b/internal/brokers/testdata/TestSelectAuthenticationMode/golden/successfully_select_mode_with_optional_value
new file mode 100644
index 000000000..ee9a45691
--- /dev/null
+++ b/internal/brokers/testdata/TestSelectAuthenticationMode/golden/successfully_select_mode_with_optional_value
@@ -0,0 +1,2 @@
+type: optional-value
+value: value_type
diff --git a/internal/brokers/testdata/TestSelectAuthenticationMode/golden/successfully_select_mode_with_required_value b/internal/brokers/testdata/TestSelectAuthenticationMode/golden/successfully_select_mode_with_required_value
new file mode 100644
index 000000000..5ba0b707a
--- /dev/null
+++ b/internal/brokers/testdata/TestSelectAuthenticationMode/golden/successfully_select_mode_with_required_value
@@ -0,0 +1,2 @@
+type: required-value
+value: value_type
diff --git a/internal/brokers/testdata/TestSelectAuthenticationMode/golden/successfully_select_newpassword_authentication_mode b/internal/brokers/testdata/TestSelectAuthenticationMode/golden/successfully_select_newpassword_authentication_mode
deleted file mode 100644
index 85e46b44d..000000000
--- a/internal/brokers/testdata/TestSelectAuthenticationMode/golden/successfully_select_newpassword_authentication_mode
+++ /dev/null
@@ -1,4 +0,0 @@
-button: ""
-entry: chars_password
-label: Success newpassword
-type: newpassword
diff --git a/internal/brokers/testdata/TestSelectAuthenticationMode/golden/successfully_select_qrcode_authentication_mode b/internal/brokers/testdata/TestSelectAuthenticationMode/golden/successfully_select_qrcode_authentication_mode
deleted file mode 100644
index d5958f765..000000000
--- a/internal/brokers/testdata/TestSelectAuthenticationMode/golden/successfully_select_qrcode_authentication_mode
+++ /dev/null
@@ -1,6 +0,0 @@
-button: ""
-content: Success QRCode
-entry: ""
-label: ""
-type: qrcode
-wait: "true"