diff --git a/UnitTests/TestHelpers.cs b/UnitTests/TestHelpers.cs
index 1b841ee65..b8d3bb98d 100644
--- a/UnitTests/TestHelpers.cs
+++ b/UnitTests/TestHelpers.cs
@@ -197,6 +197,11 @@ public class SetupFakeDriverAttribute : BeforeAfterTestAttribute
         // Turn off diagnostic flags in case some test left them on
         View.Diagnostics = ViewDiagnosticFlags.Off;
 
+        if (Application.Driver is { })
+        {
+            ((FakeDriver)Application.Driver).End ();
+        }
+
         Application.Driver = null;
         base.After (methodUnderTest);
     }
diff --git a/UnitTests/View/Adornment/PaddingTests.cs b/UnitTests/View/Adornment/PaddingTests.cs
index a4defc997..0242bcc1d 100644
--- a/UnitTests/View/Adornment/PaddingTests.cs
+++ b/UnitTests/View/Adornment/PaddingTests.cs
@@ -33,7 +33,5 @@ PPP",
                                              output
                                             );
         TestHelpers.AssertDriverAttributesAre ("0", output, null, view.GetNormalColor ());
-
-        ((FakeDriver)Application.Driver!).End ();
     }
 }