diff --git a/spring-context-support/src/test/java/org/springframework/cache/caffeine/CaffeineCacheManagerTests.java b/spring-context-support/src/test/java/org/springframework/cache/caffeine/CaffeineCacheManagerTests.java
index 59b6a0049e7..678bc6294b9 100644
--- a/spring-context-support/src/test/java/org/springframework/cache/caffeine/CaffeineCacheManagerTests.java
+++ b/spring-context-support/src/test/java/org/springframework/cache/caffeine/CaffeineCacheManagerTests.java
@@ -102,7 +102,7 @@ public class CaffeineCacheManagerTests {
 		assertEquals("value1", cache1x.get("key1").get());
 		cache1x.put("key2", 2);
 		assertEquals(2, cache1x.get("key2").get());
-		
+
 		cm.setAllowNullValues(true);
 		Cache cache1y = cm.getCache("c1");
 
diff --git a/spring-context-support/src/test/java/org/springframework/cache/caffeine/CaffeineCacheTests.java b/spring-context-support/src/test/java/org/springframework/cache/caffeine/CaffeineCacheTests.java
index 9dfed63728f..0fbed8b14ce 100644
--- a/spring-context-support/src/test/java/org/springframework/cache/caffeine/CaffeineCacheTests.java
+++ b/spring-context-support/src/test/java/org/springframework/cache/caffeine/CaffeineCacheTests.java
@@ -20,7 +20,6 @@ import com.github.benmanes.caffeine.cache.Caffeine;
 import org.junit.Before;
 import org.junit.Test;
 
-import org.springframework.cache.AbstractCacheTests;
 import org.springframework.cache.AbstractValueAdaptingCacheTests;
 import org.springframework.cache.Cache;
 
diff --git a/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheApiTests.java b/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheApiTests.java
index 0a495a493ea..c2086809faa 100644
--- a/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheApiTests.java
+++ b/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheApiTests.java
@@ -25,7 +25,6 @@ import javax.cache.spi.CachingProvider;
 import org.junit.After;
 import org.junit.Before;
 
-import org.springframework.cache.AbstractCacheTests;
 import org.springframework.cache.AbstractValueAdaptingCacheTests;
 
 /**
@@ -70,7 +69,8 @@ public class JCacheEhCacheApiTests extends AbstractValueAdaptingCacheTests<JCach
 		return getCache(true);
 	}
 
-	@Override protected JCacheCache getCache(boolean allowNull) {
+	@Override
+	protected JCacheCache getCache(boolean allowNull) {
 		return allowNull ? this.cache : this.cacheNoNull;
 	}
 
diff --git a/spring-context/src/test/java/org/springframework/cache/AbstractCacheTests.java b/spring-context/src/test/java/org/springframework/cache/AbstractCacheTests.java
index e72d2f1f85a..8920ef561b1 100644
--- a/spring-context/src/test/java/org/springframework/cache/AbstractCacheTests.java
+++ b/spring-context/src/test/java/org/springframework/cache/AbstractCacheTests.java
@@ -26,8 +26,6 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
-import org.springframework.cache.support.AbstractValueAdaptingCache;
-
 import static org.hamcrest.core.Is.*;
 import static org.junit.Assert.*;
 
diff --git a/spring-context/src/test/java/org/springframework/cache/AbstractValueAdaptingCacheTests.java b/spring-context/src/test/java/org/springframework/cache/AbstractValueAdaptingCacheTests.java
index 7d397590ad1..30054f1e515 100644
--- a/spring-context/src/test/java/org/springframework/cache/AbstractValueAdaptingCacheTests.java
+++ b/spring-context/src/test/java/org/springframework/cache/AbstractValueAdaptingCacheTests.java
@@ -23,7 +23,6 @@ import org.junit.rules.ExpectedException;
 import org.springframework.cache.support.AbstractValueAdaptingCache;
 
 /**
- *
  * @author Stephane Nicoll
  */
 public abstract class AbstractValueAdaptingCacheTests<T extends AbstractValueAdaptingCache>
diff --git a/spring-context/src/test/java/org/springframework/cache/concurrent/ConcurrentMapCacheManagerTests.java b/spring-context/src/test/java/org/springframework/cache/concurrent/ConcurrentMapCacheManagerTests.java
index 92e8754b750..c5cb86755c0 100644
--- a/spring-context/src/test/java/org/springframework/cache/concurrent/ConcurrentMapCacheManagerTests.java
+++ b/spring-context/src/test/java/org/springframework/cache/concurrent/ConcurrentMapCacheManagerTests.java
@@ -104,7 +104,7 @@ public class ConcurrentMapCacheManagerTests {
 		assertEquals("value1", cache1x.get("key1").get());
 		cache1x.put("key2", 2);
 		assertEquals(2, cache1x.get("key2").get());
-		
+
 		cm.setAllowNullValues(true);
 		Cache cache1y = cm.getCache("c1");
 
diff --git a/spring-context/src/test/java/org/springframework/cache/concurrent/ConcurrentMapCacheTests.java b/spring-context/src/test/java/org/springframework/cache/concurrent/ConcurrentMapCacheTests.java
index a27ed954350..c8495eaca26 100644
--- a/spring-context/src/test/java/org/springframework/cache/concurrent/ConcurrentMapCacheTests.java
+++ b/spring-context/src/test/java/org/springframework/cache/concurrent/ConcurrentMapCacheTests.java
@@ -62,7 +62,8 @@ public class ConcurrentMapCacheTests
 		return getCache(true);
 	}
 
-	@Override protected ConcurrentMapCache getCache(boolean allowNull) {
+	@Override
+	protected ConcurrentMapCache getCache(boolean allowNull) {
 		return allowNull ? this.cache : this.cacheNoNull;
 	}