diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt
index f48eedfb15..8075aaa423 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt
@@ -46,7 +46,7 @@
                     <h1>Authority search results</h1>
 
                     [% IF total %]
-                        <div class="pages">[% pagination_bar | $raw %]</div>
+                        <div class="pages" id="pagination_top"> [% pagination_bar | $raw %] </div>
                     [% END %]
                     <div id="results">
                         [% IF ( total ) %]
@@ -103,7 +103,7 @@
                         </div>
                         <!-- / .searchresults -->
 
-                        <div class="pages">[% pagination_bar | $raw %]</div>
+                        <div class="pages" id="pagination_bottom"> [% pagination_bar | $raw %] </div>
                     [% END # / IF total %]
                 </div>
                 <!-- / #userauthsearchresults -->
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
index af6c9d1cfd..22dcb2a545 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
@@ -830,7 +830,7 @@
                                         </tbody>
                                     </table>
                                     <!-- /.table -->
-                                    <div class="pages">[% pagination_bar | $raw %]</div>
+                                    <div class="pages" id="pagination_bottom"> [% pagination_bar | $raw %] </div>
                                 [% ELSE %]
                                     [% IF public %]
                                         <p>No public lists.</p>
diff --git a/t/db_dependent/selenium/regressions.t b/t/db_dependent/selenium/regressions.t
index 4b47effe86..a55d9b2876 100755
--- a/t/db_dependent/selenium/regressions.t
+++ b/t/db_dependent/selenium/regressions.t
@@ -293,7 +293,8 @@ subtest 'XSS vulnerabilities in pagination' => sub {
     $s->add_error_handler;
     is( $alert_text, undef, 'No alert box displayed, even if evil intent' );
 
-    my $second_page = $driver->find_element('//div[@class="pages"]/span[@class="currentPage"]/following-sibling::a');
+    my $second_page =
+        $driver->find_element('//div[@class="pages"]/ul/li[@class="page-item active"]/following-sibling::li/a');
     like(
         $second_page->get_attribute('href'), qr{(?|&)public=1(&|$)},
         'The second page should display category without the invalid value'