diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/ExecutionContextStringSerializer.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/ExecutionContextStringSerializer.java
similarity index 95%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/ExecutionContextStringSerializer.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/ExecutionContextStringSerializer.java
index 8bc463ad3..1ace676bc 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/ExecutionContextStringSerializer.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/ExecutionContextStringSerializer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.core.repository.support;
+package org.springframework.batch.core.repository.dao;
 
 import java.util.Map;
 
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcExecutionContextDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcExecutionContextDao.java
index b61ce3ed9..2f88aa655 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcExecutionContextDao.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcExecutionContextDao.java
@@ -27,8 +27,6 @@ import java.util.List;
 
 import org.springframework.batch.core.JobExecution;
 import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.repository.support.ExecutionContextStringSerializer;
-import org.springframework.batch.core.repository.support.XStreamExecutionContextStringSerializer;
 import org.springframework.batch.item.ExecutionContext;
 import org.springframework.jdbc.core.simple.ParameterizedRowMapper;
 import org.springframework.jdbc.core.PreparedStatementSetter;
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/XStreamExecutionContextStringSerializer.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/XStreamExecutionContextStringSerializer.java
similarity index 97%
rename from spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/XStreamExecutionContextStringSerializer.java
rename to spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/XStreamExecutionContextStringSerializer.java
index 2e8f914c7..f79d89451 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/XStreamExecutionContextStringSerializer.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/XStreamExecutionContextStringSerializer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.core.repository.support;
+package org.springframework.batch.core.repository.dao;
 
 import com.thoughtworks.xstream.converters.reflection.ReflectionProvider;
 import com.thoughtworks.xstream.io.HierarchicalStreamDriver;