diff --git a/Terminal.Gui/Drivers/FakeDriver/FakeDriver.cs b/Terminal.Gui/Drivers/FakeDriver/FakeDriver.cs
index f3df3cb79..300fabd93 100644
--- a/Terminal.Gui/Drivers/FakeDriver/FakeDriver.cs
+++ b/Terminal.Gui/Drivers/FakeDriver/FakeDriver.cs
@@ -98,6 +98,7 @@ public class FakeDriver : ConsoleDriver
         _cols = FakeConsole.WindowWidth = FakeConsole.BufferWidth = FakeConsole.WIDTH;
         _rows = FakeConsole.WindowHeight = FakeConsole.BufferHeight = FakeConsole.HEIGHT;
         FakeConsole.Clear ();
+        ClearContents ();
         ResizeScreen ();
         CurrentAttribute = new Attribute (Color.White, Color.Black);
     }
diff --git a/Tests/UnitTests/ConsoleDrivers/ClipRegionTests.cs b/Tests/UnitTests/ConsoleDrivers/ClipRegionTests.cs
index 22ae3f24d..024d03dcf 100644
--- a/Tests/UnitTests/ConsoleDrivers/ClipRegionTests.cs
+++ b/Tests/UnitTests/ConsoleDrivers/ClipRegionTests.cs
@@ -25,8 +25,9 @@ public class ClipRegionTests
     public void AddRune_Is_Clipped (Type driverType)
     {
         var driver = (IConsoleDriver)Activator.CreateInstance (driverType);
+        driver.Init ();
+        driver.SetScreenSize (80, 25);
         Application.Init (driver);
-        Application.Driver!.SetScreenSize (80, 25);
 
         driver.Move (0, 0);
         driver.AddRune ('x');
diff --git a/Tests/UnitTests/View/Adornment/MarginTests.cs b/Tests/UnitTests/View/Adornment/MarginTests.cs
index ff678a311..99c1a9159 100644
--- a/Tests/UnitTests/View/Adornment/MarginTests.cs
+++ b/Tests/UnitTests/View/Adornment/MarginTests.cs
@@ -9,7 +9,7 @@ public class MarginTests (ITestOutputHelper output)
     [SetupFakeDriver]
     public void Margin_Is_Transparent ()
     {
-        ((IFakeConsoleDriver)Application.Driver!).SetBufferSize (5, 5);
+        Application.Driver!.SetScreenSize (5, 5);
 
         var view = new View { Height = 3, Width = 3 };
         view.Margin!.Diagnostics = ViewDiagnosticFlags.Thickness;
@@ -44,7 +44,7 @@ public class MarginTests (ITestOutputHelper output)
     [SetupFakeDriver]
     public void Margin_ViewPortSettings_Not_Transparent_Is_NotTransparent ()
     {
-        ((IFakeConsoleDriver)Application.Driver!).SetBufferSize (5, 5);
+        Application.Driver!.SetScreenSize (5, 5);
 
         var view = new View { Height = 3, Width = 3 };
         view.Margin!.Diagnostics = ViewDiagnosticFlags.Thickness;
diff --git a/Tests/UnitTests/View/Adornment/PaddingTests.cs b/Tests/UnitTests/View/Adornment/PaddingTests.cs
index d9a9a6141..b82a9e721 100644
--- a/Tests/UnitTests/View/Adornment/PaddingTests.cs
+++ b/Tests/UnitTests/View/Adornment/PaddingTests.cs
@@ -9,7 +9,7 @@ public class PaddingTests (ITestOutputHelper output)
     [SetupFakeDriver]
     public void Padding_Uses_Parent_Scheme ()
     {
-        ((IFakeConsoleDriver)Application.Driver!).SetBufferSize (5, 5);
+        Application.Driver!.SetScreenSize (5, 5);
         var view = new View { Height = 3, Width = 3 };
         view.Padding!.Thickness = new (1);
         view.Padding.Diagnostics = ViewDiagnosticFlags.Thickness;
diff --git a/Tests/UnitTests/View/Draw/ClipTests.cs b/Tests/UnitTests/View/Draw/ClipTests.cs
index 05f62a4d0..eaffe3121 100644
--- a/Tests/UnitTests/View/Draw/ClipTests.cs
+++ b/Tests/UnitTests/View/Draw/ClipTests.cs
@@ -171,7 +171,7 @@ public class ClipTests (ITestOutputHelper _output)
     [Trait ("Category", "Unicode")]
     public void Clipping_Wide_Runes ()
     {
-        ((IFakeConsoleDriver)Application.Driver!).SetBufferSize (30, 1);
+        Application.Driver!.SetScreenSize (30, 1);
 
         var top = new View
         {