diff --git a/jans-auth-server/client/pom.xml b/jans-auth-server/client/pom.xml
index 0a21ffafb9e..a6345237bce 100644
--- a/jans-auth-server/client/pom.xml
+++ b/jans-auth-server/client/pom.xml
@@ -250,7 +250,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.seleniumhq.selenium</groupId>
-			<artifactId>htmlunit-driver</artifactId>
+			<artifactId>htmlunit3-driver</artifactId>
 			<scope>test</scope>
 		</dependency>
         <dependency>
@@ -258,21 +258,11 @@
             <artifactId>jans-auth-test-model</artifactId>
             <scope>test</scope>
         </dependency>
-		<dependency>
-			<groupId>net.sourceforge.htmlunit</groupId>
-			<artifactId>htmlunit</artifactId>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.seleniumhq.selenium</groupId>
-			<artifactId>selenium-java</artifactId>
-			<scope>test</scope>
-		</dependency>
 
         <dependency>
             <groupId>jakarta.servlet</groupId>
diff --git a/jans-auth-server/client/src/test/java/io/jans/as/client/BaseTest.java b/jans-auth-server/client/src/test/java/io/jans/as/client/BaseTest.java
index 13fe5884980..693804b15f2 100644
--- a/jans-auth-server/client/src/test/java/io/jans/as/client/BaseTest.java
+++ b/jans-auth-server/client/src/test/java/io/jans/as/client/BaseTest.java
@@ -442,6 +442,7 @@ public void startSelenium() {
         //driver = new InternetExplorerDriver();
 
         driver = new HtmlUnitDriver(true);
+        driver.getWebClient().getOptions().setThrowExceptionOnScriptError(false);
     }
 
     public void stopSelenium() {
@@ -812,7 +813,7 @@ public AuthorizationResponse authorizationRequestAndDenyAccess(
 
         final String previousURL = driver.getCurrentUrl();
         doNotAllowButton.click();
-        WebDriverWait wait = new WebDriverWait(driver, 1);
+        WebDriverWait wait = new WebDriverWait(driver, Duration.ofSeconds(1));
         wait.until((WebDriver d) -> (d.getCurrentUrl() != previousURL));
 
         String authorizationResponseStr = driver.getCurrentUrl();
@@ -871,7 +872,7 @@ public AuthorizationResponse authenticateResourceOwner(
 
             navigateToAuhorizationUrl(driver, driver.getCurrentUrl());
 
-            new WebDriverWait(driver, PageConfig.WAIT_OPERATION_TIMEOUT)
+            new WebDriverWait(driver, Duration.ofSeconds(PageConfig.WAIT_OPERATION_TIMEOUT))
                     .until(webDriver -> !webDriver.getCurrentUrl().contains("/authorize"));
         }
 
diff --git a/jans-auth-server/client/src/test/java/io/jans/as/client/page/AbstractPage.java b/jans-auth-server/client/src/test/java/io/jans/as/client/page/AbstractPage.java
index ac96d6a0e44..338e82e302c 100644
--- a/jans-auth-server/client/src/test/java/io/jans/as/client/page/AbstractPage.java
+++ b/jans-auth-server/client/src/test/java/io/jans/as/client/page/AbstractPage.java
@@ -17,6 +17,7 @@
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
+import java.time.Duration;
 import java.util.Set;
 
 import static org.testng.Assert.fail;
@@ -35,7 +36,7 @@ public AbstractPage(PageConfig config) {
 
     public static String waitForPageSwitch(WebDriver currentDriver, String previousURL) {
         Holder<String> currentUrl = new Holder<>();
-        WebDriverWait wait = new WebDriverWait(currentDriver, PageConfig.WAIT_OPERATION_TIMEOUT);
+        WebDriverWait wait = new WebDriverWait(currentDriver, Duration.ofSeconds(PageConfig.WAIT_OPERATION_TIMEOUT));
         wait.until((WebDriver d) -> {
             currentUrl.setT(d.getCurrentUrl());
             return !currentUrl.getT().equals(previousURL);
diff --git a/jans-auth-server/client/src/test/java/io/jans/as/client/page/SelectPage.java b/jans-auth-server/client/src/test/java/io/jans/as/client/page/SelectPage.java
index fa9b9712fb6..4cac0883a21 100644
--- a/jans-auth-server/client/src/test/java/io/jans/as/client/page/SelectPage.java
+++ b/jans-auth-server/client/src/test/java/io/jans/as/client/page/SelectPage.java
@@ -12,6 +12,7 @@
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.ui.WebDriverWait;
 
+import java.time.Duration;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -58,7 +59,7 @@ public LoginPage clickOnLoginAsAnotherUser() {
 
         navigate(driver.getCurrentUrl());
         if (BaseTest.ENABLE_REDIRECT_TO_LOGIN_PAGE) {
-            new WebDriverWait(driver, PageConfig.WAIT_OPERATION_TIMEOUT)
+            new WebDriverWait(driver, Duration.ofSeconds(PageConfig.WAIT_OPERATION_TIMEOUT))
                     .until((WebDriver d) -> !d.getCurrentUrl().contains("/authorize"));
         }
         return new LoginPage(config);
diff --git a/jans-bom/pom.xml b/jans-bom/pom.xml
index 417980f6662..c754e8c1643 100644
--- a/jans-bom/pom.xml
+++ b/jans-bom/pom.xml
@@ -962,6 +962,12 @@
 				<artifactId>sac</artifactId>
 				<version>1.3</version>
 			</dependency>
+
+			<dependency>
+				<groupId>org.seleniumhq.selenium</groupId>
+				<artifactId>htmlunit3-driver</artifactId>
+				<version>4.17.0</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>