diff --git a/src/Controls/tests/TestCases/Issues/Issue18161.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue18161.xaml
similarity index 100%
rename from src/Controls/tests/TestCases/Issues/Issue18161.xaml
rename to src/Controls/tests/TestCases.HostApp/Issues/Issue18161.xaml
diff --git a/src/Controls/tests/TestCases/Issues/Issue18161.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue18161.xaml.cs
similarity index 100%
rename from src/Controls/tests/TestCases/Issues/Issue18161.xaml.cs
rename to src/Controls/tests/TestCases.HostApp/Issues/Issue18161.xaml.cs
diff --git a/src/Controls/tests/TestCases/Issues/Issue20858.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue20858.xaml
similarity index 100%
rename from src/Controls/tests/TestCases/Issues/Issue20858.xaml
rename to src/Controls/tests/TestCases.HostApp/Issues/Issue20858.xaml
diff --git a/src/Controls/tests/TestCases/Issues/Issue20858.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue20858.xaml.cs
similarity index 92%
rename from src/Controls/tests/TestCases/Issues/Issue20858.xaml.cs
rename to src/Controls/tests/TestCases.HostApp/Issues/Issue20858.xaml.cs
index d46909f398a0..d0d40c961c8c 100644
--- a/src/Controls/tests/TestCases/Issues/Issue20858.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue20858.xaml.cs
@@ -5,7 +5,6 @@
 
 namespace Maui.Controls.Sample.Issues
 {
-	[XamlCompilation(XamlCompilationOptions.Compile)]
 	[Issue(IssueTracker.Github, 20858, "FlyoutPage Android app crashing on orientation change when flyout is open", PlatformAffected.Android)]
 	public partial class Issue20858 : FlyoutPage, IFlyoutPageController
 	{