diff --git a/web/src/test/java/org/springframework/security/web/header/writers/ContentSecurityPolicyHeaderWriterTests.java b/web/src/test/java/org/springframework/security/web/header/writers/ContentSecurityPolicyHeaderWriterTests.java
index 374be7f2bc..e449f38cd4 100644
--- a/web/src/test/java/org/springframework/security/web/header/writers/ContentSecurityPolicyHeaderWriterTests.java
+++ b/web/src/test/java/org/springframework/security/web/header/writers/ContentSecurityPolicyHeaderWriterTests.java
@@ -93,7 +93,7 @@ public class ContentSecurityPolicyHeaderWriterTests {
 
 
 	@Test
-	public void writeHeaderOnlyIfNotPresentContentSecurityPolicyHeader(){
+	public void writeContentSecurityPolicyHeaderWhenNotPresent() {
 		String value = new String("value");
 		this.response.setHeader(CONTENT_SECURITY_POLICY_HEADER, value);
 		this.writer.writeHeaders(this.request, this.response);
@@ -101,7 +101,7 @@ public class ContentSecurityPolicyHeaderWriterTests {
 	}
 
 	@Test
-	public void writeHeaderOnlyIfNotPresentContentSecurityPolicyReportOnlyHeader(){
+	public void writeContentSecurityPolicyReportOnlyHeaderWhenNotPresent() {
 		String value = new String("value");
 		this.response.setHeader(CONTENT_SECURITY_POLICY_REPORT_ONLY_HEADER, value);
 		this.writer.setReportOnly(true);
diff --git a/web/src/test/java/org/springframework/security/web/header/writers/HpkpHeaderWriterTests.java b/web/src/test/java/org/springframework/security/web/header/writers/HpkpHeaderWriterTests.java
index 24a9bbe0f7..edf2a9b302 100644
--- a/web/src/test/java/org/springframework/security/web/header/writers/HpkpHeaderWriterTests.java
+++ b/web/src/test/java/org/springframework/security/web/header/writers/HpkpHeaderWriterTests.java
@@ -15,8 +15,6 @@
  */
 package org.springframework.security.web.header.writers;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Collections;
@@ -25,9 +23,12 @@ import java.util.Map;
 
 import org.junit.Before;
 import org.junit.Test;
+
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 /**
  * @author Tim Ysewyn
  * @author Ankur Pathak
@@ -203,7 +204,7 @@ public class HpkpHeaderWriterTests {
 	}
 
 	@Test
-	public void writeHeaderOnlyIfNotPresentPublicKeyPins(){
+	public void writePublicKeyPinsHeaderOnlyWhenNotPresent() {
 		String value = new String("value");
 		this.response.setHeader(HPKP_HEADER_NAME, value);
 		this.writer.setReportOnly(false);
@@ -212,7 +213,7 @@ public class HpkpHeaderWriterTests {
 	}
 
 	@Test
-	public void writeHeaderOnlyIfNotPresentPublicKeyPinsReportOnly(){
+	public void writePublicKeyPinsReportOnlyHeaderWhenNotPresent() {
 		String value = new String("value");
 		this.response.setHeader(HPKP_RO_HEADER_NAME, value);
 		this.writer.setReportOnly(false);
diff --git a/web/src/test/java/org/springframework/security/web/header/writers/HstsHeaderWriterTests.java b/web/src/test/java/org/springframework/security/web/header/writers/HstsHeaderWriterTests.java
index de1f0558df..6e0fe64c76 100644
--- a/web/src/test/java/org/springframework/security/web/header/writers/HstsHeaderWriterTests.java
+++ b/web/src/test/java/org/springframework/security/web/header/writers/HstsHeaderWriterTests.java
@@ -15,14 +15,15 @@
  */
 package org.springframework.security.web.header.writers;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import org.junit.Before;
 import org.junit.Test;
+
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.security.web.util.matcher.AnyRequestMatcher;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 /**
  * @author Rob Winch
  * @author Ankur Pathak
@@ -154,7 +155,7 @@ public class HstsHeaderWriterTests {
 	}
 
 	@Test
-	public void writeHeaderOnlyIfNotPresent(){
+	public void writeHeaderWhenNotPresent() {
 		String value = new String("value");
 		this.response.setHeader(HSTS_HEADER_NAME, value);
 		this.writer.writeHeaders(this.request, this.response);
diff --git a/web/src/test/java/org/springframework/security/web/header/writers/ReferrerPolicyHeaderWriterTests.java b/web/src/test/java/org/springframework/security/web/header/writers/ReferrerPolicyHeaderWriterTests.java
index 48a8741ed2..8b76253add 100644
--- a/web/src/test/java/org/springframework/security/web/header/writers/ReferrerPolicyHeaderWriterTests.java
+++ b/web/src/test/java/org/springframework/security/web/header/writers/ReferrerPolicyHeaderWriterTests.java
@@ -69,7 +69,7 @@ public class ReferrerPolicyHeaderWriterTests {
 	}
 
 	@Test
-	public void writeHeaderOnlyIfNotPresent(){
+	public void writeHeaderWhenNotPresent() {
 		String value = new String("value");
 		this.response.setHeader(REFERRER_POLICY_HEADER, value);
 		this.writer.writeHeaders(this.request, this.response);
diff --git a/web/src/test/java/org/springframework/security/web/header/writers/StaticHeaderWriterTests.java b/web/src/test/java/org/springframework/security/web/header/writers/StaticHeaderWriterTests.java
index 841dd9a4f1..cdf7348e55 100644
--- a/web/src/test/java/org/springframework/security/web/header/writers/StaticHeaderWriterTests.java
+++ b/web/src/test/java/org/springframework/security/web/header/writers/StaticHeaderWriterTests.java
@@ -15,17 +15,18 @@
  */
 package org.springframework.security.web.header.writers;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import java.util.Arrays;
 import java.util.Collections;
 
 import org.junit.Before;
 import org.junit.Test;
+
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.security.web.header.Header;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 /**
  * Test for the {@code StaticHeadersWriter}
  *
@@ -98,7 +99,7 @@ public class StaticHeaderWriterTests {
 	}
 
 	@Test
-	public void writeHeaderOnlyIfNotPresent() {
+	public void writeHeaderWhenNotPresent() {
 		String pragmaValue = new String("pragmaValue");
 		String cacheControlValue = new String("cacheControlValue");
 		this.response.setHeader("Pragma", pragmaValue);
diff --git a/web/src/test/java/org/springframework/security/web/header/writers/XXssProtectionHeaderWriterTests.java b/web/src/test/java/org/springframework/security/web/header/writers/XXssProtectionHeaderWriterTests.java
index dc19e17c0f..2402b848bd 100644
--- a/web/src/test/java/org/springframework/security/web/header/writers/XXssProtectionHeaderWriterTests.java
+++ b/web/src/test/java/org/springframework/security/web/header/writers/XXssProtectionHeaderWriterTests.java
@@ -15,13 +15,14 @@
  */
 package org.springframework.security.web.header.writers;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import org.junit.Before;
 import org.junit.Test;
+
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 /**
  * @author Rob Winch
  * @author Ankur Pathak
@@ -92,7 +93,7 @@ public class XXssProtectionHeaderWriterTests {
 	}
 
 	@Test
-	public void writeHeaderOnlyIfNotPresent(){
+	public void writeHeaderWhenNotPresent() {
 		String value = new String("value");
 		this.response.setHeader(XSS_PROTECTION_HEADER, value);
 		this.writer.writeHeaders(this.request, this.response);
diff --git a/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/XFrameOptionsHeaderWriterTests.java b/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/XFrameOptionsHeaderWriterTests.java
index 1e36e8ca86..3d88aa8fc8 100644
--- a/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/XFrameOptionsHeaderWriterTests.java
+++ b/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/XFrameOptionsHeaderWriterTests.java
@@ -16,18 +16,19 @@
 
 package org.springframework.security.web.header.writers.frameoptions;
 
-import org.junit.Test;
-import org.springframework.mock.web.MockHttpServletRequest;
-import org.springframework.mock.web.MockHttpServletResponse;
-
 import java.util.Arrays;
 import java.util.Collections;
 
+import org.junit.Test;
+
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockHttpServletResponse;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author Rob Winch
- * @author AnkurPathak
+ * @author Ankur Pathak
  * @since 5.0
  */
 public class XFrameOptionsHeaderWriterTests {
@@ -48,7 +49,7 @@ public class XFrameOptionsHeaderWriterTests {
 	}
 
 	@Test
-	public void writeHeaderOnlyIfNotPresent(){
+	public void writeHeaderWhenNotPresent() {
 		WhiteListedAllowFromStrategy whitelist = new WhiteListedAllowFromStrategy(Collections.singletonList("example.com"));
 		XFrameOptionsHeaderWriter writer = new XFrameOptionsHeaderWriter(whitelist);
 		String value = new String("value");