diff --git a/testing/TestHarness/TestHarness.UITest/Ext/Navigation/Dialogs/Given_ContentDialog.cs b/testing/TestHarness/TestHarness.UITest/Ext/Navigation/Dialogs/Given_ContentDialog.cs
index 8fba18ec03..d857780a82 100644
--- a/testing/TestHarness/TestHarness.UITest/Ext/Navigation/Dialogs/Given_ContentDialog.cs
+++ b/testing/TestHarness/TestHarness.UITest/Ext/Navigation/Dialogs/Given_ContentDialog.cs
@@ -15,7 +15,7 @@ public async Task When_SimpleContentDialog(string dialogButton, int delayInSecon
 		App.WaitElement("DialogsContentDialogsPage");
 		var screenBefore = TakeScreenshot("When_Dialog_Before");
 		App.Tap(dialogButton);
-		await Task.Delay(500); // Make sure the dialog is showing completely
+		await Task.Delay(1000); // Make sure the dialog is showing completely
 		var screenAfter = TakeScreenshot("When_Dialog_After");
 		ImageAssert.AreNotEqual(screenBefore, screenAfter);
 
diff --git a/testing/TestHarness/TestHarness.UITest/Ext/Navigation/Dialogs/Given_FlyoutDialog.cs b/testing/TestHarness/TestHarness.UITest/Ext/Navigation/Dialogs/Given_FlyoutDialog.cs
index c0fbbc0eb5..a8c44d43d6 100644
--- a/testing/TestHarness/TestHarness.UITest/Ext/Navigation/Dialogs/Given_FlyoutDialog.cs
+++ b/testing/TestHarness/TestHarness.UITest/Ext/Navigation/Dialogs/Given_FlyoutDialog.cs
@@ -16,7 +16,7 @@ public async Task When_FlyoutsButton(string dialogButton, int delayInSeconds, bo
 		App.WaitElement("DialogsFlyoutsPage");
 		var screenBefore = TakeScreenshot("When_Dialog_Before");
 		App.Tap(dialogButton);
-		await Task.Delay(500); // Make sure the dialog is showing completely
+		await Task.Delay(1000); // Make sure the dialog is showing completely
 		var screenAfter = TakeScreenshot("When_Dialog_After");
 		ImageAssert.AreNotEqual(screenBefore, screenAfter);
 
diff --git a/testing/TestHarness/TestHarness/Ext/Navigation/Dialogs/ContentDialogsPage.xaml b/testing/TestHarness/TestHarness/Ext/Navigation/Dialogs/ContentDialogsPage.xaml
index d7cc99b949..f903d57df1 100644
--- a/testing/TestHarness/TestHarness/Ext/Navigation/Dialogs/ContentDialogsPage.xaml
+++ b/testing/TestHarness/TestHarness/Ext/Navigation/Dialogs/ContentDialogsPage.xaml
@@ -14,8 +14,7 @@
 			<RowDefinition Height="Auto" />
 			<RowDefinition />
 		</Grid.RowDefinitions>
-		<utu:NavigationBar Content="Content Dialogs"
-						   AutomationProperties.AutomationId="DialogsContentDialogsPage" />
+		<utu:NavigationBar Content="Content Dialogs" AutomationProperties.AutomationId="DialogsContentDialogsPage" />
 
 		<ScrollViewer Grid.Row="1">
 			<StackPanel>
@@ -41,8 +40,8 @@
 
 
 				<Button AutomationProperties.AutomationId="ComplexDialogSecondPageButton"
-					uen:Navigation.Request="ContentDialogsSecond"
-					Content="Complex Dialog - Second Page" />
+						uen:Navigation.Request="ContentDialogsSecond"
+						Content="Complex Dialog - Second Page" />
 			</StackPanel>
 		</ScrollViewer>
 	</Grid>
diff --git a/testing/TestHarness/TestHarness/Ext/Navigation/Dialogs/ContentDialogsPage.xaml.cs b/testing/TestHarness/TestHarness/Ext/Navigation/Dialogs/ContentDialogsPage.xaml.cs
index 73347ac3ef..51c413a851 100644
--- a/testing/TestHarness/TestHarness/Ext/Navigation/Dialogs/ContentDialogsPage.xaml.cs
+++ b/testing/TestHarness/TestHarness/Ext/Navigation/Dialogs/ContentDialogsPage.xaml.cs
@@ -21,7 +21,12 @@ private async void SimpleDialogCodebehindClick(object sender, RoutedEventArgs ar
 	}
 	private async void SimpleDialogCodebehindCancelClick(object sender, RoutedEventArgs args)
 	{
-		var cancelSource = new CancellationTokenSource(TimeSpan.FromSeconds(2));
+#if USE_UITESTS && __ANDROID__
+		var waitTime = 4;
+#else
+		var waitTime = 2;
+#endif
+		var cancelSource = new CancellationTokenSource(TimeSpan.FromSeconds(waitTime));
 		var showDialog = await this.Navigator()!.NavigateViewForResultAsync<DialogsSimpleDialog, Widget>(this, Qualifiers.Dialog, cancellation: cancelSource.Token);
 		if (showDialog is null)
 		{
diff --git a/testing/TestHarness/TestHarness/Ext/Navigation/Dialogs/DialogsFlyoutsPage.xaml b/testing/TestHarness/TestHarness/Ext/Navigation/Dialogs/DialogsFlyoutsPage.xaml
index 79d597f8e7..bb7577e6ae 100644
--- a/testing/TestHarness/TestHarness/Ext/Navigation/Dialogs/DialogsFlyoutsPage.xaml
+++ b/testing/TestHarness/TestHarness/Ext/Navigation/Dialogs/DialogsFlyoutsPage.xaml
@@ -15,19 +15,18 @@
 			<RowDefinition Height="Auto" />
 			<RowDefinition />
 		</Grid.RowDefinitions>
-		<utu:NavigationBar Content="Flyouts"
-						   AutomationProperties.AutomationId="DialogsFlyoutsPage" />
+		<utu:NavigationBar Content="Flyouts" AutomationProperties.AutomationId="DialogsFlyoutsPage" />
 
 		<ScrollViewer Grid.Row="1">
 			<StackPanel>
 				<Button AutomationProperties.AutomationId="FlyoutDialogXamlButton"
 						uen:Navigation.Request="!DialogsBasic"
 						Content="Flyout from Xaml" />
-				<Button  AutomationProperties.AutomationId="FlyoutDialogCodebehindButton"
-						 Content="Flyout from Background Thread"
+				<Button AutomationProperties.AutomationId="FlyoutDialogCodebehindButton"
+						Content="Flyout from Background Thread"
 						Click="FlyoutFromBackgroundClick" />
-				<Button  AutomationProperties.AutomationId="FlyoutDialogCodebehindBackgroundButton"
-						 Content="Flyout from Background Thread requesting data"
+				<Button AutomationProperties.AutomationId="FlyoutDialogCodebehindBackgroundButton"
+						Content="Flyout from Background Thread requesting data"
 						Click="FlyoutFromBackgroundRequestingDataClick" />
 				<Button AutomationProperties.AutomationId="FlyoutDialogCodebehindWithCancelButton"
 						Content="Flyout requesting data with cancellation (2s)"
@@ -37,7 +36,7 @@
 						uen:Navigation.Data="{Binding FlyoutData, Mode=TwoWay}"
 						Content="Complex Flyout from Xaml" />
 
-				
+
 			</StackPanel>
 		</ScrollViewer>
 	</Grid>
diff --git a/testing/TestHarness/TestHarness/Ext/Navigation/Dialogs/DialogsFlyoutsPage.xaml.cs b/testing/TestHarness/TestHarness/Ext/Navigation/Dialogs/DialogsFlyoutsPage.xaml.cs
index 56cf250a9f..6e43a6aa87 100644
--- a/testing/TestHarness/TestHarness/Ext/Navigation/Dialogs/DialogsFlyoutsPage.xaml.cs
+++ b/testing/TestHarness/TestHarness/Ext/Navigation/Dialogs/DialogsFlyoutsPage.xaml.cs
@@ -31,7 +31,12 @@ private async void FlyoutFromBackgroundRequestingDataClick(object sender, Routed
 
 	private async void FlyoutRequestingDataWithCancelClick(object sender, RoutedEventArgs args)
 	{
-		var cancelSource = new CancellationTokenSource(TimeSpan.FromSeconds(2));
+#if USE_UITESTS && __ANDROID__
+		var waitTime = 4;
+#else
+		var waitTime = 2;
+#endif
+		var cancelSource = new CancellationTokenSource(TimeSpan.FromSeconds(waitTime));
 		var nav = this.Navigator()!;
 		var result = await nav.NavigateRouteForResultAsync<Widget>(new object(), "!DialogsBasic", cancellation: cancelSource.Token).AsResult();
 	}
diff --git a/testing/TestHarness/TestHarness/Ext/Navigation/Dialogs/DialogsHostInit.cs b/testing/TestHarness/TestHarness/Ext/Navigation/Dialogs/DialogsHostInit.cs
index 3bec646970..7c63b3a265 100644
--- a/testing/TestHarness/TestHarness/Ext/Navigation/Dialogs/DialogsHostInit.cs
+++ b/testing/TestHarness/TestHarness/Ext/Navigation/Dialogs/DialogsHostInit.cs
@@ -36,6 +36,8 @@ protected override void RegisterRoutes(IViewRegistry views, IRouteRegistry route
 
 		views.Register(
 			new ViewMap<ContentDialogsPage>(),
+			new ViewMap<DialogsSimpleDialog, DialogsSimpleViewModel>(ResultData: typeof(Widget)),
+			new ViewMap<DialogsBasicFlyout, DialogsBasicViewModel>(ResultData: typeof(Widget)),
 			new ViewMap<ContentDialogsSecondPage>(),
 			new ViewMap<DialogsFlyoutsPage, DialogsFlyoutsViewModel>(),
 			new ViewMap<DialogsComplexDialog>(),
@@ -68,7 +70,9 @@ protected override void RegisterRoutes(IViewRegistry views, IRouteRegistry route
 					new RouteMap("DialogsComplexFlyoutSecond", View: views.FindByViewModel<DialogsComplexFlyoutTwoViewModel>(), DependsOn: "DialogsComplexFlyoutFirst")
 				}),
 				new RouteMap("Confirm", View: confirmDialog),
-				new RouteMap("LocalizedConfirm", View: localizedDialog)
+				new RouteMap("LocalizedConfirm", View: localizedDialog),
+				new RouteMap("DialogsSimpleDialog", View: views.FindByViewModel<DialogsSimpleViewModel>()),
+				new RouteMap("DialogsBasic", View: views.FindByViewModel<DialogsBasicViewModel>()),
 			}));
 	}