diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/IndexingTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/IndexingTests.java
index 9758a93977..d4b68a5984 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/IndexingTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/IndexingTests.java
@@ -312,6 +312,7 @@ public class IndexingTests {
 		assertEquals("", expression.getValue(this, String.class));
 	}
 
+	@SuppressWarnings("unchecked")
 	@Test
 	public void resolveCollectionElementType() {
 		listNotGeneric = new ArrayList(2);
@@ -339,6 +340,7 @@ public class IndexingTests {
 
 	}
 
+	@SuppressWarnings("unchecked")
 	@Test
 	public void resolveMapKeyValueTypes() {
 		mapNotGeneric = new HashMap();
@@ -352,6 +354,7 @@ public class IndexingTests {
 	@FieldAnnotation
 	public Map mapNotGeneric;
 
+	@SuppressWarnings("unchecked")
 	@Test
 	public void testListOfScalar() {
 		listOfScalarNotGeneric = new ArrayList(1);
@@ -364,6 +367,7 @@ public class IndexingTests {
 	public List listOfScalarNotGeneric;
 
 
+	@SuppressWarnings("unchecked")
 	@Test
 	public void testListsOfMap() {
 		listOfMapsNotGeneric = new ArrayList();
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java
index 9756d8b8f5..f06926b998 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java
@@ -2529,7 +2529,8 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests {
 			return 1;
 		}
 	}
-	
+
+	@SuppressWarnings("serial")
 	public static class MessageHeaders extends HashMap<String,Object> {	}
 
 	public static class GenericMessageTestHelper<T> {
diff --git a/spring-test/src/main/java/org/springframework/test/context/ContextConfiguration.java b/spring-test/src/main/java/org/springframework/test/context/ContextConfiguration.java
index f298dc787c..0212338e15 100644
--- a/spring-test/src/main/java/org/springframework/test/context/ContextConfiguration.java
+++ b/spring-test/src/main/java/org/springframework/test/context/ContextConfiguration.java
@@ -53,8 +53,8 @@ import org.springframework.context.ConfigurableApplicationContext;
  * The term <em>annotated class</em> can refer to any of the following.
  *
  * <ul>
- * <li>A class annotated with {@link org.springframework.context.annotation.Configuration
- * @Configuration}</li>
+ * <li>A class annotated with @{@link org.springframework.context.annotation.Configuration
+ * Configuration}</li>
  * <li>A component (i.e., a class annotated with
  * {@link org.springframework.stereotype.Component @Component},
  * {@link org.springframework.stereotype.Service @Service},
diff --git a/spring-test/src/main/java/org/springframework/test/context/transaction/TransactionalTestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/transaction/TransactionalTestExecutionListener.java
index b8344a51f9..6475739133 100644
--- a/spring-test/src/main/java/org/springframework/test/context/transaction/TransactionalTestExecutionListener.java
+++ b/spring-test/src/main/java/org/springframework/test/context/transaction/TransactionalTestExecutionListener.java
@@ -114,7 +114,7 @@ import static org.springframework.core.annotation.AnnotationUtils.*;
  * {@link org.springframework.transaction.annotation.TransactionManagementConfigurer TransactionManagementConfigurer}
  * can be implemented by an
  * {@link org.springframework.context.annotation.Configuration @Configuration}
- * class. See {@link TestContextTransactionUtils#retrieveTransactionManager()}
+ * class. See {@link TestContextTransactionUtils#retrieveTransactionManager}
  * for details on the algorithm used to look up a transaction manager in
  * the test's {@code ApplicationContext}.
  *