diff --git a/src/discussions/comments/CommentsView.test.jsx b/src/discussions/comments/CommentsView.test.jsx
index 70ee2d5c..2411559f 100644
--- a/src/discussions/comments/CommentsView.test.jsx
+++ b/src/discussions/comments/CommentsView.test.jsx
@@ -660,63 +660,69 @@ describe('CommentsView', () => {
         .toThrow();
     });
 
-    // it('handles liking a comment', async () => {
-    //   renderComponent(discussionPostId);
+    it('handles liking a comment', async () => {
+      renderComponent(discussionPostId);
 
-    //   // Wait for the content to load
-    //   await screen.findByText('comment number 7', { exact: false });
-    //   const view = screen.getByTestId('comment-comment-1');
+      // Wait for the content to load
+      await act(async () => {
+        fireEvent.mouseOver(await waitFor(() => screen.findByText('comment number 7', { exact: false })));
+      });
+      const view = screen.getByTestId('comment-comment-1');
 
-    //   const likeButton = within(view).getByRole('button', { name: /like/i });
-    //   await act(async () => {
-    //     fireEvent.click(likeButton);
-    //   });
-    //   expect(axiosMock.history.patch).toHaveLength(2);
-    //   expect(JSON.parse(axiosMock.history.patch[1].data)).toMatchObject({ voted: true });
-    // });
+      const likeButton = within(view).getByRole('button', { name: /like/i });
+      await act(async () => {
+        fireEvent.click(likeButton);
+      });
+      expect(axiosMock.history.patch).toHaveLength(2);
+      expect(JSON.parse(axiosMock.history.patch[1].data)).toMatchObject({ voted: true });
+    });
 
-    // it('handles endorsing comments', async () => {
-    //   renderComponent(discussionPostId);
-    //   // Wait for the content to load
-    //   await screen.findByText('comment number 7', { exact: false });
+    it('handles endorsing comments', async () => {
+      renderComponent(discussionPostId);
+      // Wait for the content to load
+      await act(async () => {
+        fireEvent.mouseOver(await waitFor(() => screen.findByText('comment number 7', { exact: false })));
+      });
 
-    //   // There should be three buttons, one for the post, the second for the
-    //   // comment and the third for a response to that comment
-    //   const actionButtons = screen.queryAllByRole('button', { name: /actions menu/i });
-    //   await act(async () => {
-    //     fireEvent.click(actionButtons[1]);
-    //   });
+      // There should be three buttons, one for the post, the second for the
+      // comment and the third for a response to that comment
+      const actionButtons = screen.queryAllByRole('button', { name: /actions menu/i });
+      await act(async () => {
+        fireEvent.click(actionButtons[1]);
+      });
 
-    //   await act(async () => {
-    //     fireEvent.click(screen.getByRole('button', { name: /Endorse/i }));
-    //   });
-    //   expect(axiosMock.history.patch).toHaveLength(2);
-    //   expect(JSON.parse(axiosMock.history.patch[1].data)).toMatchObject({ endorsed: true });
-    // });
+      await act(async () => {
+        fireEvent.click(screen.getByRole('button', { name: /Endorse/i }));
+      });
+      expect(axiosMock.history.patch).toHaveLength(2);
+      expect(JSON.parse(axiosMock.history.patch[1].data)).toMatchObject({ endorsed: true });
+    });
 
-    // it('handles reporting comments', async () => {
-    //   renderComponent(discussionPostId);
-    //   // Wait for the content to load
-    //   await screen.findByText('comment number 7', { exact: false });
+    it('handles reporting comments', async () => {
+      renderComponent(discussionPostId);
+      // Wait for the content to load
+      await act(async () => {
+        fireEvent.mouseOver(await waitFor(() => screen.findByText('comment number 7', { exact: false })));
+      });
 
-    //   // There should be three buttons, one for the post, the second for the
-    //   // comment and the third for a response to that comment
-    //   const actionButtons = screen.queryAllByRole('button', { name: /actions menu/i });
-    //   await act(async () => {
-    //     fireEvent.click(actionButtons[1]);
-    //   });
+      // There should be three buttons, one for the post, the second for the
+      // comment and the third for a response to that comment
+      const actionButtons = screen.queryAllByRole('button', { name: /actions menu/i });
+      await act(async () => {
+        fireEvent.click(actionButtons[1]);
+      });
 
-    //   await act(async () => {
-    //     fireEvent.click(screen.getByRole('button', { name: /Report/i }));
-    //   });
-    //   expect(screen.queryByRole('dialog', { name: /Report \w+/i, exact: false })).toBeInTheDocument();
-    //   await act(async () => {
-    //     fireEvent.click(screen.queryByRole('button', { name: /Confirm/i }));
-    //   });
-    //   expect(screen.queryByRole('dialog', { name: /Report \w+/i, exact: false })).not.toBeInTheDocument();
-    //   expect(axiosMock.history.patch).toHaveLength(2);
-    //   expect(JSON.parse(axiosMock.history.patch[1].data)).toMatchObject({ abuse_flagged: true });
-    // });
+      await act(async () => {
+        fireEvent.click(screen.getByRole('button', { name: /Report/i }));
+      });
+      expect(screen.queryByRole('dialog', { name: /Report \w+/i, exact: false })).toBeInTheDocument();
+      await act(async () => {
+        fireEvent.click(screen.queryByRole('button', { name: /Confirm/i }));
+      });
+      expect(screen.queryByRole('dialog', { name: /Report \w+/i, exact: false })).not.toBeInTheDocument();
+      expect(axiosMock.history.patch).toHaveLength(2);
+      expect(JSON.parse(axiosMock.history.patch[1].data)).toMatchObject({ abuse_flagged: true });
+    });
   });
 
   describe.each([
diff --git a/src/discussions/comments/comment-icons/CommentIcons.jsx b/src/discussions/comments/comment-icons/CommentIcons.jsx
index 26230fc1..db4352dd 100644
--- a/src/discussions/comments/comment-icons/CommentIcons.jsx
+++ b/src/discussions/comments/comment-icons/CommentIcons.jsx
@@ -27,9 +27,6 @@ function CommentIcons({
         onClick={handleLike}
         voted={comment.voted}
       />
-      <div className="d-flex flex-fill text-gray-500 justify-content-end" title={comment.createdAt}>
-        {timeago.format(comment.createdAt, 'time-locale')}
-      </div>
     </div>
   );
 }
diff --git a/src/discussions/comments/comment/CommentHeader.jsx b/src/discussions/comments/comment/CommentHeader.jsx
index 316eae80..cdfcb9b4 100644
--- a/src/discussions/comments/comment/CommentHeader.jsx
+++ b/src/discussions/comments/comment/CommentHeader.jsx
@@ -39,6 +39,7 @@ function CommentHeader({
           authorLabel={comment.authorLabel}
           labelColor={colorClass && `text-${colorClass}`}
           linkToProfile
+          postCreatedAt={comment.createdAt}
         />
       </div>
     </div>