diff --git a/BTCPayServer.Tests/LanguageServiceTests.cs b/BTCPayServer.Tests/LanguageServiceTests.cs
index 14c1f454b..20527dac4 100644
--- a/BTCPayServer.Tests/LanguageServiceTests.cs
+++ b/BTCPayServer.Tests/LanguageServiceTests.cs
@@ -74,9 +74,8 @@ namespace BTCPayServer.Tests
             tester.Driver.WaitForElement(By.Id("ConfirmInput")).SendKeys("DELETE");
             tester.Driver.FindElement(By.Id("ConfirmContinue")).Click();
 
-            text = tester.Driver.PageSource;
-            Assert.DoesNotContain("Select-English (Custom)", text);
-            Assert.Contains("English (Custom) deleted", text);
+            Assert.Contains("Dictionary English (Custom) deleted", tester.FindAlertMessage().Text);
+            Assert.DoesNotContain("Select-English (Custom)", tester.Driver.PageSource);
         }
 
         [Fact(Timeout = TestTimeout)]
diff --git a/BTCPayServer.Tests/SeleniumTests.cs b/BTCPayServer.Tests/SeleniumTests.cs
index fa0411970..77b20332c 100644
--- a/BTCPayServer.Tests/SeleniumTests.cs
+++ b/BTCPayServer.Tests/SeleniumTests.cs
@@ -1875,19 +1875,13 @@ namespace BTCPayServer.Tests
                 Assert.Contains("test-label", s.Driver.PageSource);
             });
 
-            // Let's try to remove a label
-            await TestUtils.EventuallyAsync(async () =>
-            {
-                s.Driver.WaitForElement(By.CssSelector("[data-value='test-label']")).Click();
-                await Task.Delay(500);
-                s.Driver.ExecuteJavaScript("document.querySelector('[data-value=\"test-label\"]').nextSibling.dispatchEvent(new KeyboardEvent('keydown', {'key': 'Delete', keyCode: 46}));");
-
-            });
-            TestUtils.Eventually(() =>
-            {
-                s.Driver.Navigate().Refresh();
-                Assert.DoesNotContain("test-label", s.Driver.PageSource);
-            });
+            // Remove a label
+            s.Driver.WaitForElement(By.CssSelector("[data-value='test-label']")).Click();
+            await Task.Delay(500);
+            s.Driver.ExecuteJavaScript("var l=document.querySelector('[data-value=\"test-label\"]');l.click();l.nextSibling.dispatchEvent(new KeyboardEvent('keydown', {'key': 'Delete', keyCode: 8}));");
+            await Task.Delay(500);
+            await s.Driver.Navigate().RefreshAsync();
+            Assert.DoesNotContain("test-label", s.Driver.PageSource);
             Assert.True(s.Driver.ElementDoesNotExist(By.Id("GoBack")));
 
             //send money to addr and ensure it changed