diff --git a/spring-aop/src/test/java/org/springframework/aop/support/ClassUtilsTests.java b/spring-aop/src/test/java/org/springframework/aop/support/ClassUtilsTests.java
index f1fffbdf9cb..58b41a6500e 100644
--- a/spring-aop/src/test/java/org/springframework/aop/support/ClassUtilsTests.java
+++ b/spring-aop/src/test/java/org/springframework/aop/support/ClassUtilsTests.java
@@ -25,6 +25,8 @@ import org.springframework.util.ClassUtils;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
+ * AOP-specific tests for {@link ClassUtils}.
+ *
  * @author Colin Sampaleanu
  * @author Juergen Hoeller
  * @author Rob Harrop
diff --git a/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java b/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java
index ef73b41b001..107e0bd16b0 100644
--- a/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java
@@ -998,7 +998,6 @@ class ClassUtilsTests {
 	private interface MethodsInterface {
 
 		default void defaultPrint() {
-
 		}
 
 		void print(String messages);
@@ -1009,15 +1008,12 @@ class ClassUtilsTests {
 
 		@Override
 		public void print(String message) {
-
 		}
 
 		protected void protectedPrint() {
-
 		}
 
 		void packageAccessiblePrint() {
-
 		}
 	}
 
@@ -1026,14 +1022,11 @@ class ClassUtilsTests {
 
 		@Override
 		protected void protectedPrint() {
-
 		}
 
 		@Override
 		public void packageAccessiblePrint() {
-
 		}
-
 	}
 
 	private interface PrivateInterface {
diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTests.java
index 4c5c1e6cf87..6c839401533 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTests.java
@@ -175,9 +175,9 @@ class Jaxb2RootElementHttpMessageConverterTests {
 				]>
 				<rootElement><external>&lol9;</external></rootElement>""";
 		MockHttpInputMessage inputMessage = new MockHttpInputMessage(content.getBytes(StandardCharsets.UTF_8));
-		assertThatExceptionOfType(HttpMessageNotReadableException.class).isThrownBy(() ->
-				this.converter.read(RootElement.class, inputMessage))
-			.withMessageContaining("DOCTYPE");
+		assertThatExceptionOfType(HttpMessageNotReadableException.class)
+				.isThrownBy(() -> this.converter.read(RootElement.class, inputMessage))
+				.withMessageContaining("DOCTYPE");
 	}
 
 	@Test
@@ -188,13 +188,13 @@ class Jaxb2RootElementHttpMessageConverterTests {
 				.as("Invalid content-type").isEqualTo(MediaType.APPLICATION_XML);
 		DifferenceEvaluator ev = chain(Default, downgradeDifferencesToEqual(XML_STANDALONE));
 		assertThat(XmlContent.of(outputMessage.getBodyAsString(StandardCharsets.UTF_8)))
-			.isSimilarTo("<rootElement><type s=\"Hello World\"/></rootElement>", ev);
+				.isSimilarTo("<rootElement><type s=\"Hello World\"/></rootElement>", ev);
 	}
 
 	@Test
 	void writeJaxbElementRootElement() throws Exception {
 		MockHttpOutputMessage outputMessage = new MockHttpOutputMessage();
-		JAXBElement jaxbElement = new JAXBElement<>(new QName("custom"), MyCustomElement.class, new MyCustomElement("field1", "field2"));
+		JAXBElement<?> jaxbElement = new JAXBElement<>(new QName("custom"), MyCustomElement.class, new MyCustomElement("field1", "field2"));
 		converter.write(jaxbElement, null, outputMessage);
 		assertThat(outputMessage.getHeaders().getContentType())
 				.as("Invalid content-type").isEqualTo(MediaType.APPLICATION_XML);