diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/CrossOrigin.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/CrossOrigin.java
index 360b0db220..9bd2925940 100644
--- a/spring-web/src/main/java/org/springframework/web/bind/annotation/CrossOrigin.java
+++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/CrossOrigin.java
@@ -39,13 +39,13 @@ import org.springframework.core.annotation.AliasFor;
 @Documented
 public @interface CrossOrigin {
 
-	static final String[] DEFAULT_ORIGIN = { "*" };
+	String[] DEFAULT_ORIGIN = { "*" };
 
-	static final String[] DEFAULT_ALLOWED_HEADERS = { "*" };
+	String[] DEFAULT_ALLOWED_HEADERS = { "*" };
 
-	static final boolean DEFAULT_ALLOW_CREDENTIALS = true;
+	boolean DEFAULT_ALLOW_CREDENTIALS = true;
 
-	static final long DEFAULT_MAX_AGE = 1800;
+	long DEFAULT_MAX_AGE = 1800;
 
 
 	/**
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java
index cbe11134ec..f716b3fc3a 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java
@@ -193,10 +193,10 @@ public class WebMvcConfigurationSupportTests {
 
 		DirectFieldAccessor fieldAccessor = new DirectFieldAccessor(adapter);
 		@SuppressWarnings("unchecked")
-		List<Object> interceptors = (List<Object>) fieldAccessor.getPropertyValue("requestResponseBodyAdvice");
-		assertEquals(2, interceptors.size());
-		assertEquals(JsonViewRequestBodyAdvice.class, interceptors.get(0).getClass());
-		assertEquals(JsonViewResponseBodyAdvice.class, interceptors.get(1).getClass());
+		List<Object> bodyAdvice = (List<Object>) fieldAccessor.getPropertyValue("requestResponseBodyAdvice");
+		assertEquals(2, bodyAdvice.size());
+		assertEquals(JsonViewRequestBodyAdvice.class, bodyAdvice.get(0).getClass());
+		assertEquals(JsonViewResponseBodyAdvice.class, bodyAdvice.get(1).getClass());
 	}
 
 	@Test