diff --git a/BTCPayServer.Tests/Extensions.cs b/BTCPayServer.Tests/Extensions.cs
index 9918f1e5c..d6d1e724c 100644
--- a/BTCPayServer.Tests/Extensions.cs
+++ b/BTCPayServer.Tests/Extensions.cs
@@ -33,8 +33,7 @@ namespace BTCPayServer.Tests
                 foreach (var dangerAlert in driver.FindElements(By.ClassName("alert-danger")))
                     Assert.False(dangerAlert.Displayed, $"No alert should be displayed, but found this on {driver.Url}: {dangerAlert.Text}");
             }
-            Assert.DoesNotContain("- Denied</h", driver.PageSource);
-            Assert.DoesNotContain("Page not found</h", driver.PageSource);
+            Assert.DoesNotContain("ErrorPage", driver.PageSource);
         }
 
         public static T AssertViewModel<T>(this IActionResult result)
diff --git a/BTCPayServer.Tests/SeleniumTester.cs b/BTCPayServer.Tests/SeleniumTester.cs
index 9f8c1948d..d6b71c94d 100644
--- a/BTCPayServer.Tests/SeleniumTester.cs
+++ b/BTCPayServer.Tests/SeleniumTester.cs
@@ -327,7 +327,7 @@ namespace BTCPayServer.Tests
 
         internal void AssertAccessDenied()
         {
-            Assert.DoesNotContain("- Denied</h", Driver.PageSource);
+            Assert.Contains("- Denied</h", Driver.PageSource);
         }
 
         public void GoToHome()
diff --git a/BTCPayServer/Views/Error/_LayoutError.cshtml b/BTCPayServer/Views/Error/_LayoutError.cshtml
index 8cfebdd4f..60d9891e8 100644
--- a/BTCPayServer/Views/Error/_LayoutError.cshtml
+++ b/BTCPayServer/Views/Error/_LayoutError.cshtml
@@ -13,7 +13,8 @@
 </div>
 
 <center>
-    <hr class="primary" />
+	@*Marker for tests*@
+    <hr id="ErrorPage" class="primary" />
 </center>
 
 <p class="lead text-center">
diff --git a/BTCPayServer/Views/Shared/_LayoutSimple.cshtml b/BTCPayServer/Views/Shared/_LayoutSimple.cshtml
index 77086a972..ce3c741cb 100644
--- a/BTCPayServer/Views/Shared/_LayoutSimple.cshtml
+++ b/BTCPayServer/Views/Shared/_LayoutSimple.cshtml
@@ -1,4 +1,4 @@
-﻿@inject BTCPayServer.Services.BTCPayServerEnvironment env
+@inject BTCPayServer.Services.BTCPayServerEnvironment env
 @{
     Layout = null;
 }
@@ -10,7 +10,7 @@
 </head>
 <body>
     <section class="content-wrapper">
-        <!-- Dummy navbar-brand, hackish way to keep test AssertNoError passing -->
+        @*Dummy navbar-brand, hackish way to keep test AssertNoError passing*@
         <div class="navbar-brand d-none"></div>
         <div class="container">
             @RenderBody()
