diff --git a/test/source/tests/gmail.ts b/test/source/tests/gmail.ts
index 225598e1335..b553f406d9f 100644
--- a/test/source/tests/gmail.ts
+++ b/test/source/tests/gmail.ts
@@ -53,22 +53,36 @@ export const defineGmailTests = (testVariant: TestVariant, testWithBrowser: Test
       }
       await Util.sleep(5); // the draft isn't being saved if start typing without this delay
       await composeBox.type('@input-body', content, true);
-      if (params.offline) {
-        await ComposePageRecipe.waitWhenDraftIsSavedLocally(composeBox);
-      } else {
-        await ComposePageRecipe.waitWhenDraftIsSaved(composeBox);
+      try {
+        if (params.offline) {
+          await ComposePageRecipe.waitWhenDraftIsSavedLocally(composeBox);
+        } else {
+          await ComposePageRecipe.waitWhenDraftIsSaved(composeBox);
+        }
+      } catch (e) {
+        console.log('waitWhenDraftIsSaved');
+        console.log(await gmailPage.screenshot());
+        throw e;
       }
       await composeBox.close();
     };
 
     const pageHasSecureDraft = async (gmailPage: ControllablePage, expectedContent?: string) => {
-      const secureDraftFrame = await gmailPage.getFrame(['/chrome/elements/compose.htm', '&draftId=']);
-      if (expectedContent) {
-        await secureDraftFrame.waitForContent('@input-body', expectedContent);
-      } else {
-        await secureDraftFrame.waitAll('@input-body');
+      try {
+        const secureDraftFrame = await gmailPage.getFrame(['/chrome/elements/compose.htm', '&draftId=']);
+        if (expectedContent) {
+          await secureDraftFrame.waitForContent('@input-body', expectedContent);
+        } else {
+          await secureDraftFrame.waitAll('@input-body');
+        }
+        return secureDraftFrame;
+      } catch (e) {
+        console.log('pageHasSecureDraft');
+        const urls = await gmailPage.getFramesUrls(['/chrome/elements/compose.htm']);
+        console.log(urls);
+        console.log(await gmailPage.screenshot());
+        throw e;
       }
-      return secureDraftFrame;
     };
 
     const pageDoesNotHaveSecureReplyContainer = async (gmailPage: ControllablePage) => {