diff --git a/build.gradle b/build.gradle
index 5a799cce8..c18811502 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ import io.spring.javaformat.gradle.tasks.Format
 
 plugins {
 	id "checkstyle"
-	id "io.spring.javaformat" version "0.0.42"
+	id "io.spring.javaformat" version "0.0.47"
 	id 'io.spring.nohttp' version '0.0.11'
 }
 
@@ -12,7 +12,7 @@ allprojects {
 	apply plugin: 'io.spring.javaformat'
 
 	dependencies {
-		checkstyle "io.spring.javaformat:spring-javaformat-checkstyle:0.0.42"
+		checkstyle "io.spring.javaformat:spring-javaformat-checkstyle:0.0.47"
 	}
 
 	// Ensure every test task has at least a single test
diff --git a/reactive/rsocket/hello-security/src/integTest/java/example/HelloRSocketApplicationITests.java b/reactive/rsocket/hello-security/src/integTest/java/example/HelloRSocketApplicationITests.java
index 2bff17d76..aeed61c9e 100644
--- a/reactive/rsocket/hello-security/src/integTest/java/example/HelloRSocketApplicationITests.java
+++ b/reactive/rsocket/hello-security/src/integTest/java/example/HelloRSocketApplicationITests.java
@@ -37,11 +37,10 @@
  *
  * @author Rob Winch
  * @author Eddú Meléndez
- * @since 5.0
  */
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @TestPropertySource(properties = "spring.rsocket.server.port=0")
-public class HelloRSocketApplicationITests {
+class HelloRSocketApplicationITests {
 
 	@Autowired
 	RSocketRequester.Builder requester;
diff --git a/reactive/webflux-fn/hello-security/src/test/java/example/HelloTests.java b/reactive/webflux-fn/hello-security/src/test/java/example/HelloTests.java
index 8fad5dc11..ee70030df 100644
--- a/reactive/webflux-fn/hello-security/src/test/java/example/HelloTests.java
+++ b/reactive/webflux-fn/hello-security/src/test/java/example/HelloTests.java
@@ -30,7 +30,7 @@
  */
 @SpringBootTest
 @AutoConfigureWebTestClient(timeout = "36000")
-public class HelloTests {
+class HelloTests {
 
 	@Autowired
 	WebTestClient rest;
diff --git a/reactive/webflux-fn/hello/src/test/java/example/HelloTests.java b/reactive/webflux-fn/hello/src/test/java/example/HelloTests.java
index 83c6e7429..743bfb3a3 100644
--- a/reactive/webflux-fn/hello/src/test/java/example/HelloTests.java
+++ b/reactive/webflux-fn/hello/src/test/java/example/HelloTests.java
@@ -29,7 +29,7 @@
  */
 @SpringBootTest
 @AutoConfigureWebTestClient(timeout = "36000")
-public class HelloTests {
+class HelloTests {
 
 	@Autowired
 	WebTestClient rest;
diff --git a/reactive/webflux/java/authentication/username-password/form/src/integTest/java/example/WebfluxFormApplicationITests.java b/reactive/webflux/java/authentication/username-password/form/src/integTest/java/example/WebfluxFormApplicationITests.java
index 487c509c2..67a85de83 100644
--- a/reactive/webflux/java/authentication/username-password/form/src/integTest/java/example/WebfluxFormApplicationITests.java
+++ b/reactive/webflux/java/authentication/username-password/form/src/integTest/java/example/WebfluxFormApplicationITests.java
@@ -31,10 +31,9 @@
  * Integration tests for WebFlux based form log in sample.
  *
  * @author Rob Winch
- * @since 5.0
  */
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-public class WebfluxFormApplicationITests {
+class WebfluxFormApplicationITests {
 
 	WebDriver driver;
 
diff --git a/reactive/webflux/java/authentication/x509/src/integTest/java/example/WebfluxX509ApplicationITest.java b/reactive/webflux/java/authentication/x509/src/integTest/java/example/WebfluxX509ApplicationITest.java
index c925a0a95..829acfa13 100644
--- a/reactive/webflux/java/authentication/x509/src/integTest/java/example/WebfluxX509ApplicationITest.java
+++ b/reactive/webflux/java/authentication/x509/src/integTest/java/example/WebfluxX509ApplicationITest.java
@@ -41,7 +41,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-public class WebfluxX509ApplicationITest {
+class WebfluxX509ApplicationITest {
 
 	@LocalServerPort
 	int port;
diff --git a/reactive/webflux/java/hello-security-explicit/src/integTest/java/example/HelloSecurityExplicitITests.java b/reactive/webflux/java/hello-security-explicit/src/integTest/java/example/HelloSecurityExplicitITests.java
index b39a9d5fc..cd1a071d7 100644
--- a/reactive/webflux/java/hello-security-explicit/src/integTest/java/example/HelloSecurityExplicitITests.java
+++ b/reactive/webflux/java/hello-security-explicit/src/integTest/java/example/HelloSecurityExplicitITests.java
@@ -33,7 +33,7 @@
  * @author Michael Simons
  */
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-public class HelloSecurityExplicitITests {
+class HelloSecurityExplicitITests {
 
 	private WebDriver driver;
 
diff --git a/reactive/webflux/java/hello-security-explicit/src/test/java/example/HelloSecurityTests.java b/reactive/webflux/java/hello-security-explicit/src/test/java/example/HelloSecurityTests.java
index e2dad974d..adf61aa2a 100644
--- a/reactive/webflux/java/hello-security-explicit/src/test/java/example/HelloSecurityTests.java
+++ b/reactive/webflux/java/hello-security-explicit/src/test/java/example/HelloSecurityTests.java
@@ -30,7 +30,7 @@
  */
 @SpringBootTest
 @AutoConfigureWebTestClient(timeout = "36000")
-public class HelloSecurityTests {
+class HelloSecurityTests {
 
 	@Autowired
 	WebTestClient rest;
diff --git a/reactive/webflux/java/hello-security/src/test/java/example/HelloSecurityTests.java b/reactive/webflux/java/hello-security/src/test/java/example/HelloSecurityTests.java
index db0de983e..4a8e6fb37 100644
--- a/reactive/webflux/java/hello-security/src/test/java/example/HelloSecurityTests.java
+++ b/reactive/webflux/java/hello-security/src/test/java/example/HelloSecurityTests.java
@@ -30,7 +30,7 @@
  */
 @SpringBootTest
 @AutoConfigureWebTestClient(timeout = "36000")
-public class HelloSecurityTests {
+class HelloSecurityTests {
 
 	@Autowired
 	WebTestClient rest;
diff --git a/reactive/webflux/java/hello/src/test/java/example/HelloTests.java b/reactive/webflux/java/hello/src/test/java/example/HelloTests.java
index fcd4c091d..84780c803 100644
--- a/reactive/webflux/java/hello/src/test/java/example/HelloTests.java
+++ b/reactive/webflux/java/hello/src/test/java/example/HelloTests.java
@@ -29,7 +29,7 @@
  */
 @SpringBootTest
 @AutoConfigureWebTestClient(timeout = "36000")
-public class HelloTests {
+class HelloTests {
 
 	@Autowired
 	WebTestClient rest;
diff --git a/reactive/webflux/java/method/src/integTest/java/example/HelloMethodApplicationITests.java b/reactive/webflux/java/method/src/integTest/java/example/HelloMethodApplicationITests.java
index 6fe3e93a3..552daa49b 100644
--- a/reactive/webflux/java/method/src/integTest/java/example/HelloMethodApplicationITests.java
+++ b/reactive/webflux/java/method/src/integTest/java/example/HelloMethodApplicationITests.java
@@ -30,11 +30,10 @@
  * Integration tests.
  *
  * @author Rob Winch
- * @since 5.0
  */
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @AutoConfigureWebTestClient
-public class HelloMethodApplicationITests {
+class HelloMethodApplicationITests {
 
 	@Autowired
 	WebTestClient rest;
diff --git a/reactive/webflux/java/method/src/test/java/example/HelloMethodApplicationTests.java b/reactive/webflux/java/method/src/test/java/example/HelloMethodApplicationTests.java
index 70ce8f8f5..0e43ae276 100644
--- a/reactive/webflux/java/method/src/test/java/example/HelloMethodApplicationTests.java
+++ b/reactive/webflux/java/method/src/test/java/example/HelloMethodApplicationTests.java
@@ -30,7 +30,7 @@
  */
 @SpringBootTest
 @AutoConfigureWebTestClient(timeout = "36000")
-public class HelloMethodApplicationTests {
+class HelloMethodApplicationTests {
 
 	@Autowired
 	WebTestClient rest;
diff --git a/reactive/webflux/java/method/src/test/java/example/MessageServiceTests.java b/reactive/webflux/java/method/src/test/java/example/MessageServiceTests.java
index f4e9a2d4f..281253687 100644
--- a/reactive/webflux/java/method/src/test/java/example/MessageServiceTests.java
+++ b/reactive/webflux/java/method/src/test/java/example/MessageServiceTests.java
@@ -29,7 +29,7 @@
  * @since 5.0
  */
 @SpringBootTest
-public class MessageServiceTests {
+class MessageServiceTests {
 
 	@Autowired
 	MessageService messages;
diff --git a/reactive/webflux/java/oauth2/login/src/integTest/java/example/OAuth2LoginApplicationTests.java b/reactive/webflux/java/oauth2/login/src/integTest/java/example/OAuth2LoginApplicationTests.java
index 440bcde58..4150c362a 100644
--- a/reactive/webflux/java/oauth2/login/src/integTest/java/example/OAuth2LoginApplicationTests.java
+++ b/reactive/webflux/java/oauth2/login/src/integTest/java/example/OAuth2LoginApplicationTests.java
@@ -38,7 +38,7 @@
  */
 @SpringBootTest
 @AutoConfigureWebTestClient(timeout = "36000")
-public class OAuth2LoginApplicationTests {
+class OAuth2LoginApplicationTests {
 
 	@Autowired
 	WebTestClient test;
diff --git a/reactive/webflux/java/oauth2/login/src/test/java/example/OAuth2LoginControllerTests.java b/reactive/webflux/java/oauth2/login/src/test/java/example/OAuth2LoginControllerTests.java
index 23eabc149..12e6576ca 100644
--- a/reactive/webflux/java/oauth2/login/src/test/java/example/OAuth2LoginControllerTests.java
+++ b/reactive/webflux/java/oauth2/login/src/test/java/example/OAuth2LoginControllerTests.java
@@ -43,7 +43,7 @@
  */
 @WebFluxTest(OAuth2LoginController.class)
 @ExtendWith(MockitoExtension.class)
-public class OAuth2LoginControllerTests {
+class OAuth2LoginControllerTests {
 
 	@Autowired
 	OAuth2LoginController controller;
diff --git a/reactive/webflux/java/oauth2/resource-server/src/integTest/java/example/ServerOAuth2ResourceServerApplicationITests.java b/reactive/webflux/java/oauth2/resource-server/src/integTest/java/example/ServerOAuth2ResourceServerApplicationITests.java
index 0c182f859..5aa1d45d2 100644
--- a/reactive/webflux/java/oauth2/resource-server/src/integTest/java/example/ServerOAuth2ResourceServerApplicationITests.java
+++ b/reactive/webflux/java/oauth2/resource-server/src/integTest/java/example/ServerOAuth2ResourceServerApplicationITests.java
@@ -33,12 +33,11 @@
  * Integration tests for resource server.
  *
  * @author Rob Winch
- * @since 5.1
  */
 @SpringBootTest
 @AutoConfigureWebTestClient(timeout = "36000")
 @ActiveProfiles("test")
-public class ServerOAuth2ResourceServerApplicationITests {
+class ServerOAuth2ResourceServerApplicationITests {
 
 	Consumer<HttpHeaders> noScopesToken = (http) -> http.setBearerAuth(
 			"eyJhbGciOiJSUzI1NiJ9.eyJzdWIiOiJzdWJqZWN0IiwiZXhwIjo0NjgzODA1MTI4fQ.ULEPdHG-MK5GlrTQMhgqcyug2brTIZaJIrahUeq9zaiwUSdW83fJ7W1IDd2Z3n4a25JY2uhEcoV95lMfccHR6y_2DLrNvfta22SumY9PEDF2pido54LXG6edIGgarnUbJdR4rpRe_5oRGVa8gDx8FnuZsNv6StSZHAzw5OsuevSTJ1UbJm4UfX3wiahFOQ2OI6G-r5TB2rQNdiPHuNyzG5yznUqRIZ7-GCoMqHMaC-1epKxiX8gYXRROuUYTtcMNa86wh7OVDmvwVmFioRcR58UWBRoO1XQexTtOQq_t8KYsrPZhb9gkyW8x2bAQF-d0J0EJY8JslaH6n4RBaZISww");
diff --git a/reactive/webflux/java/oauth2/resource-server/src/test/java/example/OAuth2ResourceServerControllerTests.java b/reactive/webflux/java/oauth2/resource-server/src/test/java/example/OAuth2ResourceServerControllerTests.java
index 2170f3647..bebd313cf 100644
--- a/reactive/webflux/java/oauth2/resource-server/src/test/java/example/OAuth2ResourceServerControllerTests.java
+++ b/reactive/webflux/java/oauth2/resource-server/src/test/java/example/OAuth2ResourceServerControllerTests.java
@@ -39,7 +39,7 @@
  */
 @WebFluxTest(OAuth2ResourceServerController.class)
 @Import(SecurityConfiguration.class)
-public class OAuth2ResourceServerControllerTests {
+class OAuth2ResourceServerControllerTests {
 
 	@Autowired
 	WebTestClient rest;
diff --git a/reactive/webflux/java/oauth2/webclient/src/test/java/example/OAuth2WebClientControllerTests.java b/reactive/webflux/java/oauth2/webclient/src/test/java/example/OAuth2WebClientControllerTests.java
index a1fd9fffc..1b71a9fab 100644
--- a/reactive/webflux/java/oauth2/webclient/src/test/java/example/OAuth2WebClientControllerTests.java
+++ b/reactive/webflux/java/oauth2/webclient/src/test/java/example/OAuth2WebClientControllerTests.java
@@ -38,7 +38,7 @@
 @WebFluxTest
 @Import({ SecurityConfiguration.class, OAuth2WebClientController.class })
 @AutoConfigureWebTestClient(timeout = "36000")
-public class OAuth2WebClientControllerTests {
+class OAuth2WebClientControllerTests {
 
 	private static MockWebServer web = new MockWebServer();
 
diff --git a/reactive/webflux/java/oauth2/webclient/src/test/java/example/OAuth2WebClientWebFluxApplicationTests.java b/reactive/webflux/java/oauth2/webclient/src/test/java/example/OAuth2WebClientWebFluxApplicationTests.java
index b1e0485d1..1e0dd4599 100644
--- a/reactive/webflux/java/oauth2/webclient/src/test/java/example/OAuth2WebClientWebFluxApplicationTests.java
+++ b/reactive/webflux/java/oauth2/webclient/src/test/java/example/OAuth2WebClientWebFluxApplicationTests.java
@@ -28,7 +28,7 @@
  */
 @SpringBootTest
 @AutoConfigureWebTestClient(timeout = "36000")
-public class OAuth2WebClientWebFluxApplicationTests {
+class OAuth2WebClientWebFluxApplicationTests {
 
 	@Autowired
 	private WebTestClient client;
diff --git a/reactive/webflux/java/oauth2/webclient/src/test/java/example/RegisteredOAuth2AuthorizedClientControllerTests.java b/reactive/webflux/java/oauth2/webclient/src/test/java/example/RegisteredOAuth2AuthorizedClientControllerTests.java
index 11149b7da..ab6f0c9c7 100644
--- a/reactive/webflux/java/oauth2/webclient/src/test/java/example/RegisteredOAuth2AuthorizedClientControllerTests.java
+++ b/reactive/webflux/java/oauth2/webclient/src/test/java/example/RegisteredOAuth2AuthorizedClientControllerTests.java
@@ -38,7 +38,7 @@
 @WebFluxTest
 @Import({ SecurityConfiguration.class, RegisteredOAuth2AuthorizedClientController.class })
 @AutoConfigureWebTestClient(timeout = "36000")
-public class RegisteredOAuth2AuthorizedClientControllerTests {
+class RegisteredOAuth2AuthorizedClientControllerTests {
 
 	private static MockWebServer web = new MockWebServer();
 
diff --git a/servlet/java-configuration/authentication/preauth/src/integTest/java/example/HelloWorldTests.java b/servlet/java-configuration/authentication/preauth/src/integTest/java/example/HelloWorldTests.java
index 44eb50e45..2b8a7a63e 100644
--- a/servlet/java-configuration/authentication/preauth/src/integTest/java/example/HelloWorldTests.java
+++ b/servlet/java-configuration/authentication/preauth/src/integTest/java/example/HelloWorldTests.java
@@ -29,7 +29,7 @@
  *
  * @author Michael Simons
  */
-public class HelloWorldTests {
+class HelloWorldTests {
 
 	private WebDriver driver;
 
diff --git a/servlet/java-configuration/authentication/remember-me/src/test/java/example/RememberMeTests.java b/servlet/java-configuration/authentication/remember-me/src/test/java/example/RememberMeTests.java
index 72d18a3c0..83098a664 100644
--- a/servlet/java-configuration/authentication/remember-me/src/test/java/example/RememberMeTests.java
+++ b/servlet/java-configuration/authentication/remember-me/src/test/java/example/RememberMeTests.java
@@ -38,7 +38,7 @@
 
 @ExtendWith(SpringExtension.class)
 @SpringJUnitWebConfig(classes = SecurityConfiguration.class)
-public class RememberMeTests {
+class RememberMeTests {
 
 	@Test
 	void loginWhenRemembermeThenAuthenticated(WebApplicationContext context) throws Exception {
diff --git a/servlet/java-configuration/authentication/username-password/form/src/integTest/java/example/FormLoginTests.java b/servlet/java-configuration/authentication/username-password/form/src/integTest/java/example/FormLoginTests.java
index 294be0a99..3a4ac7f7b 100644
--- a/servlet/java-configuration/authentication/username-password/form/src/integTest/java/example/FormLoginTests.java
+++ b/servlet/java-configuration/authentication/username-password/form/src/integTest/java/example/FormLoginTests.java
@@ -29,7 +29,7 @@
  *
  * @author Michael Simons
  */
-public class FormLoginTests {
+class FormLoginTests {
 
 	private WebDriver driver;
 
diff --git a/servlet/java-configuration/authentication/username-password/in-memory/src/integTest/java/example/InMemoryTests.java b/servlet/java-configuration/authentication/username-password/in-memory/src/integTest/java/example/InMemoryTests.java
index 6624e2b4c..3c6d28384 100644
--- a/servlet/java-configuration/authentication/username-password/in-memory/src/integTest/java/example/InMemoryTests.java
+++ b/servlet/java-configuration/authentication/username-password/in-memory/src/integTest/java/example/InMemoryTests.java
@@ -29,7 +29,7 @@
  *
  * @author Michael Simons
  */
-public class InMemoryTests {
+class InMemoryTests {
 
 	private WebDriver driver;
 
diff --git a/servlet/java-configuration/authentication/username-password/jdbc/src/integTest/java/example/JdbcTests.java b/servlet/java-configuration/authentication/username-password/jdbc/src/integTest/java/example/JdbcTests.java
index 589ebdcbe..75957dd4e 100644
--- a/servlet/java-configuration/authentication/username-password/jdbc/src/integTest/java/example/JdbcTests.java
+++ b/servlet/java-configuration/authentication/username-password/jdbc/src/integTest/java/example/JdbcTests.java
@@ -29,7 +29,7 @@
  *
  * @author Rob Winch
  */
-public class JdbcTests {
+class JdbcTests {
 
 	private WebDriver driver;
 
diff --git a/servlet/java-configuration/authentication/username-password/ldap/src/integTest/java/example/InMemoryTests.java b/servlet/java-configuration/authentication/username-password/ldap/src/integTest/java/example/InMemoryTests.java
index 6624e2b4c..3c6d28384 100644
--- a/servlet/java-configuration/authentication/username-password/ldap/src/integTest/java/example/InMemoryTests.java
+++ b/servlet/java-configuration/authentication/username-password/ldap/src/integTest/java/example/InMemoryTests.java
@@ -29,7 +29,7 @@
  *
  * @author Michael Simons
  */
-public class InMemoryTests {
+class InMemoryTests {
 
 	private WebDriver driver;
 
diff --git a/servlet/java-configuration/authentication/x509/src/integTest/java/example/X509Tests.java b/servlet/java-configuration/authentication/x509/src/integTest/java/example/X509Tests.java
index 7becae29b..bb7b505e8 100644
--- a/servlet/java-configuration/authentication/x509/src/integTest/java/example/X509Tests.java
+++ b/servlet/java-configuration/authentication/x509/src/integTest/java/example/X509Tests.java
@@ -50,7 +50,7 @@
  * @author Michael Simons
  */
 // @Disabled
-public class X509Tests {
+class X509Tests {
 
 	@Test
 	void notCertificateThenSslHandshakeException() {
diff --git a/servlet/java-configuration/data/src/test/java/example/SecurityMessageRepositoryTests.java b/servlet/java-configuration/data/src/test/java/example/SecurityMessageRepositoryTests.java
index 25804bc3f..ee8380782 100644
--- a/servlet/java-configuration/data/src/test/java/example/SecurityMessageRepositoryTests.java
+++ b/servlet/java-configuration/data/src/test/java/example/SecurityMessageRepositoryTests.java
@@ -35,7 +35,7 @@
  */
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = DataConfiguration.class)
-public class SecurityMessageRepositoryTests {
+class SecurityMessageRepositoryTests {
 
 	@Autowired
 	SecurityMessageRepository repository;
diff --git a/servlet/java-configuration/hello-mvc-security/src/integTest/java/example/HelloWorldTests.java b/servlet/java-configuration/hello-mvc-security/src/integTest/java/example/HelloWorldTests.java
index d2423e833..0dd710280 100644
--- a/servlet/java-configuration/hello-mvc-security/src/integTest/java/example/HelloWorldTests.java
+++ b/servlet/java-configuration/hello-mvc-security/src/integTest/java/example/HelloWorldTests.java
@@ -29,7 +29,7 @@
  *
  * @author Michael Simons
  */
-public class HelloWorldTests {
+class HelloWorldTests {
 
 	private WebDriver driver;
 
diff --git a/servlet/java-configuration/hello-security-explicit/src/integTest/java/example/HelloWorldTests.java b/servlet/java-configuration/hello-security-explicit/src/integTest/java/example/HelloWorldTests.java
index 9ea72ba8a..e8139660e 100644
--- a/servlet/java-configuration/hello-security-explicit/src/integTest/java/example/HelloWorldTests.java
+++ b/servlet/java-configuration/hello-security-explicit/src/integTest/java/example/HelloWorldTests.java
@@ -29,7 +29,7 @@
  *
  * @author Michael Simons
  */
-public class HelloWorldTests {
+class HelloWorldTests {
 
 	private WebDriver driver;
 
diff --git a/servlet/java-configuration/hello-security/src/integTest/java/example/HelloWorldTests.java b/servlet/java-configuration/hello-security/src/integTest/java/example/HelloWorldTests.java
index 9ea72ba8a..e8139660e 100644
--- a/servlet/java-configuration/hello-security/src/integTest/java/example/HelloWorldTests.java
+++ b/servlet/java-configuration/hello-security/src/integTest/java/example/HelloWorldTests.java
@@ -29,7 +29,7 @@
  *
  * @author Michael Simons
  */
-public class HelloWorldTests {
+class HelloWorldTests {
 
 	private WebDriver driver;
 
diff --git a/servlet/java-configuration/max-sessions/src/integTest/java/example/MaxSessionsITests.java b/servlet/java-configuration/max-sessions/src/integTest/java/example/MaxSessionsITests.java
index d9338af3e..35e645c10 100644
--- a/servlet/java-configuration/max-sessions/src/integTest/java/example/MaxSessionsITests.java
+++ b/servlet/java-configuration/max-sessions/src/integTest/java/example/MaxSessionsITests.java
@@ -29,7 +29,7 @@
  *
  * @author Rob Winch
  */
-public class MaxSessionsITests {
+class MaxSessionsITests {
 
 	private WebDriver user1;
 
diff --git a/servlet/java-configuration/max-sessions/src/test/java/example/MaxSessionTests.java b/servlet/java-configuration/max-sessions/src/test/java/example/MaxSessionTests.java
index 7982b5ce8..e0abfcb8e 100644
--- a/servlet/java-configuration/max-sessions/src/test/java/example/MaxSessionTests.java
+++ b/servlet/java-configuration/max-sessions/src/test/java/example/MaxSessionTests.java
@@ -35,7 +35,7 @@
 
 @ExtendWith(SpringExtension.class)
 @SpringJUnitWebConfig(classes = SecurityConfiguration.class)
-public class MaxSessionTests {
+class MaxSessionTests {
 
 	@Test
 	void run(WebApplicationContext context) throws Exception {
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 3de1eec6b..877438465 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
@@ -51,7 +51,7 @@
 @ContextConfiguration(classes = ApplicationConfiguration.class)
 @WebAppConfiguration
 @Disabled("gh-127")
-public class Saml2JavaConfigurationITests {
+class Saml2JavaConfigurationITests {
 
 	private MockMvc mvc;
 
diff --git a/servlet/spring-boot/java/aot/data/src/test/java/example/DataApplicationTests.java b/servlet/spring-boot/java/aot/data/src/test/java/example/DataApplicationTests.java
index 50e892deb..4f78bcd39 100644
--- a/servlet/spring-boot/java/aot/data/src/test/java/example/DataApplicationTests.java
+++ b/servlet/spring-boot/java/aot/data/src/test/java/example/DataApplicationTests.java
@@ -30,7 +30,7 @@
  * @author Rob Winch
  */
 @SpringBootTest
-public class DataApplicationTests {
+class DataApplicationTests {
 
 	@Autowired
 	MessageRepository repository;
diff --git a/servlet/spring-boot/java/authentication/mfa/x509+webauthn/src/test/java/example/X509WebAuthnMfaApplicationTests.java b/servlet/spring-boot/java/authentication/mfa/x509+webauthn/src/test/java/example/X509WebAuthnMfaApplicationTests.java
index 0ccdcd8c7..f90f3f05c 100644
--- a/servlet/spring-boot/java/authentication/mfa/x509+webauthn/src/test/java/example/X509WebAuthnMfaApplicationTests.java
+++ b/servlet/spring-boot/java/authentication/mfa/x509+webauthn/src/test/java/example/X509WebAuthnMfaApplicationTests.java
@@ -35,7 +35,7 @@
  */
 @SpringBootTest
 @AutoConfigureMockMvc
-public class X509WebAuthnMfaApplicationTests {
+class X509WebAuthnMfaApplicationTests {
 
 	@Autowired
 	private MockMvc mvc;
diff --git a/servlet/spring-boot/java/authentication/username-password/user-details-service/custom-user/src/integTest/java/example/HelloSecurityExplicitITests.java b/servlet/spring-boot/java/authentication/username-password/user-details-service/custom-user/src/integTest/java/example/HelloSecurityExplicitITests.java
index 1bc3c0c05..40cae7b9c 100644
--- a/servlet/spring-boot/java/authentication/username-password/user-details-service/custom-user/src/integTest/java/example/HelloSecurityExplicitITests.java
+++ b/servlet/spring-boot/java/authentication/username-password/user-details-service/custom-user/src/integTest/java/example/HelloSecurityExplicitITests.java
@@ -32,7 +32,7 @@
  */
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @AutoConfigureTestRestTemplate
-public class HelloSecurityExplicitITests {
+class HelloSecurityExplicitITests {
 
 	@Autowired
 	private TestRestTemplate rest;
diff --git a/servlet/spring-boot/java/authentication/username-password/user-details-service/custom-user/src/test/java/example/UserDetailsServiceApplicationTests.java b/servlet/spring-boot/java/authentication/username-password/user-details-service/custom-user/src/test/java/example/UserDetailsServiceApplicationTests.java
index 9ab010370..1292abc7b 100644
--- a/servlet/spring-boot/java/authentication/username-password/user-details-service/custom-user/src/test/java/example/UserDetailsServiceApplicationTests.java
+++ b/servlet/spring-boot/java/authentication/username-password/user-details-service/custom-user/src/test/java/example/UserDetailsServiceApplicationTests.java
@@ -34,7 +34,7 @@
  */
 @SpringBootTest
 @AutoConfigureMockMvc
-public class UserDetailsServiceApplicationTests {
+class UserDetailsServiceApplicationTests {
 
 	@Autowired
 	private MockMvc mockMvc;
diff --git a/servlet/spring-boot/java/data/src/test/java/example/DataApplicationTests.java b/servlet/spring-boot/java/data/src/test/java/example/DataApplicationTests.java
index 50e892deb..4f78bcd39 100644
--- a/servlet/spring-boot/java/data/src/test/java/example/DataApplicationTests.java
+++ b/servlet/spring-boot/java/data/src/test/java/example/DataApplicationTests.java
@@ -30,7 +30,7 @@
  * @author Rob Winch
  */
 @SpringBootTest
-public class DataApplicationTests {
+class DataApplicationTests {
 
 	@Autowired
 	MessageRepository repository;
diff --git a/servlet/spring-boot/java/hello-security-explicit/src/integTest/java/example/HelloSecurityExplicitITests.java b/servlet/spring-boot/java/hello-security-explicit/src/integTest/java/example/HelloSecurityExplicitITests.java
index b39a9d5fc..cd1a071d7 100644
--- a/servlet/spring-boot/java/hello-security-explicit/src/integTest/java/example/HelloSecurityExplicitITests.java
+++ b/servlet/spring-boot/java/hello-security-explicit/src/integTest/java/example/HelloSecurityExplicitITests.java
@@ -33,7 +33,7 @@
  * @author Michael Simons
  */
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-public class HelloSecurityExplicitITests {
+class HelloSecurityExplicitITests {
 
 	private WebDriver driver;
 
diff --git a/servlet/spring-boot/java/hello-security-explicit/src/test/java/example/HelloSecurityExplicitApplicationTests.java b/servlet/spring-boot/java/hello-security-explicit/src/test/java/example/HelloSecurityExplicitApplicationTests.java
index f6eff3579..249e15918 100644
--- a/servlet/spring-boot/java/hello-security-explicit/src/test/java/example/HelloSecurityExplicitApplicationTests.java
+++ b/servlet/spring-boot/java/hello-security-explicit/src/test/java/example/HelloSecurityExplicitApplicationTests.java
@@ -32,7 +32,7 @@
  */
 @SpringBootTest
 @AutoConfigureMockMvc
-public class HelloSecurityExplicitApplicationTests {
+class HelloSecurityExplicitApplicationTests {
 
 	@Autowired
 	private MockMvc mockMvc;
diff --git a/servlet/spring-boot/java/hello-security/src/test/java/example/HelloSecurityApplicationTests.java b/servlet/spring-boot/java/hello-security/src/test/java/example/HelloSecurityApplicationTests.java
index fd0eca284..6ea0e6ff4 100644
--- a/servlet/spring-boot/java/hello-security/src/test/java/example/HelloSecurityApplicationTests.java
+++ b/servlet/spring-boot/java/hello-security/src/test/java/example/HelloSecurityApplicationTests.java
@@ -32,7 +32,7 @@
  */
 @SpringBootTest
 @AutoConfigureMockMvc
-public class HelloSecurityApplicationTests {
+class HelloSecurityApplicationTests {
 
 	@Autowired
 	private MockMvc mockMvc;
diff --git a/servlet/spring-boot/java/hello/src/test/java/example/HelloApplicationTests.java b/servlet/spring-boot/java/hello/src/test/java/example/HelloApplicationTests.java
index 36829a148..be9c36f67 100644
--- a/servlet/spring-boot/java/hello/src/test/java/example/HelloApplicationTests.java
+++ b/servlet/spring-boot/java/hello/src/test/java/example/HelloApplicationTests.java
@@ -31,7 +31,7 @@
  */
 @SpringBootTest
 @AutoConfigureMockMvc
-public class HelloApplicationTests {
+class HelloApplicationTests {
 
 	@Autowired
 	private MockMvc mockMvc;
diff --git a/servlet/spring-boot/java/jwt/login/src/test/java/example/web/HelloControllerTests.java b/servlet/spring-boot/java/jwt/login/src/test/java/example/web/HelloControllerTests.java
index d1fe761d8..0feb25c12 100644
--- a/servlet/spring-boot/java/jwt/login/src/test/java/example/web/HelloControllerTests.java
+++ b/servlet/spring-boot/java/jwt/login/src/test/java/example/web/HelloControllerTests.java
@@ -38,7 +38,7 @@
  */
 @WebMvcTest({ HelloController.class, TokenController.class })
 @Import(RestConfig.class)
-public class HelloControllerTests {
+class HelloControllerTests {
 
 	@Autowired
 	MockMvc mvc;
diff --git a/servlet/spring-boot/java/ldap/src/test/java/example/web/HelloControllerTests.java b/servlet/spring-boot/java/ldap/src/test/java/example/web/HelloControllerTests.java
index 3c94a720d..a1108ada3 100644
--- a/servlet/spring-boot/java/ldap/src/test/java/example/web/HelloControllerTests.java
+++ b/servlet/spring-boot/java/ldap/src/test/java/example/web/HelloControllerTests.java
@@ -36,7 +36,7 @@
  */
 @WebMvcTest(HelloController.class)
 @Import(SecurityConfig.class)
-public class HelloControllerTests {
+class HelloControllerTests {
 
 	@Autowired
 	MockMvc mvc;
diff --git a/servlet/spring-boot/java/oauth2/authorization-server/src/integTest/java/example/OAuth2AuthorizationServerApplicationITests.java b/servlet/spring-boot/java/oauth2/authorization-server/src/integTest/java/example/OAuth2AuthorizationServerApplicationITests.java
index cf1a67b76..1344b074c 100644
--- a/servlet/spring-boot/java/oauth2/authorization-server/src/integTest/java/example/OAuth2AuthorizationServerApplicationITests.java
+++ b/servlet/spring-boot/java/oauth2/authorization-server/src/integTest/java/example/OAuth2AuthorizationServerApplicationITests.java
@@ -42,7 +42,7 @@
 @SpringBootTest
 @AutoConfigureMockMvc
 @ActiveProfiles("test")
-public class OAuth2AuthorizationServerApplicationITests {
+class OAuth2AuthorizationServerApplicationITests {
 
 	private static final String CLIENT_ID = "messaging-client";
 
diff --git a/servlet/spring-boot/java/oauth2/login/src/integTest/java/example/OAuth2LoginApplicationTests.java b/servlet/spring-boot/java/oauth2/login/src/integTest/java/example/OAuth2LoginApplicationTests.java
index 4afda1f5e..fee895ded 100644
--- a/servlet/spring-boot/java/oauth2/login/src/integTest/java/example/OAuth2LoginApplicationTests.java
+++ b/servlet/spring-boot/java/oauth2/login/src/integTest/java/example/OAuth2LoginApplicationTests.java
@@ -87,11 +87,10 @@
  * 2.0 Login leveraging the Authorization Code Grant flow.
  *
  * @author Joe Grandja
- * @since 5.0
  */
 @SpringBootTest(classes = { OAuth2LoginApplication.class, OAuth2LoginApplicationTests.SecurityTestConfig.class })
 @AutoConfigureMockMvc
-public class OAuth2LoginApplicationTests {
+class OAuth2LoginApplicationTests {
 
 	private static final String AUTHORIZATION_BASE_URI = "/oauth2/authorization";
 
diff --git a/servlet/spring-boot/java/oauth2/login/src/test/java/example/web/OAuth2LoginControllerTests.java b/servlet/spring-boot/java/oauth2/login/src/test/java/example/web/OAuth2LoginControllerTests.java
index a1161e01f..3b2c92b04 100644
--- a/servlet/spring-boot/java/oauth2/login/src/test/java/example/web/OAuth2LoginControllerTests.java
+++ b/servlet/spring-boot/java/oauth2/login/src/test/java/example/web/OAuth2LoginControllerTests.java
@@ -40,7 +40,7 @@
  * @author Josh Cummings
  */
 @WebMvcTest(OAuth2LoginController.class)
-public class OAuth2LoginControllerTests {
+class OAuth2LoginControllerTests {
 
 	@Autowired
 	MockMvc mvc;
diff --git a/servlet/spring-boot/java/oauth2/resource-server/hello-security/src/integTest/java/example/OAuth2ResourceServerApplicationITests.java b/servlet/spring-boot/java/oauth2/resource-server/hello-security/src/integTest/java/example/OAuth2ResourceServerApplicationITests.java
index c8fbf1e99..43028a0ae 100644
--- a/servlet/spring-boot/java/oauth2/resource-server/hello-security/src/integTest/java/example/OAuth2ResourceServerApplicationITests.java
+++ b/servlet/spring-boot/java/oauth2/resource-server/hello-security/src/integTest/java/example/OAuth2ResourceServerApplicationITests.java
@@ -42,7 +42,7 @@
 @SpringBootTest
 @AutoConfigureMockMvc
 @ActiveProfiles("test")
-public class OAuth2ResourceServerApplicationITests {
+class OAuth2ResourceServerApplicationITests {
 
 	String noScopesToken = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJzdWJqZWN0IiwiZXhwIjoyMTY0MjQ1ODgwLCJhdXRob3JpdGllcyI6WyJST0xFX1VTRVIiXSwianRpIjoiMDFkOThlZWEtNjc0MC00OGRlLTk4ODAtYzM5ZjgyMGZiNzVlIiwiY2xpZW50X2lkIjoibm9zY29wZXMiLCJzY29wZSI6WyJub25lIl19.VOzgGLOUuQ_R2Ur1Ke41VaobddhKgUZgto7Y3AGxst7SuxLQ4LgWwdSSDRx-jRvypjsCgYPbjAYLhn9nCbfwtCitkymUKUNKdebvVAI0y8YvliWTL5S-GiJD9dN8SSsXUla9A4xB_9Mt5JAlRpQotQSCLojVSKQmjhMpQWmYAlKVjnlImoRwQFPI4w3Ijn4G4EMTKWUYRfrD0-WNT9ZYWBeza6QgV6sraP7ToRB3eQLy2p04cU40X-RHLeYCsMBfxsMMh89CJff-9tn7VDKi1hAGc_Lp9yS9ZaItJuFJTjf8S_vsjVB1nBhvdS_6IED_m_fOU52KiGSO2qL6shxHvg";
 
diff --git a/servlet/spring-boot/java/oauth2/resource-server/hello-security/src/test/java/example/OAuth2ResourceServerControllerTests.java b/servlet/spring-boot/java/oauth2/resource-server/hello-security/src/test/java/example/OAuth2ResourceServerControllerTests.java
index 8802ff41a..0e4d71926 100644
--- a/servlet/spring-boot/java/oauth2/resource-server/hello-security/src/test/java/example/OAuth2ResourceServerControllerTests.java
+++ b/servlet/spring-boot/java/oauth2/resource-server/hello-security/src/test/java/example/OAuth2ResourceServerControllerTests.java
@@ -58,7 +58,7 @@
  */
 @WebMvcTest(OAuth2ResourceServerController.class)
 @Import(OAuth2ResourceServerSecurityConfiguration.class)
-public class OAuth2ResourceServerControllerTests {
+class OAuth2ResourceServerControllerTests {
 
 	@Autowired
 	MockMvc mockMvc;
diff --git a/servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/src/integTest/java/example/OAuth2MultitenancyResourceServerApplicationITests.java b/servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/src/integTest/java/example/OAuth2MultitenancyResourceServerApplicationITests.java
index 8cf14ba63..8b9e06d24 100644
--- a/servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/src/integTest/java/example/OAuth2MultitenancyResourceServerApplicationITests.java
+++ b/servlet/spring-boot/java/oauth2/resource-server/multi-tenancy/src/integTest/java/example/OAuth2MultitenancyResourceServerApplicationITests.java
@@ -42,7 +42,7 @@
 @SpringBootTest
 @AutoConfigureMockMvc
 @ActiveProfiles("test")
-public class OAuth2MultitenancyResourceServerApplicationITests {
+class OAuth2MultitenancyResourceServerApplicationITests {
 
 	String tenantOneNoScopesToken = "eyJhbGciOiJSUzI1NiJ9.eyJzdWIiOiJzdWJqZWN0IiwiZXhwIjo0NjgzODA1MTI4fQ.ULEPdHG-MK5GlrTQMhgqcyug2brTIZaJIrahUeq9zaiwUSdW83fJ7W1IDd2Z3n4a25JY2uhEcoV95lMfccHR6y_2DLrNvfta22SumY9PEDF2pido54LXG6edIGgarnUbJdR4rpRe_5oRGVa8gDx8FnuZsNv6StSZHAzw5OsuevSTJ1UbJm4UfX3wiahFOQ2OI6G-r5TB2rQNdiPHuNyzG5yznUqRIZ7-GCoMqHMaC-1epKxiX8gYXRROuUYTtcMNa86wh7OVDmvwVmFioRcR58UWBRoO1XQexTtOQq_t8KYsrPZhb9gkyW8x2bAQF-d0J0EJY8JslaH6n4RBaZISww";
 
diff --git a/servlet/spring-boot/java/oauth2/resource-server/opaque/src/integTest/java/example/OAuth2OpaqueTokenResourceServerApplicationITests.java b/servlet/spring-boot/java/oauth2/resource-server/opaque/src/integTest/java/example/OAuth2OpaqueTokenResourceServerApplicationITests.java
index 0ece88030..c2836c312 100644
--- a/servlet/spring-boot/java/oauth2/resource-server/opaque/src/integTest/java/example/OAuth2OpaqueTokenResourceServerApplicationITests.java
+++ b/servlet/spring-boot/java/oauth2/resource-server/opaque/src/integTest/java/example/OAuth2OpaqueTokenResourceServerApplicationITests.java
@@ -41,7 +41,7 @@
 @SpringBootTest
 @AutoConfigureMockMvc
 @ActiveProfiles("test")
-public class OAuth2OpaqueTokenResourceServerApplicationITests {
+class OAuth2OpaqueTokenResourceServerApplicationITests {
 
 	String noScopesToken = "00ed5855-1869-47a0-b0c9-0f3ce520aee7";
 
diff --git a/servlet/spring-boot/java/oauth2/resource-server/opaque/src/test/java/example/OAuth2ResourceServerControllerTests.java b/servlet/spring-boot/java/oauth2/resource-server/opaque/src/test/java/example/OAuth2ResourceServerControllerTests.java
index de5571390..35b2f711e 100644
--- a/servlet/spring-boot/java/oauth2/resource-server/opaque/src/test/java/example/OAuth2ResourceServerControllerTests.java
+++ b/servlet/spring-boot/java/oauth2/resource-server/opaque/src/test/java/example/OAuth2ResourceServerControllerTests.java
@@ -39,7 +39,7 @@
  */
 @WebMvcTest(OAuth2ResourceServerController.class)
 @Import(OAuth2ResourceServerSecurityConfiguration.class)
-public class OAuth2ResourceServerControllerTests {
+class OAuth2ResourceServerControllerTests {
 
 	@Autowired
 	MockMvc mvc;
diff --git a/servlet/spring-boot/java/oauth2/resource-server/static/src/integTest/java/example/OAuth2StaticResourceServerApplicationITests.java b/servlet/spring-boot/java/oauth2/resource-server/static/src/integTest/java/example/OAuth2StaticResourceServerApplicationITests.java
index 200a3a14f..b67b3f0df 100644
--- a/servlet/spring-boot/java/oauth2/resource-server/static/src/integTest/java/example/OAuth2StaticResourceServerApplicationITests.java
+++ b/servlet/spring-boot/java/oauth2/resource-server/static/src/integTest/java/example/OAuth2StaticResourceServerApplicationITests.java
@@ -41,7 +41,7 @@
 @SpringBootTest
 @AutoConfigureMockMvc
 @ActiveProfiles("test")
-public class OAuth2StaticResourceServerApplicationITests {
+class OAuth2StaticResourceServerApplicationITests {
 
 	String noScopesToken = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJzdWJqZWN0IiwiaWF0IjoxNTE2MjM5MDIyfQ.eB2c9xtg5wcCZxZ-o-sH4Mx1JGkqAZwH4_WS0UcDbj_nen0NPBj6CqOEPhr_LZDagb4mM6HoAPJywWWG8b_Ylnn5r2gWDzib2mb0kxIuAjnvVBrpzusw4ItTVvP_srv2DrwcisKYiKqU5X_3ka7MSVvKtswdLY3RXeCJ_S2W9go";
 
diff --git a/servlet/spring-boot/java/oauth2/restclient/src/integTest/java/example/OAuth2RestClientApplicationITests.java b/servlet/spring-boot/java/oauth2/restclient/src/integTest/java/example/OAuth2RestClientApplicationITests.java
index fa5954b32..d20869072 100644
--- a/servlet/spring-boot/java/oauth2/restclient/src/integTest/java/example/OAuth2RestClientApplicationITests.java
+++ b/servlet/spring-boot/java/oauth2/restclient/src/integTest/java/example/OAuth2RestClientApplicationITests.java
@@ -55,7 +55,7 @@
 @SpringBootTest
 @AutoConfigureMockMvc
 @ActiveProfiles("test")
-public class OAuth2RestClientApplicationITests {
+class OAuth2RestClientApplicationITests {
 
 	private static final String TOKEN_VALUE = "123abc";
 
diff --git a/servlet/spring-boot/java/oauth2/webclient/src/test/java/example/OAuth2WebClientApplicationTests.java b/servlet/spring-boot/java/oauth2/webclient/src/test/java/example/OAuth2WebClientApplicationTests.java
index c043f2b98..bd0632119 100644
--- a/servlet/spring-boot/java/oauth2/webclient/src/test/java/example/OAuth2WebClientApplicationTests.java
+++ b/servlet/spring-boot/java/oauth2/webclient/src/test/java/example/OAuth2WebClientApplicationTests.java
@@ -31,7 +31,7 @@
  */
 @SpringBootTest
 @AutoConfigureMockMvc
-public class OAuth2WebClientApplicationTests {
+class OAuth2WebClientApplicationTests {
 
 	@Autowired
 	private MockMvc mockMvc;
diff --git a/servlet/spring-boot/java/oauth2/webclient/src/test/java/example/OAuth2WebClientControllerTests.java b/servlet/spring-boot/java/oauth2/webclient/src/test/java/example/OAuth2WebClientControllerTests.java
index f4e73e44f..352df90cd 100644
--- a/servlet/spring-boot/java/oauth2/webclient/src/test/java/example/OAuth2WebClientControllerTests.java
+++ b/servlet/spring-boot/java/oauth2/webclient/src/test/java/example/OAuth2WebClientControllerTests.java
@@ -40,7 +40,7 @@
 @WebMvcTest
 @Import({ SecurityConfiguration.class, OAuth2WebClientController.class })
 @AutoConfigureMockMvc
-public class OAuth2WebClientControllerTests {
+class OAuth2WebClientControllerTests {
 
 	private static MockWebServer web = new MockWebServer();
 
diff --git a/servlet/spring-boot/java/oauth2/webclient/src/test/java/example/RegisteredOAuth2AuthorizedClientControllerTests.java b/servlet/spring-boot/java/oauth2/webclient/src/test/java/example/RegisteredOAuth2AuthorizedClientControllerTests.java
index b5784faac..bd7c048ac 100644
--- a/servlet/spring-boot/java/oauth2/webclient/src/test/java/example/RegisteredOAuth2AuthorizedClientControllerTests.java
+++ b/servlet/spring-boot/java/oauth2/webclient/src/test/java/example/RegisteredOAuth2AuthorizedClientControllerTests.java
@@ -40,7 +40,7 @@
 @WebMvcTest
 @Import({ SecurityConfiguration.class, RegisteredOAuth2AuthorizedClientController.class })
 @AutoConfigureMockMvc
-public class RegisteredOAuth2AuthorizedClientControllerTests {
+class RegisteredOAuth2AuthorizedClientControllerTests {
 
 	private static MockWebServer web = new MockWebServer();
 
diff --git a/servlet/spring-boot/java/observability/src/integTest/java/example/HelloObservabilityApplicationITests.java b/servlet/spring-boot/java/observability/src/integTest/java/example/HelloObservabilityApplicationITests.java
index f6bf5fc8c..7194f314f 100644
--- a/servlet/spring-boot/java/observability/src/integTest/java/example/HelloObservabilityApplicationITests.java
+++ b/servlet/spring-boot/java/observability/src/integTest/java/example/HelloObservabilityApplicationITests.java
@@ -40,11 +40,10 @@
  * Integration tests.
  *
  * @author Rob Winch
- * @since 5.0
  */
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @AutoConfigureTestRestTemplate
-public class HelloObservabilityApplicationITests {
+class HelloObservabilityApplicationITests {
 
 	@Autowired
 	TestRestTemplate rest;
diff --git a/servlet/spring-boot/java/observability/src/test/java/example/HelloObservabilityApplicationTests.java b/servlet/spring-boot/java/observability/src/test/java/example/HelloObservabilityApplicationTests.java
index a844e2cf4..62cf8469c 100644
--- a/servlet/spring-boot/java/observability/src/test/java/example/HelloObservabilityApplicationTests.java
+++ b/servlet/spring-boot/java/observability/src/test/java/example/HelloObservabilityApplicationTests.java
@@ -33,7 +33,7 @@
  */
 @SpringBootTest
 @AutoConfigureMockMvc
-public class HelloObservabilityApplicationTests {
+class HelloObservabilityApplicationTests {
 
 	@Autowired
 	MockMvc mvc;
diff --git a/servlet/spring-boot/java/observability/src/test/java/example/MessageServiceTests.java b/servlet/spring-boot/java/observability/src/test/java/example/MessageServiceTests.java
index d04111705..ed853b872 100644
--- a/servlet/spring-boot/java/observability/src/test/java/example/MessageServiceTests.java
+++ b/servlet/spring-boot/java/observability/src/test/java/example/MessageServiceTests.java
@@ -40,7 +40,7 @@
  * @author Josh Cummings
  */
 @SpringBootTest
-public class MessageServiceTests {
+class MessageServiceTests {
 
 	@Autowired
 	MessageService messages;
diff --git a/servlet/spring-boot/java/saml2/login/src/integTest/java/example/Saml2LoginApplicationITests.java b/servlet/spring-boot/java/saml2/login/src/integTest/java/example/Saml2LoginApplicationITests.java
index a6a91b7cd..a41c02dff 100644
--- a/servlet/spring-boot/java/saml2/login/src/integTest/java/example/Saml2LoginApplicationITests.java
+++ b/servlet/spring-boot/java/saml2/login/src/integTest/java/example/Saml2LoginApplicationITests.java
@@ -39,7 +39,7 @@
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
 @AutoConfigureMockMvc
-public class Saml2LoginApplicationITests {
+class Saml2LoginApplicationITests {
 
 	@LocalServerPort
 	int port;
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 93eda6bf7..d3044c1f4 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
@@ -39,7 +39,7 @@
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
 @AutoConfigureMockMvc
-public class Saml2LoginApplicationITests {
+class Saml2LoginApplicationITests {
 
 	@LocalServerPort
 	int port;
diff --git a/servlet/spring-boot/java/saml2/saml-extension-federation/src/integTest/java/example/SamlExtensionFederationApplicationITests.java b/servlet/spring-boot/java/saml2/saml-extension-federation/src/integTest/java/example/SamlExtensionFederationApplicationITests.java
index abb8db9e1..eb88c938f 100644
--- a/servlet/spring-boot/java/saml2/saml-extension-federation/src/integTest/java/example/SamlExtensionFederationApplicationITests.java
+++ b/servlet/spring-boot/java/saml2/saml-extension-federation/src/integTest/java/example/SamlExtensionFederationApplicationITests.java
@@ -39,7 +39,7 @@
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
 @AutoConfigureMockMvc
-public class SamlExtensionFederationApplicationITests {
+class SamlExtensionFederationApplicationITests {
 
 	@LocalServerPort
 	int port;
diff --git a/servlet/spring-boot/java/saml2/saml-extension-urls/src/integTest/java/example/SamlExtensionUrlsApplicationITests.java b/servlet/spring-boot/java/saml2/saml-extension-urls/src/integTest/java/example/SamlExtensionUrlsApplicationITests.java
index 91d22f00c..9ab74c6fd 100644
--- a/servlet/spring-boot/java/saml2/saml-extension-urls/src/integTest/java/example/SamlExtensionUrlsApplicationITests.java
+++ b/servlet/spring-boot/java/saml2/saml-extension-urls/src/integTest/java/example/SamlExtensionUrlsApplicationITests.java
@@ -43,7 +43,7 @@
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
 @AutoConfigureMockMvc
-public class SamlExtensionUrlsApplicationITests {
+class SamlExtensionUrlsApplicationITests {
 
 	@LocalServerPort
 	int port;
diff --git a/servlet/spring-boot/java/session-management/maximum-sessions-prevent-login/src/integTest/java/com/example/maximumsessionspreventlogin/MaximumSessionsPreventLoginTests.java b/servlet/spring-boot/java/session-management/maximum-sessions-prevent-login/src/integTest/java/com/example/maximumsessionspreventlogin/MaximumSessionsPreventLoginTests.java
index 8879a2d3d..da30e5f6c 100644
--- a/servlet/spring-boot/java/session-management/maximum-sessions-prevent-login/src/integTest/java/com/example/maximumsessionspreventlogin/MaximumSessionsPreventLoginTests.java
+++ b/servlet/spring-boot/java/session-management/maximum-sessions-prevent-login/src/integTest/java/com/example/maximumsessionspreventlogin/MaximumSessionsPreventLoginTests.java
@@ -34,7 +34,7 @@
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @Import(SecurityConfig.class)
 @AutoConfigureMockMvc
-public class MaximumSessionsPreventLoginTests {
+class MaximumSessionsPreventLoginTests {
 
 	@Autowired
 	private MockMvc mvc;
diff --git a/servlet/spring-boot/java/session-management/maximum-sessions/src/integTest/java/com/example/maximumsessions/MaximumSessionsTests.java b/servlet/spring-boot/java/session-management/maximum-sessions/src/integTest/java/com/example/maximumsessions/MaximumSessionsTests.java
index c69f5c929..8aca74e95 100644
--- a/servlet/spring-boot/java/session-management/maximum-sessions/src/integTest/java/com/example/maximumsessions/MaximumSessionsTests.java
+++ b/servlet/spring-boot/java/session-management/maximum-sessions/src/integTest/java/com/example/maximumsessions/MaximumSessionsTests.java
@@ -32,7 +32,7 @@
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @AutoConfigureMockMvc
-public class MaximumSessionsTests {
+class MaximumSessionsTests {
 
 	@Autowired
 	private MockMvc mvc;
diff --git a/servlet/xml/java/contacts/src/integTest/java/org/springframework/security/samples/ContactsTests.java b/servlet/xml/java/contacts/src/integTest/java/org/springframework/security/samples/ContactsTests.java
index faa558380..7fe15f464 100644
--- a/servlet/xml/java/contacts/src/integTest/java/org/springframework/security/samples/ContactsTests.java
+++ b/servlet/xml/java/contacts/src/integTest/java/org/springframework/security/samples/ContactsTests.java
@@ -30,7 +30,7 @@
  *
  * @author Michael Simons
  */
-public class ContactsTests {
+class ContactsTests {
 
 	private WebDriver driver;
 
diff --git a/servlet/xml/java/contacts/src/test/java/sample/contact/ContactManagerTests.java b/servlet/xml/java/contacts/src/test/java/sample/contact/ContactManagerTests.java
index 2c3b554de..410b4a5ae 100644
--- a/servlet/xml/java/contacts/src/test/java/sample/contact/ContactManagerTests.java
+++ b/servlet/xml/java/contacts/src/test/java/sample/contact/ContactManagerTests.java
@@ -42,7 +42,7 @@
 @ContextConfiguration(locations = { "/applicationContext-security.xml", "/applicationContext-common-authorization.xml",
 		"/applicationContext-common-business.xml" })
 @SpringJUnitWebConfig
-public class ContactManagerTests {
+class ContactManagerTests {
 
 	@Autowired
 	protected ContactManager contactManager;
diff --git a/servlet/xml/java/dms/src/test/java/sample/DmsIntegrationTests.java b/servlet/xml/java/dms/src/test/java/sample/DmsIntegrationTests.java
index c730665dd..9a55a8d0f 100644
--- a/servlet/xml/java/dms/src/test/java/sample/DmsIntegrationTests.java
+++ b/servlet/xml/java/dms/src/test/java/sample/DmsIntegrationTests.java
@@ -59,7 +59,7 @@
 		locations = { "classpath:applicationContext-dms-shared.xml", "classpath:applicationContext-dms-insecure.xml" })
 @ExtendWith(SpringExtension.class)
 @Transactional
-public class DmsIntegrationTests {
+class DmsIntegrationTests {
 
 	@Autowired
 	protected JdbcTemplate jdbcTemplate;
@@ -72,7 +72,7 @@ void clearContext() {
 		SecurityContextHolder.clearContext();
 	}
 
-	public void setDocumentDao(DocumentDao documentDao) {
+	void setDocumentDao(DocumentDao documentDao) {
 		this.documentDao = documentDao;
 	}
 
diff --git a/servlet/xml/java/dms/src/test/java/sample/SecureDmsIntegrationTests.java b/servlet/xml/java/dms/src/test/java/sample/SecureDmsIntegrationTests.java
index d5def4ba9..c19bf921f 100644
--- a/servlet/xml/java/dms/src/test/java/sample/SecureDmsIntegrationTests.java
+++ b/servlet/xml/java/dms/src/test/java/sample/SecureDmsIntegrationTests.java
@@ -30,7 +30,7 @@
  */
 @ContextConfiguration(
 		locations = { "classpath:applicationContext-dms-shared.xml", "classpath:applicationContext-dms-secure.xml" })
-public class SecureDmsIntegrationTests extends DmsIntegrationTests {
+class SecureDmsIntegrationTests extends DmsIntegrationTests {
 
 	@Override
 	@Test
diff --git a/servlet/xml/java/helloworld/src/integTest/java/org/springframework/security/samples/HelloWorldXmlTests.java b/servlet/xml/java/helloworld/src/integTest/java/org/springframework/security/samples/HelloWorldXmlTests.java
index 0886b6aca..873c51bd9 100644
--- a/servlet/xml/java/helloworld/src/integTest/java/org/springframework/security/samples/HelloWorldXmlTests.java
+++ b/servlet/xml/java/helloworld/src/integTest/java/org/springframework/security/samples/HelloWorldXmlTests.java
@@ -30,7 +30,7 @@
  *
  * @author Michael Simons
  */
-public class HelloWorldXmlTests {
+class HelloWorldXmlTests {
 
 	private WebDriver driver;
 
diff --git a/servlet/xml/java/preauth/src/test/java/sample/PreAuthXmlTests.java b/servlet/xml/java/preauth/src/test/java/sample/PreAuthXmlTests.java
index 8e700983a..598bcc077 100644
--- a/servlet/xml/java/preauth/src/test/java/sample/PreAuthXmlTests.java
+++ b/servlet/xml/java/preauth/src/test/java/sample/PreAuthXmlTests.java
@@ -31,7 +31,7 @@
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration("file:src/main/webapp/WEB-INF/applicationContext-security.xml")
 @WebAppConfiguration
-public class PreAuthXmlTests {
+class PreAuthXmlTests {
 
 	@Autowired
 	FilterChainProxy filterChainProxy;
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 6c52eb533..01e3311d3 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
@@ -50,7 +50,7 @@
 		"file:src/main/webapp/WEB-INF/spring/security.xml" })
 @WebAppConfiguration
 @Disabled("gh-127")
-public class Saml2XmlITests {
+class Saml2XmlITests {
 
 	private MockMvc mvc;