diff --git a/src/e2e/java/teammates/e2e/pageobjects/FeedbackResultsPage.java b/src/e2e/java/teammates/e2e/pageobjects/FeedbackResultsPage.java
index c059def60b4..6c4cca5d133 100644
--- a/src/e2e/java/teammates/e2e/pageobjects/FeedbackResultsPage.java
+++ b/src/e2e/java/teammates/e2e/pageobjects/FeedbackResultsPage.java
@@ -293,7 +293,8 @@ private boolean isRubricResponseEqual(WebElement responseField, FeedbackResponse
         FeedbackRubricResponseDetails responseDetails = (FeedbackRubricResponseDetails) response.getResponseDetailsCopy();
         List<Integer> answers = responseDetails.getAnswer();
         for (int i = 0; i < answers.size(); i++) {
-            WebElement rubricRow = responseField.findElements(By.cssSelector("#rubric-answers tr")).get(i);
+            WebElement rubricTableBody = responseField.findElement(By.className("rubric-answers"));
+            WebElement rubricRow = rubricTableBody.findElements(By.cssSelector("tr")).get(i);
             WebElement rubricCell = rubricRow.findElements(By.tagName("td")).get(answers.get(i) + 1);
             if (rubricCell.findElements(By.className("fa-check")).size() == 0) {
                 return false;
diff --git a/src/web/app/components/question-types/question-response/rubric-question-response.component.html b/src/web/app/components/question-types/question-response/rubric-question-response.component.html
index 537cc610cb3..5fc1e19d15a 100644
--- a/src/web/app/components/question-types/question-response/rubric-question-response.component.html
+++ b/src/web/app/components/question-types/question-response/rubric-question-response.component.html
@@ -6,7 +6,7 @@
         <th class="text-center" *ngFor="let choice of questionDetails.rubricChoices">{{ choice }}</th>
       </tr>
     </thead>
-    <tbody id="rubric-answers">
+    <tbody class="rubric-answers">
       <tr *ngFor="let answer of answers; let i = index">
         <td>{{ questionDetails.rubricSubQuestions[i] }}</td>
         <td class="text-center" *ngFor="let choice of questionDetails.rubricChoices">