diff --git a/UnitTests/Application/ApplicationScreenTests.cs b/UnitTests/Application/ApplicationScreenTests.cs
index f5c2bef85..c6a220e52 100644
--- a/UnitTests/Application/ApplicationScreenTests.cs
+++ b/UnitTests/Application/ApplicationScreenTests.cs
@@ -1,6 +1,6 @@
 using Xunit.Abstractions;
 
-namespace Terminal.Gui.ApplicationTests.NavigationTests;
+namespace Terminal.Gui.ApplicationTests;
 
 public class ApplicationScreenTests (ITestOutputHelper output)
 {
@@ -22,10 +22,10 @@ public class ApplicationScreenTests (ITestOutputHelper output)
     }
 
     [Fact]
-    [SetupFakeDriver]
     public void ClearContents_Called_When_Top_Frame_Changes ()
     {
         // Arrange
+        Application.Init (new FakeDriver ());
         Application.Top = new Toplevel ();
         Application.TopLevels.Push (Application.Top);
 
@@ -61,6 +61,8 @@ public class ApplicationScreenTests (ITestOutputHelper output)
         Assert.Equal (3, clearedContentsRaised);
 
         // Cleanup
-        Application.ResetState (true);
+        Application.Top.Dispose ();
+        Application.Top = null;
+        Application.Shutdown ();
     }
 }
diff --git a/UnitTests/Configuration/ConfigPropertyTests.cs b/UnitTests/Configuration/ConfigPropertyTests.cs
index 0bf96dc6e..f751b3d72 100644
--- a/UnitTests/Configuration/ConfigPropertyTests.cs
+++ b/UnitTests/Configuration/ConfigPropertyTests.cs
@@ -5,6 +5,8 @@ using System.Text.Json.Serialization;
 using Terminal.Gui;
 using Xunit;
 
+namespace Terminal.Gui.ConfigurationTests;
+
 public class ConfigPropertyTests
 {
     [Fact]
diff --git a/UnitTests/Drawing/SixelEncoderTests.cs b/UnitTests/Drawing/SixelEncoderTests.cs
index 65d9e423a..f85942e72 100644
--- a/UnitTests/Drawing/SixelEncoderTests.cs
+++ b/UnitTests/Drawing/SixelEncoderTests.cs
@@ -1,6 +1,6 @@
 using Color = Terminal.Gui.Color;
 
-namespace UnitTests.Drawing;
+namespace Terminal.Gui.DrawingTests;
 
 public class SixelEncoderTests
 {
diff --git a/UnitTests/LocalPackagesTests.cs b/UnitTests/LocalPackagesTests.cs
index 5de7b371f..04e5c7802 100644
--- a/UnitTests/LocalPackagesTests.cs
+++ b/UnitTests/LocalPackagesTests.cs
@@ -1,4 +1,5 @@
-namespace Terminal.Gui;
+
+namespace Terminal.Gui.BuildAndDeployTests;
 
 public class LocalPackagesTests
 {