diff --git a/Tests/UnitTests/ConsoleDrivers/FakeDriverTests.cs b/Tests/UnitTests/ConsoleDrivers/FakeDriverTests.cs
index 4314492d4..41a58c39c 100644
--- a/Tests/UnitTests/ConsoleDrivers/FakeDriverTests.cs
+++ b/Tests/UnitTests/ConsoleDrivers/FakeDriverTests.cs
@@ -180,12 +180,12 @@ public class FakeDriverTests (ITestOutputHelper output)
 
     [Fact]
     [SetupFakeDriver]
-    public void SetupFakeDriver_Driver_Is_FakeConsoleDriver ()
+    public void SetupFakeDriver_Driver_Is_FakeDriver ()
     {
         Assert.NotNull (Application.Driver);
         
-        // Should be IFakeConsoleDriver
-        Assert.IsAssignableFrom<IFakeConsoleDriver> (Application.Driver);
+        // Should be FakeDriver
+        Assert.IsAssignableFrom<FakeDriver> (Application.Driver);
         
         _output.WriteLine ($"Driver type: {Application.Driver.GetType().Name}");
     }
@@ -194,7 +194,7 @@ public class FakeDriverTests (ITestOutputHelper output)
     [SetupFakeDriver]
     public void SetupFakeDriver_Can_Set_Buffer_Size ()
     {
-        var fakeDriver = Application.Driver as IFakeConsoleDriver;
+        var fakeDriver = Application.Driver as FakeDriver;
         Assert.NotNull (fakeDriver);
 
         fakeDriver!.SetBufferSize (100, 50);
diff --git a/Tests/UnitTests/SetupFakeDriverAttribute.cs b/Tests/UnitTests/SetupFakeDriverAttribute.cs
index 9d1cadeb4..3a69e5e28 100644
--- a/Tests/UnitTests/SetupFakeDriverAttribute.cs
+++ b/Tests/UnitTests/SetupFakeDriverAttribute.cs
@@ -1,6 +1,5 @@
 using System.Diagnostics;
 using System.Reflection;
-using TerminalGuiFluentTesting;
 using Xunit.Sdk;
 
 namespace UnitTests;
@@ -10,8 +9,7 @@ namespace UnitTests;
 ///     FakeDriver(). The driver is set up with 25 rows and columns.
 /// </summary>
 /// <remarks>
-///     On Before, sets Configuration.Locations to ConfigLocations.DefaultOnly.
-///     On After, sets Configuration.Locations to ConfigLocations.All.
+///     This attribute uses the built-in FakeDriver from Terminal.Gui.Drivers namespace.
 /// </remarks>
 [AttributeUsage (AttributeTargets.Class | AttributeTargets.Method)]
 public class SetupFakeDriverAttribute : BeforeAfterTestAttribute
@@ -36,9 +34,10 @@ public class SetupFakeDriverAttribute : BeforeAfterTestAttribute
         Application.ResetState (true);
         Assert.Null (Application.Driver);
 
-        var ff = new FakeDriverFactory ();
-        var driver = ff.Create ();
-
+        // Use the built-in FakeDriver from the library
+        var driver = new FakeDriver ();
+        driver.Init ();
+        
         Application.Driver = driver;
         driver.SetBufferSize (25, 25);