diff --git a/spring-orm-hibernate4/src/test/java/org/springframework/orm/jpa/jpa21/PersistenceContextTransactionTests.java b/spring-orm-hibernate4/src/test/java/org/springframework/orm/jpa/jpa21/PersistenceContextTransactionTests.java
index 4f295ded02..c3eea7922f 100644
--- a/spring-orm-hibernate4/src/test/java/org/springframework/orm/jpa/jpa21/PersistenceContextTransactionTests.java
+++ b/spring-orm-hibernate4/src/test/java/org/springframework/orm/jpa/jpa21/PersistenceContextTransactionTests.java
@@ -45,6 +45,7 @@ import static org.mockito.BDDMockito.*;
  * @author Juergen Hoeller
  * @since 4.1.2
  */
+@SuppressWarnings({ "rawtypes", "unchecked" })
 public class PersistenceContextTransactionTests {
 
 	private EntityManagerFactory factory;
@@ -72,6 +73,7 @@ public class PersistenceContextTransactionTests {
 		given(manager.isOpen()).willReturn(true);
 
 		bean = new EntityManagerHoldingBean();
+		@SuppressWarnings("serial")
 		PersistenceAnnotationBeanPostProcessor pabpp = new PersistenceAnnotationBeanPostProcessor() {
 			@Override
 			protected EntityManagerFactory findEntityManagerFactory(String unitName, String requestingBeanName) {
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceContextTransactionTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceContextTransactionTests.java
index 8d37c81359..a04c5ce3bc 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceContextTransactionTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/support/PersistenceContextTransactionTests.java
@@ -40,6 +40,7 @@ import static org.mockito.BDDMockito.*;
  * @author Juergen Hoeller
  * @since 4.1.2
  */
+@SuppressWarnings({ "rawtypes", "unchecked" })
 public class PersistenceContextTransactionTests {
 
 	private EntityManagerFactory factory;
@@ -67,6 +68,7 @@ public class PersistenceContextTransactionTests {
 		given(manager.isOpen()).willReturn(true);
 
 		bean = new EntityManagerHoldingBean();
+		@SuppressWarnings("serial")
 		PersistenceAnnotationBeanPostProcessor pabpp = new PersistenceAnnotationBeanPostProcessor() {
 			@Override
 			protected EntityManagerFactory findEntityManagerFactory(String unitName, String requestingBeanName) {
diff --git a/spring-web/src/test/java/org/springframework/web/client/HttpMessageConverterExtractorTests.java b/spring-web/src/test/java/org/springframework/web/client/HttpMessageConverterExtractorTests.java
index 8a195577f0..7f7ca6b825 100644
--- a/spring-web/src/test/java/org/springframework/web/client/HttpMessageConverterExtractorTests.java
+++ b/spring-web/src/test/java/org/springframework/web/client/HttpMessageConverterExtractorTests.java
@@ -126,6 +126,7 @@ public class HttpMessageConverterExtractorTests {
 	}
 
 	@Test
+	@SuppressWarnings("unchecked")
 	public void connectionClose() throws IOException {
 		HttpMessageConverter<String> converter = mock(HttpMessageConverter.class);
 		List<HttpMessageConverter<?>> converters = new ArrayList<HttpMessageConverter<?>>();
diff --git a/spring-webmvc-tiles2/src/test/java/org/springframework/web/servlet/view/tiles2/TilesConfigurerTests.java b/spring-webmvc-tiles2/src/test/java/org/springframework/web/servlet/view/tiles2/TilesConfigurerTests.java
index 459b3981d6..c9a5a09327 100644
--- a/spring-webmvc-tiles2/src/test/java/org/springframework/web/servlet/view/tiles2/TilesConfigurerTests.java
+++ b/spring-webmvc-tiles2/src/test/java/org/springframework/web/servlet/view/tiles2/TilesConfigurerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,10 +30,11 @@ import static org.junit.Assert.*;
 
 /**
  * @author Juergen Hoeller
- * */
+ */
 public class TilesConfigurerTests {
 
 	@Test
+	@SuppressWarnings("deprecation")
 	public void simpleBootstrap() {
 		MockServletContext sc = new MockServletContext();
 		TilesConfigurer tc = new TilesConfigurer();
diff --git a/src/test/java/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.java b/src/test/java/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.java
index 7d675ff65b..9424a9cbd7 100644
--- a/src/test/java/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.java
+++ b/src/test/java/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.java
@@ -16,8 +16,6 @@
 
 package org.springframework.context.annotation.ltw;
 
-import org.springframework.test.jpa.AbstractJpaTests;
-
 /**
  * Test to ensure that component scanning work with load-time weaver.
  * See SPR-3873 for more details.
@@ -25,7 +23,7 @@ import org.springframework.test.jpa.AbstractJpaTests;
  * @author Ramnivas Laddad
  */
 @SuppressWarnings("deprecation")
-public class ComponentScanningWithLTWTests extends AbstractJpaTests {
+public class ComponentScanningWithLTWTests extends org.springframework.test.jpa.AbstractJpaTests {
 
 	public ComponentScanningWithLTWTests() {
 		setDependencyCheck(false);