diff --git a/admin/tool/usertours/templates/tourstep.mustache b/admin/tool/usertours/templates/tourstep.mustache
index 192fec46f54..363b2c9de32 100644
--- a/admin/tool/usertours/templates/tourstep.mustache
+++ b/admin/tool/usertours/templates/tourstep.mustache
@@ -58,9 +58,9 @@
     <div class="modal-body" data-placeholder="body">
     </div>
     <div class="modal-footer">
-      <button type="button" class="btn btn-secondary" data-role="previous">{{# str }} previous, moodle {{/ str }}</button>
-      <button type="button" class="btn btn-primary" data-role="next">{{# str }} next, moodle {{/ str }}</button>
-      <button class="btn btn-secondary" data-role="end"> {{# str }} endtour, tool_usertours {{/ str }} </button>
+      <button type="button" class="btn btn-secondary" data-role="previous" aria-label="{{# str }} previouspage, moodle {{/ str }}">{{# str }} previouspage, moodle {{/ str }}</button>
+      <button type="button" class="btn btn-primary" data-role="next" aria-label="{{# str }} nextpage, moodle {{/ str }}">{{# str }} nextpage, moodle {{/ str }}</button>
+      <button class="btn btn-secondary" data-role="end" aria-label="{{# str }} endtour, tool_usertours {{/ str }}"> {{# str }} endtour, tool_usertours {{/ str }} </button>
     </div>
   </div>
 </div>
diff --git a/enrol/yui/rolemanager/rolemanager.js b/enrol/yui/rolemanager/rolemanager.js
index b832c54cad2..a78e0acaba5 100644
--- a/enrol/yui/rolemanager/rolemanager.js
+++ b/enrol/yui/rolemanager/rolemanager.js
@@ -366,7 +366,8 @@ YUI.add('moodle-enrol-rolemanager', function(Y) {
             var i, m = this.get(MANIPULATOR);
             var element = Y.Node.create('<div class="popover popover-bottom"><div class="arrow"></div>' +
                                         '<div class="header popover-title">' +
-                                        '<div role="button" class="close" aria-label="Close">' +
+                                        '<div role="button" class="close" aria-label="' +
+                                        M.util.get_string('closebuttontitle', 'moodle') + '">' +
                                         '<span aria-hidden="true">&times;</span></div>' +
                                         '<h3>'+M.util.get_string('assignroles', 'role')+'</h3>' +
                                         '</div><div class="content popover-content form-inline form-group"></div></div>');
diff --git a/lib/templates/paging_bar.mustache b/lib/templates/paging_bar.mustache
index be668476991..622285e7c10 100644
--- a/lib/templates/paging_bar.mustache
+++ b/lib/templates/paging_bar.mustache
@@ -54,9 +54,9 @@
         <ul class="mt-1 pagination " data-page-size="{{pagesize}}">
             {{#previous}}
                 <li class="page-item" data-page-number="{{page}}">
-                    <a href="{{url}}" class="page-link" aria-label="Previous">
+                    <a href="{{url}}" class="page-link" aria-label="{{# str }} previouspage, moodle {{/ str }}">
                         <span aria-hidden="true">&laquo;</span>
-                        <span class="sr-only">{{#str}}previous{{/str}}</span>
+                        <span class="sr-only">{{#str}}previouspage, moodle{{/str}}</span>
                     </a>
                 </li>
             {{/previous}}
@@ -88,9 +88,9 @@
             {{/last}}
             {{#next}}
                 <li class="page-item" data-page-number="{{page}}">
-                    <a href="{{url}}" class="page-link" aria-label="Next">
+                    <a href="{{url}}" class="page-link" aria-label="{{# str }} nextpage, moodle {{/ str }}">
                         <span aria-hidden="true">&raquo;</span>
-                        <span class="sr-only">{{#str}}next{{/str}}</span>
+                        <span class="sr-only">{{#str}}nextpage, moodle{{/str}}</span>
                     </a>
                 </li>
             {{/next}}
diff --git a/lib/tests/tablelib_test.php b/lib/tests/tablelib_test.php
index db84a6eb4c6..75c3d8a1858 100644
--- a/lib/tests/tablelib_test.php
+++ b/lib/tests/tablelib_test.php
@@ -142,7 +142,7 @@ class core_tablelib_testcase extends advanced_testcase {
         $headers = $this->generate_headers(2);
 
         // Search for pagination controls containing 'page-link"\saria-label="Next"'.
-        $this->expectOutputRegex('/page-link"\saria-label="Next"/');
+        $this->expectOutputRegex('/page-link"\saria-label="Next page"/');
 
         $this->run_table_test(
             $columns,