diff --git a/src/Core/tests/DeviceTests/Handlers/HandlerTestBase.cs b/src/Core/tests/DeviceTests/Handlers/HandlerTestBase.cs
index 3991f0b6d320..6545fde0fcb3 100644
--- a/src/Core/tests/DeviceTests/Handlers/HandlerTestBase.cs
+++ b/src/Core/tests/DeviceTests/Handlers/HandlerTestBase.cs
@@ -18,7 +18,7 @@ public partial class HandlerTestBase<THandler, TStub> : TestBase, IDisposable
 
 		public HandlerTestBase()
 		{
-			var appBuilder = MauiAppBuilder
+			var appBuilder = MauiApp
 				.CreateBuilder()
 				.ConfigureMauiHandlers(handlers =>
 				{
@@ -38,7 +38,8 @@ public HandlerTestBase()
 					fonts.AddFont("LobsterTwo-BoldItalic.ttf", "Lobster Two BoldItalic");
 				});
 
-			_servicesProvider = appBuilder.Build();
+			var mauiApp = appBuilder.Build();
+			_servicesProvider = mauiApp.Services;
 
 			_app = new ApplicationStub();
 
diff --git a/src/Core/tests/DeviceTests/Services/ImageSource/ImageSourceServiceTests.cs b/src/Core/tests/DeviceTests/Services/ImageSource/ImageSourceServiceTests.cs
index 232f797fc8de..34e4980f195c 100644
--- a/src/Core/tests/DeviceTests/Services/ImageSource/ImageSourceServiceTests.cs
+++ b/src/Core/tests/DeviceTests/Services/ImageSource/ImageSourceServiceTests.cs
@@ -89,11 +89,11 @@ public void ResultsDisposeCorrectlyAndOnce()
 
 		private IImageSourceServiceProvider CreateImageSourceServiceProvider(Action<IImageSourceServiceCollection> configure)
 		{
-			var services = MauiAppBuilder.CreateBuilder(useDefaults: false)
+			var mauiApp = MauiApp.CreateBuilder(useDefaults: false)
 				.ConfigureImageSources(configure)
 				.Build();
 
-			var provider = services.GetRequiredService<IImageSourceServiceProvider>();
+			var provider = mauiApp.Services.GetRequiredService<IImageSourceServiceProvider>();
 
 			return provider;
 		}
diff --git a/src/Core/tests/DeviceTests/Startup.cs b/src/Core/tests/DeviceTests/Startup.cs
index b2c918727e82..774427cb7b69 100644
--- a/src/Core/tests/DeviceTests/Startup.cs
+++ b/src/Core/tests/DeviceTests/Startup.cs
@@ -8,7 +8,7 @@ public static class MauiProgram
 	{
 		public static MauiAppBuilder CreateAppBuilder()
 		{
-			var appBuilder = MauiAppBuilder.CreateBuilder();
+			var appBuilder = MauiApp.CreateBuilder();
 			appBuilder
 				.ConfigureLifecycleEvents(life =>
 				{
diff --git a/src/Essentials/test/DeviceTests/Startup.cs b/src/Essentials/test/DeviceTests/Startup.cs
index fc28ccdeddeb..67bcd5e510bc 100644
--- a/src/Essentials/test/DeviceTests/Startup.cs
+++ b/src/Essentials/test/DeviceTests/Startup.cs
@@ -9,7 +9,7 @@ public static class MauiProgram
 	{
 		public static MauiAppBuilder CreateAppBuilder()
 		{
-			var appBuilder = MauiAppBuilder.CreateBuilder();
+			var appBuilder = MauiApp.CreateBuilder();
 			appBuilder
 				.ConfigureLifecycleEvents(life =>
 				{
diff --git a/src/TestUtils/samples/DeviceTests.Sample/Startup.cs b/src/TestUtils/samples/DeviceTests.Sample/Startup.cs
index c83cb6e0bbac..5790ba15e859 100644
--- a/src/TestUtils/samples/DeviceTests.Sample/Startup.cs
+++ b/src/TestUtils/samples/DeviceTests.Sample/Startup.cs
@@ -6,7 +6,7 @@ public static class MauiProgram
 	{
 		public static MauiAppBuilder CreateAppBuilder()
 		{
-			var appBuilder = MauiAppBuilder.CreateBuilder();
+			var appBuilder = MauiApp.CreateBuilder();
 			appBuilder
 				.ConfigureTests(new TestOptions
 				{