diff --git a/e2e-tests/cypress/run_test_cycle.js b/e2e-tests/cypress/run_test_cycle.js
index c90c9883a0..9ed15218a3 100644
--- a/e2e-tests/cypress/run_test_cycle.js
+++ b/e2e-tests/cypress/run_test_cycle.js
@@ -127,7 +127,7 @@ async function saveResult(specExecution, result, testIndex) {
     const testCases = [];
     for (let i = 0; i < tests.length; i++) {
         const test = tests[i];
-        const attempts = test.attempts[0];
+        const attempts = test.attempts.pop();
 
         const testCase = {
             title: test.title,
@@ -151,7 +151,7 @@ async function saveResult(specExecution, result, testIndex) {
         }
 
         if (attempts.screenshots && attempts.screenshots.length > 0) {
-            const path = test.attempts[0].screenshots[0].path;
+            const path = attempts.screenshots[0].path;
             const screenshotUrl = await uploadScreenshot(path, REPO, BRANCH, BUILD_ID);
             if (typeof screenshotUrl === 'string' && !screenshotUrl.error) {
                 testCase.screenshot = {url: screenshotUrl};
diff --git a/e2e-tests/cypress/tests/integration/channels/messaging/message_reply_spec.js b/e2e-tests/cypress/tests/integration/channels/messaging/message_reply_spec.js
index 919b0e4e0c..86cf307a7a 100644
--- a/e2e-tests/cypress/tests/integration/channels/messaging/message_reply_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/messaging/message_reply_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @messaging
 
 import {getAdminAccount} from '../../../support/env';
diff --git a/e2e-tests/cypress/tests/integration/channels/signin_authentication/mfa_authentication_spec.js b/e2e-tests/cypress/tests/integration/channels/signin_authentication/mfa_authentication_spec.js
index 3bc8fc5924..3c2ece046f 100644
--- a/e2e-tests/cypress/tests/integration/channels/signin_authentication/mfa_authentication_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/signin_authentication/mfa_authentication_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @signin_authentication @mfa
 
 import authenticator from 'authenticator';
diff --git a/e2e-tests/cypress/tests/integration/channels/system_console/authentication/password_settings_spec.js b/e2e-tests/cypress/tests/integration/channels/system_console/authentication/password_settings_spec.js
index 0a85f51a26..1bb0e99d81 100644
--- a/e2e-tests/cypress/tests/integration/channels/system_console/authentication/password_settings_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/system_console/authentication/password_settings_spec.js
@@ -7,7 +7,6 @@
 // - Use element ID when selecting an element. Create one if none.
 // ***************************************************************
 
-// Stage: @prod
 // Group: @channels @not_cloud @system_console @restrict_system_admin
 
 describe('Password settings', () => {