diff --git a/spring-batch-samples/src/main/resources/org/springframework/batch/samples/common/business-schema-hsqldb.sql b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/common/business-schema-hsqldb.sql
index ffd6823049..52a8c890f0 100644
--- a/spring-batch-samples/src/main/resources/org/springframework/batch/samples/common/business-schema-hsqldb.sql
+++ b/spring-batch-samples/src/main/resources/org/springframework/batch/samples/common/business-schema-hsqldb.sql
@@ -9,6 +9,7 @@ DROP TABLE  PLAYERS IF EXISTS;
 DROP TABLE  GAMES IF EXISTS;
 DROP TABLE  PLAYER_SUMMARY IF EXISTS;
 DROP TABLE  ERROR_LOG IF EXISTS;
+DROP TABLE  OWNERS IF EXISTS;
 
 -- Autogenerated: do not edit this file
 
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/samples/petclinic/PetClinicJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/petclinic/PetClinicJobFunctionalTests.java
index 5f790cba9f..dc8bfce26b 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/samples/petclinic/PetClinicJobFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/petclinic/PetClinicJobFunctionalTests.java
@@ -19,6 +19,7 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
 
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -43,7 +44,8 @@ class PetClinicJobFunctionalTests {
 	private JobLauncherTestUtils jobLauncherTestUtils;
 
 	@BeforeEach
-	public void setup() throws IOException {
+	@AfterEach
+	public void deleteOwnersFile() throws IOException {
 		Files.deleteIfExists(Paths.get("owners.csv"));
 	}