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 342eb6ce..80301070 100644
--- a/bubble-server/src/test/resources/models/include/new_bubble.json
+++ b/bubble-server/src/test/resources/models/include/new_bubble.json
@@ -166,7 +166,7 @@
 
   {
     "comment": "call API of deployed node after some grace period, ensure it is running",
-    "before": "await_url .bubble 20m:40m 20s",
+    "before": "await_url .bubble 20m:20m 20s",
     "connection": {
       "name": "<<bubbleConnectionVar>>",
       "baseUri": "https://{{<<networkVar>>.host}}.<<network>>.<<domain>>:{{serverConfig.nginxPort}}/api"
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 034fea16..39fee333 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
@@ -172,12 +172,12 @@
   },
 
   {
-    "before": "await_url .bubble 40m 20s",
+    "comment": "restore node using restoreKey",
+    "before": "await_url .bubble 20m:20m 20s",
     "connection": {
       "name": "restoredBubbleConnection",
       "baseUri": "https://{{restoreNN.fqdn}}:{{serverConfig.nginxPort}}/api"
     },
-    "comment": "restore node using restoreKey",
     "request": {
       "uri": "auth/restore/{{restoreNN.restoreKey}}",
       "entity": {
@@ -185,11 +185,11 @@
         "password": "Passw0rd!!"
       },
       "method": "put"
-    }
+    },
+    "after": "await_url .bubble 4m:10m 20s" // give the restore some time to stop the server, restore and restart
   },
 
   {
-    "before": "await_url .bubble 4m:10m 20s",
     "comment": "login to restored bubble",
     "request": {
       "session": "new",