diff --git a/webapp/components/_new/features/ReportRow/ReportRow.vue b/webapp/components/_new/features/ReportRow/ReportRow.vue
index 379828121..55b1e0872 100644
--- a/webapp/components/_new/features/ReportRow/ReportRow.vue
+++ b/webapp/components/_new/features/ReportRow/ReportRow.vue
@@ -1,5 +1,12 @@
 <template>
-  <tbody class="report-row">
+  <tbody
+    :class="{
+      'report-row': true,
+      'report-comment': isComment,
+      'report-post': isPost,
+      'report-user': isUser,
+    }"
+  >
     <tr>
       <!-- Icon Column -->
       <td class="ds-table-col">
@@ -17,14 +24,9 @@
       </td>
 
       <!-- Content Column -->
-      <td class="ds-table-col">
+      <td class="ds-table-col report-content">
         <client-only v-if="isUser">
-          <hc-user
-            :user="report.resource"
-            :showAvatar="false"
-            :trunc="30"
-            :data-test="report.resource.slug"
-          />
+          <hc-user :user="report.resource" :showAvatar="false" :trunc="30" />
         </client-only>
         <nuxt-link v-else class="title" :to="linkTarget">
           {{ linkText | truncate(50) }}
@@ -32,20 +34,15 @@
       </td>
 
       <!-- Author Column -->
-      <td class="ds-table-col">
+      <td class="ds-table-col report-author">
         <client-only v-if="!isUser">
-          <hc-user
-            :user="report.resource.author"
-            :showAvatar="false"
-            :trunc="30"
-            :data-test="report.resource.author.slug"
-          />
+          <hc-user :user="report.resource.author" :showAvatar="false" :trunc="30" />
         </client-only>
         <span v-else>—</span>
       </td>
 
       <!-- Status Column -->
-      <td class="ds-table-col">
+      <td class="ds-table-col report-reviewer">
         <span class="status-line">
           <base-icon :name="statusIconName" :class="isDisabled ? 'ban' : 'no-ban'" />
           {{ statusText }}
@@ -63,7 +60,7 @@
 
       <!-- Decision Column -->
       <td class="ds-table-col">
-        <b v-if="report.closed" data-test="closed">
+        <b v-if="report.closed" class="report-closed">
           {{ $t('moderation.reports.decided') }}
         </b>
         <ds-button
diff --git a/webapp/components/_new/features/ReportsTable/ReportsTable.spec.js b/webapp/components/_new/features/ReportsTable/ReportsTable.spec.js
index 93be3ee6d..f5a250033 100644
--- a/webapp/components/_new/features/ReportsTable/ReportsTable.spec.js
+++ b/webapp/components/_new/features/ReportsTable/ReportsTable.spec.js
@@ -60,7 +60,7 @@ describe('ReportsTable', () => {
       describe('Comment', () => {
         let commentRow
         beforeEach(() => {
-          commentRow = wrapper.find('[data-test="Comment"]')
+          commentRow = wrapper.find('.report-comment')
         })
 
         it('renders a comments icon', () => {
@@ -69,32 +69,32 @@ describe('ReportsTable', () => {
         })
 
         it('renders a link to the post, with the comment contentExcerpt', () => {
-          const postLink = commentRow.find('[data-test="post-link"]')
+          const postLink = commentRow.find('.report-content a')
           expect(postLink.text()).toEqual('@peter-lustig Lorem ipsum dolor sit amet, …')
         })
 
         it('renders the author', () => {
-          const username = commentRow.find('[data-test="louie"] b')
+          const username = commentRow.find('.report-author b')
           expect(username.text()).toEqual('Louie')
         })
 
         describe('given it has been reviewed', () => {
           it('renders the enabled icon', () => {
-            const enabledIcon = commentRow
-              .findAll(BaseIcon)
-              .filter(icon => icon.props().name === 'eye')
-            expect(enabledIcon.exists()).toBe(true)
+            expect(
+              commentRow
+                .find('.status-line')
+                .find(BaseIcon)
+                .props().name,
+            ).toEqual('eye')
           })
 
           it('renders its current status', () => {
-            expect(commentRow.find('[data-test="enabled"]').text()).toEqual(
-              'moderation.reports.enabledBy',
-            )
+            expect(commentRow.find('.status-line').text()).toEqual('moderation.reports.enabledBy')
           })
 
           it('renders the moderator who reviewed the resource', () => {
-            const username = commentRow.find('[data-test="moderator"] b')
-            expect(username.text()).toEqual('Moderator')
+            const username = commentRow.find('.report-reviewer')
+            expect(username.text()).toContain('@moderator')
           })
         })
 
@@ -117,7 +117,7 @@ describe('ReportsTable', () => {
       describe('Post', () => {
         let postRow
         beforeEach(() => {
-          postRow = wrapper.find('[data-test="Post"]')
+          postRow = wrapper.find('.report-post')
         })
 
         it('renders a bookmark icon', () => {
@@ -126,27 +126,27 @@ describe('ReportsTable', () => {
         })
 
         it('renders a link to the post', () => {
-          const postLink = postRow.find('[data-test="post-link"]')
+          const postLink = postRow.find('.report-content a')
           expect(postLink.text()).toEqual("I'm a bigoted post!")
         })
 
         it('renders the author', () => {
-          const username = postRow.find('[data-test="dagobert"] b')
-          expect(username.text()).toEqual('Dagobert')
+          const username = postRow.find('.report-author')
+          expect(username.text()).toContain('Dagobert')
         })
 
         describe('given it has not been reviewed', () => {
           it('renders the enabled icon', () => {
-            const enabledIcon = postRow
-              .findAll(BaseIcon)
-              .filter(icon => icon.props().name === 'eye')
-            expect(enabledIcon.exists()).toBe(true)
+            expect(
+              postRow
+                .find('.status-line')
+                .find(BaseIcon)
+                .props().name,
+            ).toEqual('eye')
           })
 
           it('renders its current status', () => {
-            expect(postRow.find('[data-test="unreviewed"]').text()).toEqual(
-              'moderation.reports.enabled',
-            )
+            expect(postRow.find('.status-line').text()).toEqual('moderation.reports.enabled')
           })
         })
 
@@ -170,7 +170,7 @@ describe('ReportsTable', () => {
       describe('User', () => {
         let userRow
         beforeEach(() => {
-          userRow = wrapper.find('[data-test="User"]')
+          userRow = wrapper.find('.report-user')
         })
 
         it('renders a bookmark icon', () => {
@@ -179,35 +179,33 @@ describe('ReportsTable', () => {
         })
 
         it('renders a link to the user profile', () => {
-          const userLink = userRow.find('[data-test="abusive-user"] b')
-          expect(userLink.text()).toEqual('Abusive user')
+          const userLink = userRow.find('.report-content a')
+          expect(userLink.text()).toContain('Abusive user')
         })
 
         describe('given it has been reviewed', () => {
           it('renders the disabled icon', () => {
-            const disabledIcon = userRow
-              .findAll(BaseIcon)
-              .filter(icon => icon.props().name === 'eye-slash')
-            expect(disabledIcon.exists()).toBe(true)
+            expect(
+              userRow
+                .find('.status-line')
+                .find(BaseIcon)
+                .props().name,
+            ).toEqual('eye-slash')
           })
 
           it('renders its current status', () => {
-            expect(userRow.find('[data-test="disabled"]').text()).toEqual(
-              'moderation.reports.disabledBy',
-            )
+            expect(userRow.find('.status-line').text()).toEqual('moderation.reports.disabledBy')
           })
 
           it('renders the moderator who reviewed the resource', () => {
-            const username = userRow.find('[data-test="peter-lustig"] b')
-            expect(username.text()).toEqual('Peter Lustig')
+            const username = userRow.find('.report-reviewer')
+            expect(username.text()).toContain('Peter Lustig')
           })
         })
 
         describe('give report has been closed', () => {
           it('renders Decided text', () => {
-            expect(userRow.find('[data-test="closed"]').text()).toEqual(
-              'moderation.reports.decided',
-            )
+            expect(userRow.find('.report-closed').text()).toEqual('moderation.reports.decided')
           })
         })
       })
diff --git a/webapp/components/_new/features/ReportsTable/ReportsTable.story.js b/webapp/components/_new/features/ReportsTable/ReportsTable.story.js
index 425906564..3c7abec5d 100644
--- a/webapp/components/_new/features/ReportsTable/ReportsTable.story.js
+++ b/webapp/components/_new/features/ReportsTable/ReportsTable.story.js
@@ -88,7 +88,7 @@ export const reports = [
         slug: 'dagobert',
       },
       deleted: false,
-      disabled: true,
+      disabled: false,
       id: 'p2',
       slug: 'bigoted-post',
       title: "I'm a bigoted post!",