diff --git a/spring-web/src/test/java/org/springframework/web/service/invoker/HttpServiceMethodTests.java b/spring-web/src/test/java/org/springframework/web/service/invoker/HttpServiceMethodTests.java
index 05f0e84e88..00d710a12d 100644
--- a/spring-web/src/test/java/org/springframework/web/service/invoker/HttpServiceMethodTests.java
+++ b/spring-web/src/test/java/org/springframework/web/service/invoker/HttpServiceMethodTests.java
@@ -220,8 +220,8 @@ class HttpServiceMethodTests {
 				.isThrownBy(() -> this.proxyFactory.createClient(serviceInterface))
 				.withMessageContainingAll(
 					"Multiple @HttpExchange annotations found on " + serviceInterface,
-					"@" + HttpExchange.class.getName(),
-					"@" + ExtraHttpExchange.class.getName()
+					HttpExchange.class.getSimpleName(),
+					ExtraHttpExchange.class.getSimpleName()
 				);
 	}
 
@@ -234,8 +234,8 @@ class HttpServiceMethodTests {
 				.isThrownBy(() -> this.proxyFactory.createClient(serviceInterface))
 				.withMessageContainingAll(
 					"Multiple @HttpExchange annotations found on method " + method,
-					"@" + PostExchange.class.getName(),
-					"@" + PutExchange.class.getName()
+					PostExchange.class.getSimpleName(),
+					PutExchange.class.getSimpleName()
 				);
 	}
 
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerMappingTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerMappingTests.java
index 5636869a81..f39d13071b 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerMappingTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerMappingTests.java
@@ -163,8 +163,8 @@ class RequestMappingHandlerMappingTests {
 				.isThrownBy(() -> this.handlerMapping.getMappingForMethod(method, controllerClass))
 				.withMessageContainingAll(
 					"Multiple @HttpExchange annotations found on " + controllerClass,
-					"@" + HttpExchange.class.getName(),
-					"@" + ExtraHttpExchange.class.getName()
+					HttpExchange.class.getSimpleName(),
+					ExtraHttpExchange.class.getSimpleName()
 				);
 	}
 
@@ -179,8 +179,8 @@ class RequestMappingHandlerMappingTests {
 				.isThrownBy(() -> this.handlerMapping.getMappingForMethod(method, controllerClass))
 				.withMessageContainingAll(
 					"Multiple @HttpExchange annotations found on " + method,
-					"@" + PostExchange.class.getName(),
-					"@" + PutExchange.class.getName()
+					PostExchange.class.getSimpleName(),
+					PutExchange.class.getSimpleName()
 				);
 	}
 
@@ -196,8 +196,8 @@ class RequestMappingHandlerMappingTests {
 				.withMessageContainingAll(
 					controllerClass.getName(),
 					"is annotated with @RequestMapping and @HttpExchange annotations, but only one is allowed:",
-					"@" + RequestMapping.class.getName(),
-					"@" + HttpExchange.class.getName()
+					RequestMapping.class.getSimpleName(),
+					HttpExchange.class.getSimpleName()
 				);
 	}
 
@@ -213,8 +213,8 @@ class RequestMappingHandlerMappingTests {
 				.withMessageContainingAll(
 					method.toString(),
 					"is annotated with @RequestMapping and @HttpExchange annotations, but only one is allowed:",
-					"@" + PostMapping.class.getName(),
-					"@" + PostExchange.class.getName()
+					PostMapping.class.getSimpleName(),
+					PostExchange.class.getSimpleName()
 				);
 	}
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMappingTests.java
index b52fc844f4..bb13f9a5e6 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMappingTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMappingTests.java
@@ -289,8 +289,8 @@ class RequestMappingHandlerMappingTests {
 				.isThrownBy(() -> mapping.getMappingForMethod(method, controllerClass))
 				.withMessageContainingAll(
 					"Multiple @HttpExchange annotations found on " + controllerClass,
-					"@" + HttpExchange.class.getName(),
-					"@" + ExtraHttpExchange.class.getName()
+					HttpExchange.class.getSimpleName(),
+					ExtraHttpExchange.class.getSimpleName()
 				);
 	}
 
@@ -305,8 +305,8 @@ class RequestMappingHandlerMappingTests {
 				.isThrownBy(() -> mapping.getMappingForMethod(method, controllerClass))
 				.withMessageContainingAll(
 					"Multiple @HttpExchange annotations found on " + method,
-					"@" + PostExchange.class.getName(),
-					"@" + PutExchange.class.getName()
+					PostExchange.class.getSimpleName(),
+					PutExchange.class.getSimpleName()
 				);
 	}
 
@@ -322,8 +322,8 @@ class RequestMappingHandlerMappingTests {
 				.withMessageContainingAll(
 					controllerClass.getName(),
 					"is annotated with @RequestMapping and @HttpExchange annotations, but only one is allowed:",
-					"@" + RequestMapping.class.getName(),
-					"@" + HttpExchange.class.getName()
+					RequestMapping.class.getSimpleName(),
+					HttpExchange.class.getSimpleName()
 				);
 	}
 
@@ -339,8 +339,8 @@ class RequestMappingHandlerMappingTests {
 				.withMessageContainingAll(
 					method.toString(),
 					"is annotated with @RequestMapping and @HttpExchange annotations, but only one is allowed:",
-					"@" + PostMapping.class.getName(),
-					"@" + PostExchange.class.getName()
+					PostMapping.class.getSimpleName(),
+					PostExchange.class.getSimpleName()
 				);
 	}