diff --git a/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/job/metadata/CheckMaxJobInstanceIdToDeleteTasklet.java b/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/job/metadata/CheckMaxJobInstanceIdToDeleteTasklet.java
index 3b033ee2..8b0eb112 100644
--- a/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/job/metadata/CheckMaxJobInstanceIdToDeleteTasklet.java
+++ b/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/job/metadata/CheckMaxJobInstanceIdToDeleteTasklet.java
@@ -30,7 +30,7 @@
 import org.springframework.batch.core.JobExecution;
 import org.springframework.batch.core.StepContribution;
 import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.listener.StepExecutionListenerSupport;
+import org.springframework.batch.core.StepExecutionListener;
 import org.springframework.batch.core.scope.context.ChunkContext;
 import org.springframework.batch.core.scope.context.StepContext;
 import org.springframework.batch.core.step.tasklet.Tasklet;
@@ -40,7 +40,7 @@
 /**
  * A tasklet to check metadata of job instances to delete.
  */
-class CheckMaxJobInstanceIdToDeleteTasklet extends StepExecutionListenerSupport implements Tasklet {
+class CheckMaxJobInstanceIdToDeleteTasklet implements Tasklet, StepExecutionListener {
 
 	static final String MAX_ID_KEY = "maxJobInstanceId";
 
diff --git a/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/job/metadata/DeleteMetadataTasklet.java b/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/job/metadata/DeleteMetadataTasklet.java
index 2e4c9bc2..0ceb253e 100644
--- a/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/job/metadata/DeleteMetadataTasklet.java
+++ b/spring-batch-plus/src/main/java/com/navercorp/spring/batch/plus/job/metadata/DeleteMetadataTasklet.java
@@ -25,7 +25,7 @@
 import org.springframework.batch.core.JobParameters;
 import org.springframework.batch.core.StepContribution;
 import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.listener.StepExecutionListenerSupport;
+import org.springframework.batch.core.StepExecutionListener;
 import org.springframework.batch.core.scope.context.ChunkContext;
 import org.springframework.batch.core.step.tasklet.Tasklet;
 import org.springframework.batch.item.ExecutionContext;
@@ -35,7 +35,7 @@
  * A tasklet to delete metadata of Spring Batch.
  * This tasklet must be executed after execution of {@link CheckMaxJobInstanceIdToDeleteTasklet}
  */
-class DeleteMetadataTasklet extends StepExecutionListenerSupport implements Tasklet {
+class DeleteMetadataTasklet implements Tasklet, StepExecutionListener {
 
 	static final String LOW_ID_KEY = "lowJobInstanceId";