diff --git a/services/docker-compose.yml b/services/docker-compose.yml
index ca769e90bf0..7884a0efeaf 100644
--- a/services/docker-compose.yml
+++ b/services/docker-compose.yml
@@ -273,7 +273,15 @@ services:
       - interactive_services_subnet
       - computational_services_subnet
     healthcheck:
-      test: ["CMD", "pg_isready", "-U", "${POSTGRES_USER}"]
+      test:
+        [
+          "CMD",
+          "pg_isready",
+          "--username",
+          "${POSTGRES_USER}",
+          "--dbname",
+          "${POSTGRES_DB}",
+        ]
       interval: 15s
       retries: 5
     # NOTES: this is not yet compatible with portainer deployment but could work also for other containers
diff --git a/tests/e2e/tutorials/jupyters.js b/tests/e2e/tutorials/jupyters.js
index 81693992357..21f54a0879e 100644
--- a/tests/e2e/tutorials/jupyters.js
+++ b/tests/e2e/tutorials/jupyters.js
@@ -48,20 +48,12 @@ async function runTutorial() {
 
 
     // inside the first notebook, click Run all button
-    const runAllButtonSelector = '#run_int > button:nth-child(4)';
-    await utils.waitAndClick(nbIframe, runAllButtonSelector);
+    const cellMenuSelector = '#menus > div > div > ul > li:nth-child(5) > a'
+    await utils.waitAndClick(nbIframe, cellMenuSelector);
+    const runAllCellsSelector = '#run_all_cells > a'
+    await utils.waitAndClick(nbIframe, runAllCellsSelector);
     await tutorial.takeScreenshot("pressRunAllButtonNotebook");
 
-    // inside the first notebook, click confirm run all (NOTE: this dialog does not appear in headless mode)
-    try {
-      const confirmRunAllButtonSelector = 'body > div.modal.fade.in > div > div > div.modal-footer > button.btn.btn-default.btn-sm.btn-danger';
-      await utils.waitAndClick(nbIframe, confirmRunAllButtonSelector, 10000);
-      await tutorial.takeScreenshot("pressRunNotebookAfterConfirmation");
-    } catch (err) {
-      console.log("The confirmation dialog appears only in --demo mode.");
-    }
-
-
     // now check that the input contains [4]
     console.log('Waiting for notebook results...');
     const finishedRunningCheckboxSelector = '#notebook-container > div:nth-child(5) > div.input > div.prompt_container > div.prompt.input_prompt';