diff --git a/.github/workflows/test-suite.yaml b/.github/workflows/test-suite.yaml
index f9069928b9..63c546d843 100644
--- a/.github/workflows/test-suite.yaml
+++ b/.github/workflows/test-suite.yaml
@@ -9,7 +9,6 @@ on:
 jobs:
   test-suite:
     name: Build Containers and Run Tests
-    if: github.event.issue.pull_request
     runs-on: ubuntu-22.04
     steps:
       - name: Check Comment
diff --git a/cypress/e2e/report_proofofplay.cy.js b/cypress/e2e/report_proofofplay.cy.js
index 28d7afa4e5..3f86590559 100644
--- a/cypress/e2e/report_proofofplay.cy.js
+++ b/cypress/e2e/report_proofofplay.cy.js
@@ -109,14 +109,18 @@ describe('Proof of Play', function() {
     // Wait for
     cy.wait('@reportData');
 
-    // Should have media stats
-    cy.get('#stats tbody tr').should('have.length', 1);
-    cy.get('#stats tbody tr:nth-child(1) td:nth-child(1)').contains('media'); // stat type
-    cy.get('#stats tbody tr:nth-child(1) td:nth-child(3)').contains('POP Display 1'); // display
-    cy.get('#stats tbody tr:nth-child(1) td:nth-child(6)').contains('POP Layout 1'); // layout
-    cy.get('#stats tbody tr:nth-child(1) td:nth-child(8)').contains('child_folder_media'); // media
-    cy.get('#stats tbody tr:nth-child(1) td:nth-child(10)').contains(2); // number of plays
-    cy.get('#stats tbody tr:nth-child(1) td:nth-child(12)').contains(120); // total duration
+    cy.get('#stats').within(() => {
+      // Check if the "No data available in table" message is not present
+      cy.contains('No data available in table').should('not.exist');
+      cy.get('tbody tr').should('have.length', 1);
+      // Should have media stats
+      cy.get('tbody td').eq(0).should('contain', 'media'); // stat type
+      cy.get('tbody td').eq(2).contains('POP Display 1'); // display
+      cy.get('tbody td').eq(5).contains('POP Layout 1'); // layout
+      cy.get('tbody td').eq(7).contains('child_folder_media'); // media
+      cy.get('tbody td').eq(9).contains(2); // number of plays
+      cy.get('tbody td').eq(11).contains(120); // total duration
+    });
 
     cy.get('#type').select('layout');