diff --git a/lib/templates/welcome.mustache b/lib/templates/welcome.mustache
index 60b02db4786..7f9bfa8553d 100644
--- a/lib/templates/welcome.mustache
+++ b/lib/templates/welcome.mustache
@@ -25,7 +25,7 @@
}
}}
{{#welcomemessage}}
-
+
{{.}}
-
+
{{/welcomemessage}}
diff --git a/my/tests/behat/welcome.feature b/my/tests/behat/welcome.feature
index 2c4a1bf8dd6..7fead25598d 100644
--- a/my/tests/behat/welcome.feature
+++ b/my/tests/behat/welcome.feature
@@ -30,3 +30,20 @@ Feature: Welcome message
And I should see "You are not logged in" in the "page-footer" "region"
And I log in as "admin"
Then I should see "Hi, Admin!" in the "page-header" "region"
+
+ @accessibility @javascript
+ Scenario Outline: The start page must meet accessibility standards when the welcome message is displayed
+ Given the following config values are set as admin:
+ | defaulthomepage | |
+ When I log in as "admin"
+ Then I should see "Welcome, Admin!" in the "page-header" "region"
+ And the page should meet accessibility standards
+
+ Examples:
+ | defaulthomepage |
+ # Home.
+ | 0 |
+ # Dashboard.
+ | 1 |
+ # My courses.
+ | 2 |