diff --git a/tests/e2e/portal/2D_Plot.js b/tests/e2e/portal/2D_Plot.js
index bd0af9bfd91..94a3436c07c 100644
--- a/tests/e2e/portal/2D_Plot.js
+++ b/tests/e2e/portal/2D_Plot.js
@@ -1,7 +1,6 @@
 // node 2D_Plot.js [url_prefix] [template_uuid] [--demo]
 
 const tutorialBase = require('../tutorials/tutorialBase');
-const auto = require('../utils/auto');
 const utils = require('../utils/utils');
 
 const args = process.argv.slice(2);
@@ -30,8 +29,7 @@ async function runTutorial () {
     await tutorial.waitFor(5000, 'Some time for starting the service');
     await utils.takeScreenshot(page, screenshotPrefix + 'service_started');
 
-    // await tutorial.openNode(1);
-    auto.openNode(page, 1);
+    await tutorial.openNode(1);
 
     await tutorial.waitFor(2000);
     await utils.takeScreenshot(page, screenshotPrefix + 'iFrame0');
diff --git a/tests/e2e/portal/Kember.js b/tests/e2e/portal/Kember.js
index 0295603af8f..a2688b333ff 100644
--- a/tests/e2e/portal/Kember.js
+++ b/tests/e2e/portal/Kember.js
@@ -1,7 +1,6 @@
 // node kember.js [url_prefix] [template_uuid] [--demo]
 
 const tutorialBase = require('../tutorials/tutorialBase');
-const auto = require('../utils/auto');
 const utils = require('../utils/utils');
 
 const args = process.argv.slice(2);
@@ -41,7 +40,7 @@ async function runTutorial () {
 
 
     // open kember viewer
-    auto.openNode(page, 1);
+    await tutorial.openNode(1);
 
     await tutorial.waitFor(2000);
     await utils.takeScreenshot(page, screenshotPrefix + 'iFrame0');
diff --git a/tests/e2e/tutorials/tutorialBase.js b/tests/e2e/tutorials/tutorialBase.js
index 6fb18f69cad..b035452401f 100644
--- a/tests/e2e/tutorials/tutorialBase.js
+++ b/tests/e2e/tutorials/tutorialBase.js
@@ -321,6 +321,8 @@ class TutorialBase {
 
   async openNode(nodePosInTree = 0) {
     await auto.openNode(this.__page, nodePosInTree);
+    // Iframes get loaded on demand, wait 5"
+    await this.waitFor(5000);
     await this.takeScreenshot('openNode_' + nodePosInTree);
   }
 
@@ -404,6 +406,7 @@ class TutorialBase {
   }
 
   async removeStudy(studyId) {
+    await this.waitFor(5000, 'Wait to be unlocked');
     await this.takeScreenshot("deleteFirstStudy_before");
     try {
       // await this.waitForStudyUnlocked(studyId);