diff --git a/servlet/java-configuration/authentication/preauth/build.gradle b/servlet/java-configuration/authentication/preauth/build.gradle
index 57a935c..5703fab 100644
--- a/servlet/java-configuration/authentication/preauth/build.gradle
+++ b/servlet/java-configuration/authentication/preauth/build.gradle
@@ -30,7 +30,7 @@ dependencies {
 
 	testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 
-	integTestImplementation "org.seleniumhq.selenium:htmlunit-driver:2.44.0"
+	integTestImplementation "org.seleniumhq.selenium:htmlunit-driver:3.64.0"
 }
 
 tasks.withType(Test).configureEach {
diff --git a/servlet/java-configuration/authentication/remember-me/build.gradle b/servlet/java-configuration/authentication/remember-me/build.gradle
index 57a935c..5703fab 100644
--- a/servlet/java-configuration/authentication/remember-me/build.gradle
+++ b/servlet/java-configuration/authentication/remember-me/build.gradle
@@ -30,7 +30,7 @@ dependencies {
 
 	testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 
-	integTestImplementation "org.seleniumhq.selenium:htmlunit-driver:2.44.0"
+	integTestImplementation "org.seleniumhq.selenium:htmlunit-driver:3.64.0"
 }
 
 tasks.withType(Test).configureEach {
diff --git a/servlet/java-configuration/authentication/username-password/form/build.gradle b/servlet/java-configuration/authentication/username-password/form/build.gradle
index 27928f9..a6fc815 100644
--- a/servlet/java-configuration/authentication/username-password/form/build.gradle
+++ b/servlet/java-configuration/authentication/username-password/form/build.gradle
@@ -30,7 +30,7 @@ dependencies {
 
 	testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 
-	integTestImplementation "org.seleniumhq.selenium:htmlunit-driver:2.44.0"
+	integTestImplementation "org.seleniumhq.selenium:htmlunit-driver:3.64.0"
 }
 
 tasks.withType(Test).configureEach {
diff --git a/servlet/java-configuration/authentication/username-password/in-memory/build.gradle b/servlet/java-configuration/authentication/username-password/in-memory/build.gradle
index 57a935c..5703fab 100644
--- a/servlet/java-configuration/authentication/username-password/in-memory/build.gradle
+++ b/servlet/java-configuration/authentication/username-password/in-memory/build.gradle
@@ -30,7 +30,7 @@ dependencies {
 
 	testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 
-	integTestImplementation "org.seleniumhq.selenium:htmlunit-driver:2.44.0"
+	integTestImplementation "org.seleniumhq.selenium:htmlunit-driver:3.64.0"
 }
 
 tasks.withType(Test).configureEach {
diff --git a/servlet/java-configuration/authentication/username-password/jdbc/build.gradle b/servlet/java-configuration/authentication/username-password/jdbc/build.gradle
index 6dc8025..bd8cc55 100644
--- a/servlet/java-configuration/authentication/username-password/jdbc/build.gradle
+++ b/servlet/java-configuration/authentication/username-password/jdbc/build.gradle
@@ -32,7 +32,7 @@ dependencies {
 
 	testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 
-	integTestImplementation "org.seleniumhq.selenium:htmlunit-driver:2.44.0"
+	integTestImplementation "org.seleniumhq.selenium:htmlunit-driver:3.64.0"
 }
 
 tasks.withType(Test).configureEach {
diff --git a/servlet/java-configuration/authentication/username-password/ldap/build.gradle b/servlet/java-configuration/authentication/username-password/ldap/build.gradle
index 0abd0c3..c6364bd 100644
--- a/servlet/java-configuration/authentication/username-password/ldap/build.gradle
+++ b/servlet/java-configuration/authentication/username-password/ldap/build.gradle
@@ -33,7 +33,7 @@ dependencies {
 
 	testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 
-	integTestImplementation "org.seleniumhq.selenium:htmlunit-driver:2.44.0"
+	integTestImplementation "org.seleniumhq.selenium:htmlunit-driver:3.64.0"
 }
 
 tasks.withType(Test).configureEach {
diff --git a/servlet/java-configuration/hello-mvc-security/build.gradle b/servlet/java-configuration/hello-mvc-security/build.gradle
index 27928f9..a6fc815 100644
--- a/servlet/java-configuration/hello-mvc-security/build.gradle
+++ b/servlet/java-configuration/hello-mvc-security/build.gradle
@@ -30,7 +30,7 @@ dependencies {
 
 	testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 
-	integTestImplementation "org.seleniumhq.selenium:htmlunit-driver:2.44.0"
+	integTestImplementation "org.seleniumhq.selenium:htmlunit-driver:3.64.0"
 }
 
 tasks.withType(Test).configureEach {
diff --git a/servlet/java-configuration/hello-security-explicit/build.gradle b/servlet/java-configuration/hello-security-explicit/build.gradle
index d4905bd..e68ea40 100644
--- a/servlet/java-configuration/hello-security-explicit/build.gradle
+++ b/servlet/java-configuration/hello-security-explicit/build.gradle
@@ -31,7 +31,7 @@ dependencies {
 
 	testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 
-	integTestImplementation "org.seleniumhq.selenium:htmlunit-driver:2.44.0"
+	integTestImplementation "org.seleniumhq.selenium:htmlunit-driver:3.64.0"
 }
 
 tasks.withType(Test).configureEach {
diff --git a/servlet/java-configuration/hello-security/build.gradle b/servlet/java-configuration/hello-security/build.gradle
index d4905bd..e68ea40 100644
--- a/servlet/java-configuration/hello-security/build.gradle
+++ b/servlet/java-configuration/hello-security/build.gradle
@@ -31,7 +31,7 @@ dependencies {
 
 	testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 
-	integTestImplementation "org.seleniumhq.selenium:htmlunit-driver:2.44.0"
+	integTestImplementation "org.seleniumhq.selenium:htmlunit-driver:3.64.0"
 }
 
 tasks.withType(Test).configureEach {
diff --git a/servlet/java-configuration/max-sessions/build.gradle b/servlet/java-configuration/max-sessions/build.gradle
index 57a935c..5703fab 100644
--- a/servlet/java-configuration/max-sessions/build.gradle
+++ b/servlet/java-configuration/max-sessions/build.gradle
@@ -30,7 +30,7 @@ dependencies {
 
 	testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 
-	integTestImplementation "org.seleniumhq.selenium:htmlunit-driver:2.44.0"
+	integTestImplementation "org.seleniumhq.selenium:htmlunit-driver:3.64.0"
 }
 
 tasks.withType(Test).configureEach {
diff --git a/servlet/java-configuration/saml2/login/build.gradle b/servlet/java-configuration/saml2/login/build.gradle
index 2c3fb44..48a00ec 100644
--- a/servlet/java-configuration/saml2/login/build.gradle
+++ b/servlet/java-configuration/saml2/login/build.gradle
@@ -54,7 +54,7 @@ dependencies {
 	testImplementation "org.springframework:spring-test"
 	testImplementation "org.springframework.security:spring-security-test"
 	testImplementation("org.junit.jupiter:junit-jupiter-api")
-	testImplementation "org.seleniumhq.selenium:htmlunit-driver:2.44.0"
+	testImplementation "org.seleniumhq.selenium:htmlunit-driver:3.64.0"
 	testImplementation 'org.hamcrest:hamcrest:2.2'
 	testImplementation 'org.awaitility:awaitility:4.2.0'
 
diff --git a/servlet/java-configuration/saml2/login/src/integTest/java/example/Saml2JavaConfigurationITests.java b/servlet/java-configuration/saml2/login/src/integTest/java/example/Saml2JavaConfigurationITests.java
index 8e31aaa..4a7e9b9 100644
--- a/servlet/java-configuration/saml2/login/src/integTest/java/example/Saml2JavaConfigurationITests.java
+++ b/servlet/java-configuration/saml2/login/src/integTest/java/example/Saml2JavaConfigurationITests.java
@@ -72,7 +72,7 @@ public class Saml2JavaConfigurationITests {
 	void authenticationAttemptWhenValidThenShowsUserEmailAddress() throws Exception {
 		performLogin();
 		HtmlPage home = (HtmlPage) this.webClient.getCurrentWindow().getEnclosedPage();
-		assertThat(home.asText()).contains("You're email address is testuser@spring.security.saml");
+		assertThat(home.asNormalizedText()).contains("You're email address is testuser@spring.security.saml");
 	}
 
 	@Test
diff --git a/servlet/spring-boot/java/saml2/login-single-tenant/build.gradle b/servlet/spring-boot/java/saml2/login-single-tenant/build.gradle
index 02e7891..1297fe6 100644
--- a/servlet/spring-boot/java/saml2/login-single-tenant/build.gradle
+++ b/servlet/spring-boot/java/saml2/login-single-tenant/build.gradle
@@ -24,7 +24,7 @@ dependencies {
 	implementation 'org.springframework.security:spring-security-saml2-service-provider'
 	implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6'
 
-	testImplementation 'net.sourceforge.htmlunit:htmlunit:2.44.0'
+	testImplementation 'net.sourceforge.htmlunit:htmlunit:2.64.0'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.springframework.security:spring-security-test'
 }
diff --git a/servlet/spring-boot/java/saml2/login-single-tenant/src/integTest/java/example/Saml2LoginApplicationITests.java b/servlet/spring-boot/java/saml2/login-single-tenant/src/integTest/java/example/Saml2LoginApplicationITests.java
index 5382a08..cc6b7ae 100644
--- a/servlet/spring-boot/java/saml2/login-single-tenant/src/integTest/java/example/Saml2LoginApplicationITests.java
+++ b/servlet/spring-boot/java/saml2/login-single-tenant/src/integTest/java/example/Saml2LoginApplicationITests.java
@@ -53,7 +53,7 @@ public class Saml2LoginApplicationITests {
 	void authenticationAttemptWhenValidThenShowsUserEmailAddress() throws Exception {
 		performLogin();
 		HtmlPage home = (HtmlPage) this.webClient.getCurrentWindow().getEnclosedPage();
-		assertThat(home.asText()).contains("You're email address is testuser@spring.security.saml");
+		assertThat(home.asNormalizedText()).contains("You're email address is testuser@spring.security.saml");
 	}
 
 	@Test
diff --git a/servlet/spring-boot/java/saml2/refreshable-metadata/build.gradle b/servlet/spring-boot/java/saml2/refreshable-metadata/build.gradle
index 02e7891..1297fe6 100644
--- a/servlet/spring-boot/java/saml2/refreshable-metadata/build.gradle
+++ b/servlet/spring-boot/java/saml2/refreshable-metadata/build.gradle
@@ -24,7 +24,7 @@ dependencies {
 	implementation 'org.springframework.security:spring-security-saml2-service-provider'
 	implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6'
 
-	testImplementation 'net.sourceforge.htmlunit:htmlunit:2.44.0'
+	testImplementation 'net.sourceforge.htmlunit:htmlunit:2.64.0'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.springframework.security:spring-security-test'
 }
diff --git a/servlet/spring-boot/java/saml2/refreshable-metadata/src/integTest/java/example/Saml2LoginApplicationITests.java b/servlet/spring-boot/java/saml2/refreshable-metadata/src/integTest/java/example/Saml2LoginApplicationITests.java
index b73e69c..0252cfd 100644
--- a/servlet/spring-boot/java/saml2/refreshable-metadata/src/integTest/java/example/Saml2LoginApplicationITests.java
+++ b/servlet/spring-boot/java/saml2/refreshable-metadata/src/integTest/java/example/Saml2LoginApplicationITests.java
@@ -52,7 +52,7 @@ public class Saml2LoginApplicationITests {
 	void authenticationAttemptWhenValidThenShowsUserEmailAddress() throws Exception {
 		performLogin();
 		HtmlPage home = (HtmlPage) this.webClient.getCurrentWindow().getEnclosedPage();
-		assertThat(home.asText()).contains("You're email address is testuser@spring.security.saml");
+		assertThat(home.asNormalizedText()).contains("You're email address is testuser@spring.security.saml");
 	}
 
 	private void performLogin() throws Exception {
diff --git a/servlet/xml/java/contacts/build.gradle b/servlet/xml/java/contacts/build.gradle
index 660c554..8c419d8 100644
--- a/servlet/xml/java/contacts/build.gradle
+++ b/servlet/xml/java/contacts/build.gradle
@@ -46,7 +46,7 @@ dependencies {
 
 	testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 
-	integTestImplementation "org.seleniumhq.selenium:htmlunit-driver:2.44.0"
+	integTestImplementation "org.seleniumhq.selenium:htmlunit-driver:3.64.0"
 }
 
 tasks.withType(Test).configureEach {
diff --git a/servlet/xml/java/helloworld/build.gradle b/servlet/xml/java/helloworld/build.gradle
index a77bf10..02ef07c 100644
--- a/servlet/xml/java/helloworld/build.gradle
+++ b/servlet/xml/java/helloworld/build.gradle
@@ -32,7 +32,7 @@ dependencies {
 
 	testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 
-	integTestImplementation "org.seleniumhq.selenium:htmlunit-driver:2.44.0"
+	integTestImplementation "org.seleniumhq.selenium:htmlunit-driver:3.64.0"
 }
 
 tasks.withType(Test).configureEach {
diff --git a/servlet/xml/java/saml2/login-logout/build.gradle b/servlet/xml/java/saml2/login-logout/build.gradle
index 96efcf7..3faa759 100644
--- a/servlet/xml/java/saml2/login-logout/build.gradle
+++ b/servlet/xml/java/saml2/login-logout/build.gradle
@@ -35,7 +35,7 @@ dependencies {
 	testImplementation "org.springframework:spring-test"
 	testImplementation "org.springframework.security:spring-security-test"
 	testImplementation "org.junit.jupiter:junit-jupiter-api"
-	testImplementation 'net.sourceforge.htmlunit:htmlunit:2.44.0'
+	testImplementation 'net.sourceforge.htmlunit:htmlunit:2.64.0'
 	testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 
 
diff --git a/servlet/xml/java/saml2/login-logout/src/integTest/java/example/Saml2XmlITests.java b/servlet/xml/java/saml2/login-logout/src/integTest/java/example/Saml2XmlITests.java
index fb72938..119f327 100644
--- a/servlet/xml/java/saml2/login-logout/src/integTest/java/example/Saml2XmlITests.java
+++ b/servlet/xml/java/saml2/login-logout/src/integTest/java/example/Saml2XmlITests.java
@@ -70,7 +70,7 @@ public class Saml2XmlITests {
 	void authenticationAttemptWhenValidThenShowsUserEmailAddress() throws Exception {
 		performLogin();
 		HtmlPage home = (HtmlPage) this.webClient.getCurrentWindow().getEnclosedPage();
-		assertThat(home.asText()).contains("You're email address is testuser@spring.security.saml");
+		assertThat(home.asNormalizedText()).contains("You're email address is testuser@spring.security.saml");
 	}
 
 	@Test