diff --git a/.github/workflows/end_to_end_tests.yml b/.github/workflows/end_to_end_tests.yml
index 3acc6434..d6370f10 100644
--- a/.github/workflows/end_to_end_tests.yml
+++ b/.github/workflows/end_to_end_tests.yml
@@ -39,7 +39,7 @@ jobs:
         run: LIVE_RELOAD=0 docker-compose up -d
 
       - name: "Wait for environment to build (and downloading testcafe image)"
-        run: (docker-compose -f docker-compose.testcafe.yml pull &) && docker-compose logs -f --tail=0 front | grep -q "Compiled successfully"
+        run: (docker-compose -f docker-compose.testcafe.yml build &) && docker-compose logs -f --tail=0 front | grep -q "Compiled successfully"
 
 #      - name: "temp debug: display logs"
 #        run: docker-compose logs
diff --git a/tests/tests/variables.ts b/tests/tests/variables.ts
index 6f95873e..86a6f954 100644
--- a/tests/tests/variables.ts
+++ b/tests/tests/variables.ts
@@ -158,6 +158,12 @@ test("Test that variables storage works", async (t: TestController) => {
             console.log(await t.getBrowserConsoleMessages());
         } catch (e) {
             console.error('Error while fetching browser logs (maybe linked to a closed iframe?)', e);
+            try {
+                console.log('Logs from main window:');
+                console.log(await t.switchToMainWindow().getBrowserConsoleMessages());
+            } catch (e) {
+                console.error('Unable to retrieve logs', e);
+            }
         }
     }
 });