diff --git a/BTCPayServer.Tests/Dockerfile b/BTCPayServer.Tests/Dockerfile
index 4be53427c..aadeef9bc 100644
--- a/BTCPayServer.Tests/Dockerfile
+++ b/BTCPayServer.Tests/Dockerfile
@@ -8,6 +8,7 @@ WORKDIR /source
 COPY BTCPayServer/BTCPayServer.csproj BTCPayServer/BTCPayServer.csproj
 COPY BTCPayServer.Tests/BTCPayServer.Tests.csproj BTCPayServer.Tests/BTCPayServer.Tests.csproj
 RUN dotnet restore BTCPayServer.Tests/BTCPayServer.Tests.csproj
+RUN apk add chromium-chromedriver
 COPY . .
 RUN dotnet build
 WORKDIR /source/BTCPayServer.Tests
diff --git a/BTCPayServer.Tests/SeleniumTester.cs b/BTCPayServer.Tests/SeleniumTester.cs
index dadd4350f..307fda075 100644
--- a/BTCPayServer.Tests/SeleniumTester.cs
+++ b/BTCPayServer.Tests/SeleniumTester.cs
@@ -33,26 +33,12 @@ namespace BTCPayServer.Tests
             ChromeOptions options = new ChromeOptions();
             options.AddArguments("headless"); // Comment to view browser
             options.AddArguments("window-size=1200x600"); // Comment to view browser
-            if (Server.PayTester.InContainer)
-            {
-                Driver = new OpenQA.Selenium.Remote.RemoteWebDriver(new Uri("http://selenium:4444/wd/hub"), options);
-                Logs.Tester.LogInformation("Selenium: Using remote driver");
-            }
-            else
-            {
-                Driver = new ChromeDriver(Directory.GetCurrentDirectory(), options);
-                Logs.Tester.LogInformation("Selenium: Using chrome driver");
-            }
+
+            Driver = new ChromeDriver(Directory.GetCurrentDirectory(), options);
+            Logs.Tester.LogInformation("Selenium: Using chrome driver");
             Logs.Tester.LogInformation("Selenium: Browsing to " + Server.PayTester.ServerUri);
-            int tryCount = 0;
-retry:
+
             Driver.Navigate().GoToUrl(Server.PayTester.ServerUri);
-            if (tryCount < 10 && Driver.FindElements(By.ClassName("navbar-brand")).Count == 0)
-            {
-                Thread.Sleep(1000);
-                tryCount++;
-                goto retry;
-            }
             Driver.AssertNoError();
         }
 
diff --git a/BTCPayServer.Tests/docker-compose.yml b/BTCPayServer.Tests/docker-compose.yml
index d07f9554e..b6ab1ba9c 100644
--- a/BTCPayServer.Tests/docker-compose.yml
+++ b/BTCPayServer.Tests/docker-compose.yml
@@ -286,11 +286,6 @@ services:
     links:
       - bitcoind
 
-  selenium:
-    image:  selenium/standalone-chrome
-    expose:
-        - "4444"
-
 volumes:
     bitcoin_datadir:
     customer_lightningd_datadir: