diff --git a/test/helpers/widgets.ts b/test/helpers/widgets.ts
index 7025826..f46b8fd 100644
--- a/test/helpers/widgets.ts
+++ b/test/helpers/widgets.ts
@@ -9,6 +9,8 @@ export type WidgetId =
   | 'suggestions'
   | 'calculator';
 
+const DEFAULT_WIDGETS: WidgetId[] = ['news', 'facts', 'price', 'blocks', 'weather', 'suggestions', 'calculator'];
+
 type WidgetMetadata = {
   listItemId: string;
   actionName: string;
@@ -61,8 +63,6 @@ const WIDGETS: Record<WidgetId, WidgetMetadata> = {
   },
 };
 
-const DEFAULT_WIDGETS: WidgetId[] = ['price', 'blocks', 'suggestions'];
-
 function widgetMetadata(widget: WidgetId): WidgetMetadata {
   return WIDGETS[widget];
 }
@@ -101,7 +101,7 @@ export async function scrollHomeToWidgets() {
 export async function openWidgetsFeed() {
   await scrollHomeToWidgets();
   await tap('WidgetsAdd');
-  await tapIfDisplayed('WidgetsOnboarding-button');
+  await tapIfDisplayed('WidgetsOnboardingAddWidget');
 }
 
 export async function openWidgetPreview(widget: WidgetId) {
@@ -128,7 +128,6 @@ export async function openSavedWidgetPreview(widget: WidgetId) {
   await scrollHomeToWidgets();
   await tap('WidgetsEdit');
   await tap(widgetActionId(widget, 'Edit'));
-  await elementById('WidgetSave').waitForDisplayed();
 }
 
 export async function expectWidgetPresent(
diff --git a/test/specs/backup.e2e.ts b/test/specs/backup.e2e.ts
index 6b771be..5b449db 100644
--- a/test/specs/backup.e2e.ts
+++ b/test/specs/backup.e2e.ts
@@ -78,7 +78,7 @@ describe('@backup - Backup', () => {
     await sleep(1000); // wait for the app to settle
     await deleteAllDefaultWidgets();
     await tap('WidgetsAdd');
-    await tap('WidgetsOnboarding-button');
+    await tap('WidgetsOnboardingAddWidget');
     await tap('WidgetListItem-price');
     await elementById('WidgetSave').waitForDisplayed();
     await sleep(1000); // wait for the app to settle
diff --git a/test/specs/widgets.e2e.ts b/test/specs/widgets.e2e.ts
index e6cfce4..19d287d 100644
--- a/test/specs/widgets.e2e.ts
+++ b/test/specs/widgets.e2e.ts
@@ -60,8 +60,6 @@ describe('@widgets - Widgets', () => {
     await elementById('PriceWidgetRow-BTC/EUR').waitForDisplayed();
 
     await openSavedWidgetPreview('price');
-    await elementByText('Custom').waitForDisplayed();
-    await openWidgetSettings('price');
     await tap('WidgetEditReset');
     await sleep(1000);
     await tap('WidgetEditPreview');
@@ -103,7 +101,8 @@ describe('@widgets - Widgets', () => {
 
     await scrollHomeToWidgets();
     await expectWidgetPresent('price');
-    await expectWidgetPresent('suggestions');
+    await expectWidgetPresent('weather');
+    await expectWidgetPresent('calculator');
     await expectWidgetPresent('blocks');
 
     await openSettings();
@@ -114,7 +113,8 @@ describe('@widgets - Widgets', () => {
 
     await scrollHomeToWidgets();
     await expectWidgetPresent('price', false, { timeout: 5000 });
-    await expectWidgetPresent('suggestions', false, { timeout: 5000 });
+    await expectWidgetPresent('weather', false, { timeout: 5000 });
+    await expectWidgetPresent('calculator', false, { timeout: 5000 });
     await expectWidgetPresent('blocks', false, { timeout: 5000 });
 
     await openSettings();
@@ -125,7 +125,8 @@ describe('@widgets - Widgets', () => {
 
     await scrollHomeToWidgets();
     await expectWidgetPresent('price');
-    await expectWidgetPresent('suggestions');
+    await expectWidgetPresent('weather');
+    await expectWidgetPresent('calculator');
     await expectWidgetPresent('blocks');
   });
 });
diff --git a/wdio.conf.ts b/wdio.conf.ts
index caf4705..317d4f4 100644
--- a/wdio.conf.ts
+++ b/wdio.conf.ts
@@ -181,7 +181,7 @@ export const config: WebdriverIO.Config = {
   // See the full list at http://mochajs.org/
   mochaOpts: {
     ui: 'bdd',
-    timeout: 10 * 60 * 1000, // 10 minutes
+    timeout: 15 * 60 * 1000, // 15 minutes
   },
 
   //