diff --git a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/core/HibernateJpaOperationsTests.java b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/core/HibernateJpaOperationsTests.java
index 99bead5a89b..fe67599a011 100644
--- a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/core/HibernateJpaOperationsTests.java
+++ b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/core/HibernateJpaOperationsTests.java
@@ -21,16 +21,18 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit4.SpringRunner;
 
 /**
  * @author Gunnar Hillert
+ * @author Artem Bilan
+ *
  * @since 2.2
  *
  */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration
+@RunWith(SpringRunner.class)
+@DirtiesContext
 public class HibernateJpaOperationsTests extends AbstractJpaOperationsTests {
 
 	@Test
@@ -65,8 +67,7 @@ public void testExecuteUpdateWithNativeQuery() {
 
 	@Test
 	@Override
-	public void testExecuteSelectWithNativeQueryReturningEntityClass()
-			throws ParseException {
+	public void testExecuteSelectWithNativeQueryReturningEntityClass() throws ParseException {
 		super.testExecuteSelectWithNativeQueryReturningEntityClass();
 	}
 
diff --git a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/core/JpaExecutorTests.java b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/core/JpaExecutorTests.java
index 16d7febdcc1..2bcfbf9340a 100644
--- a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/core/JpaExecutorTests.java
+++ b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/core/JpaExecutorTests.java
@@ -42,6 +42,7 @@
 import org.springframework.integration.support.MessageBuilder;
 import org.springframework.integration.test.util.TestUtils;
 import org.springframework.messaging.Message;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -54,6 +55,7 @@
  * @since 2.2
  */
 @RunWith(SpringRunner.class)
+@DirtiesContext
 public class JpaExecutorTests {
 
 	@Autowired