diff --git a/plone/app/discussion/browser/comments.pt b/plone/app/discussion/browser/comments.pt
index 1e7a8eb..9293cf6 100644
--- a/plone/app/discussion/browser/comments.pt
+++ b/plone/app/discussion/browser/comments.pt
@@ -57,13 +57,9 @@
                   <!-- commenter name and date -->
                   <div class="comment-author">
 
-                    <a href="" tal:condition="has_author_link" tal:attributes="href author_home_url">
-                      ${reply/author_name}
-                    </a>
+                    <a href="" tal:condition="has_author_link" tal:attributes="href author_home_url">${reply/author_name}</a>
 
-                    <span tal:condition="not: has_author_link">
-                      ${reply/author_name}
-                    </span>
+                    <span tal:condition="not: has_author_link">${reply/author_name}</span>
 
                     <span tal:condition="not: reply/author_name" i18n:translate="label_anonymous">Anonymous</span>
 
diff --git a/plone/app/discussion/tests/functional_test_comments.txt b/plone/app/discussion/tests/functional_test_comments.txt
index ac488c1..939d14d 100644
--- a/plone/app/discussion/tests/functional_test_comments.txt
+++ b/plone/app/discussion/tests/functional_test_comments.txt
@@ -111,9 +111,6 @@ Check if comment has been added properly.
     >>> '<a href="http://nohost/plone/author/admin">admin</a>' in browser.contents
     True
 
-    >>> browser.contents
-    '...<a href="http://nohost/plone/author/admin">admin</a>...says:...'
-
     >>> "Comment from admin" in browser.contents
     True
 
@@ -158,7 +155,7 @@ Post a comment as user jim.
 Check if the comment has been added properly.
 
     >>> browser_member.contents
-    '...<a href="http://nohost/plone/author/jim">Jim Fult\xc3\xb8rn</a>...says:...'
+    '...<a href="http://nohost/plone/author/jim">Jim Fult\xc3\xb8rn</a>...'
 
     >>> "Comment from Jim" in browser_member.contents
     True
@@ -195,9 +192,6 @@ Now we can post an anonymous comment.
     >>> '<span>Anonymous</span>' in unprivileged_browser.contents
     True
 
-    >>> 'says' in unprivileged_browser.contents
-    True
-
     >>> 'This is an anonymous comment' in unprivileged_browser.contents
     True
 
@@ -212,9 +206,6 @@ Make sure special characters work as well.
     >>> tarek_fullname in unprivileged_browser.contents
     True
 
-    >>> 'says' in unprivileged_browser.contents
-    True
-
     >>> 'This is an äüö comment' in unprivileged_browser.contents
     True
 
@@ -245,7 +236,7 @@ Check that the reply has been posted properly.
     >>> 'Reply comment' in browser.contents
     True
 
-    >>> 'replyTreeLevel1' in browser.contents
+    >>> 'level-1' in browser.contents
     True