diff --git a/spring-test/src/main/java/org/springframework/test/context/MergedContextConfiguration.java b/spring-test/src/main/java/org/springframework/test/context/MergedContextConfiguration.java
index a6f6ac01b3..b3dbceb10c 100644
--- a/spring-test/src/main/java/org/springframework/test/context/MergedContextConfiguration.java
+++ b/spring-test/src/main/java/org/springframework/test/context/MergedContextConfiguration.java
@@ -43,7 +43,7 @@ import org.springframework.util.StringUtils;
  * values in the test class hierarchy taking into consideration the semantics
  * of the {@link ContextConfiguration#inheritLocations},
  * {@link ActiveProfiles#inheritProfiles},
- * {@link TestPropertySource#inheritLocations}, and 
+ * {@link TestPropertySource#inheritLocations}, and
  * {@link TestPropertySource#inheritProperties} flags.
  *
  * <p>A {@link SmartContextLoader} uses {@code MergedContextConfiguration}
diff --git a/spring-test/src/test/java/org/springframework/test/context/env/SystemPropertyOverridePropertiesFileTestPropertySourceTests.java b/spring-test/src/test/java/org/springframework/test/context/env/SystemPropertyOverridePropertiesFileTestPropertySourceTests.java
index 41d4f05e41..d27ab51734 100644
--- a/spring-test/src/test/java/org/springframework/test/context/env/SystemPropertyOverridePropertiesFileTestPropertySourceTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/env/SystemPropertyOverridePropertiesFileTestPropertySourceTests.java
@@ -31,7 +31,7 @@ import static org.junit.Assert.*;
 
 /**
  * Integration tests for {@link TestPropertySource @TestPropertySource}
- * support with an explicitly named properties file that overrides a 
+ * support with an explicitly named properties file that overrides a
  * system property.
  *
  * @author Sam Brannen
diff --git a/spring-test/src/test/java/org/springframework/test/context/expression/ExpressionUsageTests-context.xml b/spring-test/src/test/java/org/springframework/test/context/expression/ExpressionUsageTests-context.xml
index 38def23cd7..64812ce388 100644
--- a/spring-test/src/test/java/org/springframework/test/context/expression/ExpressionUsageTests-context.xml
+++ b/spring-test/src/test/java/org/springframework/test/context/expression/ExpressionUsageTests-context.xml
@@ -30,7 +30,7 @@
 	</bean>
 
 	<!-- spr5847 -->
-	
+
 	<bean id="andy"
 		class="org.springframework.test.context.expression.ExpressionUsageTests$Foo">
 		<property name="name" value="#{properties.username}" />