diff --git a/bubble-server/src/test/resources/models/include/new_bubble.json b/bubble-server/src/test/resources/models/include/new_bubble.json
index 265ea289..342eb6ce 100644
--- a/bubble-server/src/test/resources/models/include/new_bubble.json
+++ b/bubble-server/src/test/resources/models/include/new_bubble.json
@@ -183,11 +183,18 @@
   },
 
   {
-    "comment": "login to deployed node",
+    "comment": "check unauthorized access to debug mailbox required for this test (BUBBLE_TEST_MODE has to be true)",
     "connection": { "name": "<<bubbleConnectionVar>>" },
+    "request": { "uri": "debug/inbox/email/<<email>>?type=request&action=verify&target=network" },
+    "response": { "status": 200 }, // confirming status is not 401 here
+    "after": "await_url debug/inbox/email/<<email>>?type=request&action=verify&target=network 10m 10s len(await_json) > 0"
+  },
+
+  {
+    "comment": "activate and login to deployed node",
     "request": {
       "session": "new",
-      "uri" : "auth/login",
+      "uri" : "auth/login?k={{await_json.[0].ctx.message.data}}",
       "entity": {
         "name": "<<username>>",
         "password": "<<password>>"
diff --git a/bubble-server/src/test/resources/models/tests/live/backup_and_restore.json b/bubble-server/src/test/resources/models/tests/live/backup_and_restore.json
index 92cef50a..0712e849 100644
--- a/bubble-server/src/test/resources/models/tests/live/backup_and_restore.json
+++ b/bubble-server/src/test/resources/models/tests/live/backup_and_restore.json
@@ -54,8 +54,7 @@
   },
 
   {
-    "comment": "add file to storage",
-    "before": "await_url .bubble 40m 20s",
+    "comment": "add test file to storage",
     "connection": { "name":  "bubbleConnection" },
     "request": {
       "session": "bubbleUserSession",