diff --git a/frontend/app/components/wp-activity/revision/revision-activity-directive.test.ts b/frontend/app/components/wp-activity/revision/revision-activity-directive.test.ts
index 400240720d..76acf4e9a2 100644
--- a/frontend/app/components/wp-activity/revision/revision-activity-directive.test.ts
+++ b/frontend/app/components/wp-activity/revision/revision-activity-directive.test.ts
@@ -123,7 +123,7 @@ describe('revisionActivity Directive', function () {
 
     describe('message', function () {
       it('should render commit message', function () {
-        var message = element.find('span.user-comment > span.message').html();
+        var message = element.find('.user-comment > span.message').html();
 
         expect(message).to.eq(scope.activity.message.html);
       });
diff --git a/frontend/app/components/wp-activity/user/user-activity-directive.test.js b/frontend/app/components/wp-activity/user/user-activity-directive.test.js
index 8250861e9d..0cc7ee9682 100644
--- a/frontend/app/components/wp-activity/user/user-activity-directive.test.js
+++ b/frontend/app/components/wp-activity/user/user-activity-directive.test.js
@@ -138,7 +138,7 @@ describe('userActivity Directive', function() {
 
         describe('comment', function() {
           it('should render activity comment', function() {
-            var comment = element.find('span.user-comment > span.message > span').html();
+            var comment = element.find('.user-comment > span.message > span').html();
 
             expect(comment).to.eq(scope.activity.comment.html);
           });
diff --git a/frontend/app/templates/work_packages/activities/_user.html b/frontend/app/templates/work_packages/activities/_user.html
index 6a0cfd4aaf..b78212be2b 100644
--- a/frontend/app/templates/work_packages/activities/_user.html
+++ b/frontend/app/templates/work_packages/activities/_user.html
@@ -39,7 +39,7 @@
       </accessible-by-keyboard>
     </div>
   </div>
-  <span class="user-comment wiki">
+  <div class="user-comment wiki">
     <div ng-if="inEdit" class="inplace-edit">
       <div class="user-comment--form inplace-edit--write-value">
         <div class="textarea-wrapper" ng-class="{'-preview': isPreview}">
@@ -82,5 +82,5 @@
         <span class="message" ng-bind-html="detail"/>
       </li>
     </ul>
-  </span>
+  </div>
 </div>