diff --git a/build-parent/pom.xml b/build-parent/pom.xml
index e2c52160135c6..332c47bfc7e08 100644
--- a/build-parent/pom.xml
+++ b/build-parent/pom.xml
@@ -33,7 +33,7 @@
         <jandex-gradle-plugin.version>1.0.0</jandex-gradle-plugin.version>
 
         <asciidoctorj.version>2.5.13</asciidoctorj.version>
-        <htmlunit.version>4.5.0</htmlunit.version>
+        <htmlunit.version>4.7.0</htmlunit.version>
         <javaparser-core.version>3.26.2</javaparser-core.version>
         <jdeparser.version>2.0.3.Final</jdeparser.version>
         <subethasmtp.version>6.0.1</subethasmtp.version>
diff --git a/integration-tests/oidc-wiremock-logout/src/test/java/io/quarkus/it/keycloak/CodeFlowAuthorizationTest.java b/integration-tests/oidc-wiremock-logout/src/test/java/io/quarkus/it/keycloak/CodeFlowAuthorizationTest.java
index d727737004703..57201376da7b7 100644
--- a/integration-tests/oidc-wiremock-logout/src/test/java/io/quarkus/it/keycloak/CodeFlowAuthorizationTest.java
+++ b/integration-tests/oidc-wiremock-logout/src/test/java/io/quarkus/it/keycloak/CodeFlowAuthorizationTest.java
@@ -1,6 +1,5 @@
 package io.quarkus.it.keycloak;
 
-import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -8,7 +7,6 @@
 import java.io.IOException;
 import java.net.URI;
 
-import org.hamcrest.Matchers;
 import org.htmlunit.SilentCssErrorHandler;
 import org.htmlunit.TextPage;
 import org.htmlunit.WebClient;
@@ -39,13 +37,13 @@ public void testCodeFlowFormPostAndBackChannelLogout() throws IOException {
             form.getInputByName("username").type("alice");
             form.getInputByName("password").type("alice");
 
-            HtmlPage afterClick = form.getInputByValue("login").click();
+            TextPage textPage = form.getInputByValue("login").click();
 
-            assertThat(afterClick.getWebResponse().getContentAsString(), Matchers.containsString("Submit This Form"));
+            assertEquals("alice", textPage.getContent());
 
             assertNotNull(getSessionCookie(webClient, "code-flow-form-post"));
 
-            TextPage textPage = webClient.getPage("http://localhost:8081/service/code-flow-form-post");
+            textPage = webClient.getPage("http://localhost:8081/service/code-flow-form-post");
             assertEquals("alice", textPage.getContent());
 
             // Session is still active
diff --git a/integration-tests/oidc-wiremock/src/test/java/io/quarkus/it/keycloak/CodeFlowAuthorizationTest.java b/integration-tests/oidc-wiremock/src/test/java/io/quarkus/it/keycloak/CodeFlowAuthorizationTest.java
index 0741e298c5236..3feda8cc8e90f 100644
--- a/integration-tests/oidc-wiremock/src/test/java/io/quarkus/it/keycloak/CodeFlowAuthorizationTest.java
+++ b/integration-tests/oidc-wiremock/src/test/java/io/quarkus/it/keycloak/CodeFlowAuthorizationTest.java
@@ -11,7 +11,6 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching;
 import static org.awaitility.Awaitility.given;
-import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -220,13 +219,13 @@ public void testCodeFlowFormPostAndBackChannelLogout() throws IOException {
             form.getInputByName("username").type("alice");
             form.getInputByName("password").type("alice");
 
-            HtmlPage afterClick = form.getInputByValue("login").click();
+            TextPage textPage = form.getInputByValue("login").click();
 
-            assertThat(afterClick.getWebResponse().getContentAsString(), Matchers.containsString("Submit This Form"));
+            assertEquals("alice", textPage.getContent());
 
             assertNotNull(getSessionCookie(webClient, "code-flow-form-post"));
 
-            TextPage textPage = webClient.getPage("http://localhost:8081/code-flow-form-post");
+            textPage = webClient.getPage("http://localhost:8081/code-flow-form-post");
             assertEquals("alice", textPage.getContent());
 
             // Session is still active
@@ -279,13 +278,13 @@ public void testCodeFlowFormPostAndFrontChannelLogout() throws Exception {
             form.getInputByName("username").type("alice");
             form.getInputByName("password").type("alice");
 
-            HtmlPage afterClick = form.getInputByValue("login").click();
+            TextPage textPage = form.getInputByValue("login").click();
 
-            assertThat(afterClick.getWebResponse().getContentAsString(), Matchers.containsString("Submit This Form"));
+            assertEquals("alice", textPage.getContent());
 
             assertNotNull(getSessionCookie(webClient, "code-flow-form-post"));
 
-            TextPage textPage = webClient.getPage("http://localhost:8081/code-flow-form-post");
+            textPage = webClient.getPage("http://localhost:8081/code-flow-form-post");
             assertEquals("alice", textPage.getContent());
 
             // Session is still active