diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcExecutionContextDaoTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/JdbcExecutionContextDaoTests.java
similarity index 100%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcExecutionContextDaoTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/JdbcExecutionContextDaoTests.java
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapExecutionContextDaoTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/MapExecutionContextDaoTests.java
similarity index 68%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapExecutionContextDaoTests.java
rename to spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/MapExecutionContextDaoTests.java
index 74c4fc218..3f8b54217 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapExecutionContextDaoTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/MapExecutionContextDaoTests.java
@@ -1,8 +1,12 @@
 package org.springframework.batch.core.repository.dao;
 
+import org.junit.internal.runners.JUnit4ClassRunner;
+import org.junit.runner.RunWith;
+
 /**
  * Tests for {@link MapExecutionContextDao}.
  */
+@RunWith(JUnit4ClassRunner.class)
 public class MapExecutionContextDaoTests extends AbstractExecutionContextDaoTests {
 
 	@Override