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 99bead5a89..021e36f6c2 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,20 @@ import java.text.ParseException;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+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 +69,7 @@ public class HibernateJpaOperationsTests extends AbstractJpaOperationsTests {
 
 	@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 161d860537..51625855f9 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
@@ -40,6 +40,7 @@ import org.springframework.integration.jpa.test.entity.StudentDomain;
 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;
 
@@ -52,6 +53,7 @@ import org.springframework.transaction.annotation.Transactional;
  * @since 2.2
  */
 @RunWith(SpringRunner.class)
+@DirtiesContext
 public class JpaExecutorTests {
 
 	@Autowired
@@ -61,7 +63,7 @@ public class JpaExecutorTests {
 	private BeanFactory beanFactory;
 
 	/**
-	 * In this test, the {@link JpaExecutor}'s poll method will be called without
+	 * In this test, the {@link JpaExecutor}'s p\oll method will be called without
 	 * specifying a 'query', 'namedQuery' or 'entityClass' property. This should
 	 * result in an {@link IllegalArgumentException}.
 	 */