diff --git a/build.gradle b/build.gradle
index 4ecff8b3..41140554 100644
--- a/build.gradle
+++ b/build.gradle
@@ -76,11 +76,12 @@ subprojects { subproject ->
 		checkstyle {
 			configFile = rootProject.file("config/checkstyle/checkstyle.xml")
 			configProperties = [ "checkstyle.config.dir" : rootProject.file("config/checkstyle") ]
-			toolVersion = "10.11.0"
+			toolVersion = "10.12.4"
 		}
 
 		dependencies {
-			checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:$javaFormatVersion")
+			checkstyle("com.puppycrawl.tools:checkstyle:${checkstyle.toolVersion}")
+			checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:${javaFormatVersion}")
 		}
 
 		plugins.withType(MavenPublishPlugin) {
diff --git a/spring-restdocs-core/src/test/java/org/springframework/restdocs/constraints/ConstraintDescriptionsTests.java b/spring-restdocs-core/src/test/java/org/springframework/restdocs/constraints/ConstraintDescriptionsTests.java
index a60f0b13..243dcf00 100644
--- a/spring-restdocs-core/src/test/java/org/springframework/restdocs/constraints/ConstraintDescriptionsTests.java
+++ b/spring-restdocs-core/src/test/java/org/springframework/restdocs/constraints/ConstraintDescriptionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2023 the original author or authors.
+ * Copyright 2014-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -58,7 +58,7 @@ public class ConstraintDescriptionsTests {
 		assertThat(this.constraintDescriptions.descriptionsForProperty("foo").size()).isEqualTo(0);
 	}
 
-	private static class Constrained {
+	private static final class Constrained {
 
 	}
 
diff --git a/spring-restdocs-core/src/test/java/org/springframework/restdocs/constraints/ResourceBundleConstraintDescriptionResolverTests.java b/spring-restdocs-core/src/test/java/org/springframework/restdocs/constraints/ResourceBundleConstraintDescriptionResolverTests.java
index 793363a6..4598cd1a 100644
--- a/spring-restdocs-core/src/test/java/org/springframework/restdocs/constraints/ResourceBundleConstraintDescriptionResolverTests.java
+++ b/spring-restdocs-core/src/test/java/org/springframework/restdocs/constraints/ResourceBundleConstraintDescriptionResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2023 the original author or authors.
+ * Copyright 2014-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -310,7 +310,7 @@ public class ResourceBundleConstraintDescriptionResolverTests {
 				AnnotationUtils.getAnnotationAttributes(annotations[0]));
 	}
 
-	private static class Constrained {
+	private static final class Constrained {
 
 		@AssertFalse
 		private boolean assertFalse;
diff --git a/spring-restdocs-core/src/test/java/org/springframework/restdocs/constraints/ValidatorConstraintResolverTests.java b/spring-restdocs-core/src/test/java/org/springframework/restdocs/constraints/ValidatorConstraintResolverTests.java
index 86a9c7ba..3d900b3c 100644
--- a/spring-restdocs-core/src/test/java/org/springframework/restdocs/constraints/ValidatorConstraintResolverTests.java
+++ b/spring-restdocs-core/src/test/java/org/springframework/restdocs/constraints/ValidatorConstraintResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -79,7 +79,7 @@ public class ValidatorConstraintResolverTests {
 		return new ConstraintCondition(annotation);
 	}
 
-	private static class ConstrainedFields {
+	private static final class ConstrainedFields {
 
 		@NotNull
 		private String single;
diff --git a/spring-restdocs-core/src/test/java/org/springframework/restdocs/templates/StandardTemplateResourceResolverTests.java b/spring-restdocs-core/src/test/java/org/springframework/restdocs/templates/StandardTemplateResourceResolverTests.java
index 0737db80..f7d0c9f7 100644
--- a/spring-restdocs-core/src/test/java/org/springframework/restdocs/templates/StandardTemplateResourceResolverTests.java
+++ b/spring-restdocs-core/src/test/java/org/springframework/restdocs/templates/StandardTemplateResourceResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2023 the original author or authors.
+ * Copyright 2014-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -120,7 +120,7 @@ public class StandardTemplateResourceResolverTests {
 		}
 	}
 
-	private static class TestClassLoader extends ClassLoader {
+	private static final class TestClassLoader extends ClassLoader {
 
 		private Map<String, URL> resources = new HashMap<>();
 
diff --git a/spring-restdocs-mockmvc/src/test/java/org/springframework/restdocs/mockmvc/MockMvcRestDocumentationIntegrationTests.java b/spring-restdocs-mockmvc/src/test/java/org/springframework/restdocs/mockmvc/MockMvcRestDocumentationIntegrationTests.java
index 93271caa..2e35c950 100644
--- a/spring-restdocs-mockmvc/src/test/java/org/springframework/restdocs/mockmvc/MockMvcRestDocumentationIntegrationTests.java
+++ b/spring-restdocs-mockmvc/src/test/java/org/springframework/restdocs/mockmvc/MockMvcRestDocumentationIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2023 the original author or authors.
+ * Copyright 2014-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -642,9 +642,9 @@ public class MockMvcRestDocumentationIntegrationTests {
 	/**
 	 * Test configuration that enables Spring MVC.
 	 */
-	@Configuration
 	@EnableWebMvc
-	static class TestConfiguration {
+	@Configuration(proxyBeanMethods = false)
+	static final class TestConfiguration {
 
 		@Bean
 		TestController testController() {
@@ -654,7 +654,7 @@ public class MockMvcRestDocumentationIntegrationTests {
 	}
 
 	@RestController
-	private static class TestController {
+	private static final class TestController {
 
 		@RequestMapping(value = "/", produces = "application/json;charset=UTF-8")
 		ResponseEntity<Map<String, Object>> foo() {