diff --git a/test/taiko/apps.js b/test/taiko/apps.js
index bd8a2a18b805a0b2fa919240277739693be1f368..09a099c2f4306ca78e091b93f112265231b28480 100644
--- a/test/taiko/apps.js
+++ b/test/taiko/apps.js
@@ -14,7 +14,8 @@ const assert = require('assert');
     setConfig( {
       observeTime: 0,
       // Navigation timeout value in milliseconds for navigation after performing openTab, goto, reload, goBack, goForward, click, write, clear, press and evaluate.
-      navigationTimeout: globalTimeout
+      navigationTimeout: globalTimeout,
+      highlightOnAction: 'true'
     });
 
     console.log('Executing these tests: ' + taikoTests)
@@ -54,6 +55,7 @@ const assert = require('assert');
       await write(nextcloudPassword, into(textBox('Password')))
 
       await click('Log in')
+      await waitFor(async () => (await text("Set location for weather").isVisible()), globalTimeout)
       // Close potential nextcloud first run wizard modal
       // https://github.com/nextcloud/firstrunwizard/issues/488
       // Unfortunately, we need to sleep a while since I haven't found a
@@ -61,24 +63,23 @@ const assert = require('assert');
       // tests should also work on subsequent logins.
       await waitFor(5000)
       await press('Escape')
-      await waitFor(async () => (await text("Set location for weather").isVisible()))
 
       // Test if calendar app is enabled
       await click('Calendar')
-      await waitFor(async () => (await text("Settings & Import").isVisible()))
+      await waitFor(async () => (await text("Settings & Import").isVisible()), globalTimeout)
       await click('Dashboard')
-      await waitFor(async () => (await text("Set location for weather").isVisible()))
+      await waitFor(async () => (await text("Set location for weather").isVisible()), globalTimeout)
 
       console.log('• Nextcloud Onlyoffice integration')
       // Open document and type some text
       await click('Files')
-      await waitFor(async () => (await link({class:'new'}).isVisible()))
+      await waitFor(async () => (await link({class:'new'}).isVisible()), globalTimeout)
       await click(link({class:'new'}))
       await click('Document')
       await press('Enter')
 
       let italicButtonId = '#id-toolbar-btn-italic'
-      await waitFor($(italicButtonId), 240000)
+      await waitFor(async () => (await $(italicButtonId).isVisible()), globalTimeout)
 
       // Activate italic button
       let buttonStateBefore = await evaluate($(italicButtonId), (elem) => {return elem.getAttribute('class')})