diff --git a/spring-aspects/src/test/java/org/springframework/cache/aspectj/AbstractCacheAnnotationTests.java b/spring-aspects/src/test/java/org/springframework/cache/aspectj/AbstractCacheAnnotationTests.java
index eed37f21ec0..ad4ac316cf9 100644
--- a/spring-aspects/src/test/java/org/springframework/cache/aspectj/AbstractCacheAnnotationTests.java
+++ b/spring-aspects/src/test/java/org/springframework/cache/aspectj/AbstractCacheAnnotationTests.java
@@ -416,11 +416,11 @@ public abstract class AbstractCacheAnnotationTests {
 		Integer three = 3;
 
 		Cache cache = this.cm.getCache("testCache");
-		assertThat((int) Integer.valueOf(service.conditionalUpdate(one).toString())).isEqualTo((int) one);
+		assertThat(Integer.parseInt(service.conditionalUpdate(one).toString())).isEqualTo((int) one);
 		assertThat(cache.get(one)).isNull();
 
-		assertThat((int) Integer.valueOf(service.conditionalUpdate(three).toString())).isEqualTo((int) three);
-		assertThat((int) Integer.valueOf(cache.get(three).get().toString())).isEqualTo((int) three);
+		assertThat(Integer.parseInt(service.conditionalUpdate(three).toString())).isEqualTo((int) three);
+		assertThat(Integer.parseInt(cache.get(three).get().toString())).isEqualTo((int) three);
 	}
 
 	protected void testMultiCache(CacheableService<?> service) {
diff --git a/spring-context/src/test/java/org/springframework/cache/config/EnableCachingIntegrationTests.java b/spring-context/src/test/java/org/springframework/cache/config/EnableCachingIntegrationTests.java
index 0d55805af6c..858d9c0d5b9 100644
--- a/spring-context/src/test/java/org/springframework/cache/config/EnableCachingIntegrationTests.java
+++ b/spring-context/src/test/java/org/springframework/cache/config/EnableCachingIntegrationTests.java
@@ -195,7 +195,7 @@ public class EnableCachingIntegrationTests {
 
 		@Bean
 		public Bar bar() {
-			return new Bar(Boolean.valueOf(env.getProperty("bar.enabled")));
+			return new Bar(Boolean.parseBoolean(env.getProperty("bar.enabled")));
 		}
 
 
diff --git a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/AbstractCacheAnnotationTests.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/AbstractCacheAnnotationTests.java
index 85f99eacce8..f03b4348423 100644
--- a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/AbstractCacheAnnotationTests.java
+++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/cache/AbstractCacheAnnotationTests.java
@@ -411,11 +411,11 @@ public abstract class AbstractCacheAnnotationTests {
 		Integer three = 3;
 
 		Cache cache = this.cm.getCache("testCache");
-		assertThat((int) Integer.valueOf(service.conditionalUpdate(one).toString())).isEqualTo((int) one);
+		assertThat(Integer.parseInt(service.conditionalUpdate(one).toString())).isEqualTo((int) one);
 		assertThat(cache.get(one)).isNull();
 
-		assertThat((int) Integer.valueOf(service.conditionalUpdate(three).toString())).isEqualTo((int) three);
-		assertThat((int) Integer.valueOf(cache.get(three).get().toString())).isEqualTo((int) three);
+		assertThat(Integer.parseInt(service.conditionalUpdate(three).toString())).isEqualTo((int) three);
+		assertThat(Integer.parseInt(cache.get(three).get().toString())).isEqualTo((int) three);
 	}
 
 	protected void testMultiCache(CacheableService<?> service) {
diff --git a/spring-core/src/test/java/org/springframework/util/xml/TransformerUtilsTests.java b/spring-core/src/test/java/org/springframework/util/xml/TransformerUtilsTests.java
index 411f921ed82..b4de128c01c 100644
--- a/spring-core/src/test/java/org/springframework/util/xml/TransformerUtilsTests.java
+++ b/spring-core/src/test/java/org/springframework/util/xml/TransformerUtilsTests.java
@@ -55,7 +55,7 @@ class TransformerUtilsTests {
 	void enableIndentingSunnyDayWithCustomKosherIndentAmount() throws Exception {
 		final String indentAmountProperty = "10";
 		Transformer transformer = new StubTransformer();
-		TransformerUtils.enableIndenting(transformer, Integer.valueOf(indentAmountProperty));
+		TransformerUtils.enableIndenting(transformer, Integer.parseInt(indentAmountProperty));
 		String indent = transformer.getOutputProperty(OutputKeys.INDENT);
 		assertThat(indent).isNotNull();
 		assertThat(indent).isEqualTo("yes");
diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/SockJsUrlInfoTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/SockJsUrlInfoTests.java
index 1297b00af0f..8d74fc48949 100644
--- a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/SockJsUrlInfoTests.java
+++ b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/SockJsUrlInfoTests.java
@@ -34,7 +34,7 @@ public class SockJsUrlInfoTests {
 	@Test
 	public void serverId() throws Exception {
 		SockJsUrlInfo info = new SockJsUrlInfo(new URI("https://example.com"));
-		int serverId = Integer.valueOf(info.getServerId());
+		int serverId = Integer.parseInt(info.getServerId());
 		assertThat(serverId >= 0 && serverId < 1000).as("Invalid serverId: " + serverId).isTrue();
 	}