diff --git a/mod/forum/templates/discussion_list.mustache b/mod/forum/templates/discussion_list.mustache
index d6b046cda25..e85131b0f2e 100644
--- a/mod/forum/templates/discussion_list.mustache
+++ b/mod/forum/templates/discussion_list.mustache
@@ -81,14 +81,15 @@
                 {{$discussion_list_body}}
                 <tbody>
                     {{#summaries}}
-                        <tr>
+                        <!-- The discussion class is only required for behat tests to identify the row -->
+                        <tr class="discussion">
                             <td scope="col" class="pinned p-0 text-center align-middle">
                                 {{#discussion.pinned}}
                                     {{#pix}}i/pinned, mod_forum, {{#str}}discussionpinned, mod_forum{{/str}}{{/pix}}
                                 {{/discussion.pinned}}
                             </td>
                             <td scope="col" class="topic p-0">
-                                <a class="p-3 p-l-0 w-100 h-100 d-block" href="{{discussion.urls.view}}">{{discussion.name}}</a>
+                                <a class="p-3 p-l-0 w-100 h-100 d-block" href="{{discussion.urls.view}}">{{{discussion.name}}}</a>
                             </td>
                             <td scope="col" class="author">
                                 {{#firstpostauthor}}
diff --git a/mod/forum/templates/forum_discussion_threaded_posts.mustache b/mod/forum/templates/forum_discussion_threaded_posts.mustache
index 6a12754b31f..e5e54c72a10 100644
--- a/mod/forum/templates/forum_discussion_threaded_posts.mustache
+++ b/mod/forum/templates/forum_discussion_threaded_posts.mustache
@@ -33,7 +33,8 @@
 {{#posts}}
     {{< mod_forum/forum_discussion_post }}
         {{$replies}}
-            <div class="indent">
+            <!-- The forumthread class is only added for behat -->
+            <div class="indent forumthread">
                 {{#replies}}
                     {{> mod_forum/forum_discussion_threaded_post }}
                 {{/replies}}