diff --git a/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/java/JpaDefaultTest.java b/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/java/JpaDefaultTest.java
index 00567b361a..5736500dfa 100644
--- a/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/java/JpaDefaultTest.java
+++ b/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/java/JpaDefaultTest.java
@@ -23,8 +23,6 @@ public class JpaDefaultTest extends TestTemplate {
 	private static final List<String> GRADLE_INIT_PROJECT_ARGUMENTS = List.of(
 			"init", "--type", "java-application", "--dsl", "groovy", "--test-framework", "junit-jupiter", "--java-version", "17");
 	
-	private File databaseFile;
-	
 	@Test
 	public void testTutorial() throws Exception {
 		assertTrue(getProjectDir().exists());
@@ -62,8 +60,8 @@ private void createGradleProject() throws Exception {
 		setGradleBuildFile(new File(appDir, "build.gradle"));
 		assertTrue(getGradleBuildFile().exists());
 		assertTrue(getGradleBuildFile().isFile());
-		databaseFile = new File(getProjectDir(), "database/test.mv.db");
-		assertFalse(databaseFile.exists());
+		setDatabaseFile(new File(getProjectDir(), "database/test.mv.db"));
+		assertFalse(getDatabaseFile().exists());
 	}
 	
 	private void editGradleBuildFile() throws Exception {
@@ -93,8 +91,8 @@ private void createDatabase() throws Exception {
 		statement.execute("insert into PERSON values (1, 'foo')");
 		statement.close();
 		connection.close();	
-		assertTrue(databaseFile.exists());
-		assertTrue(databaseFile.isFile());
+		assertTrue(getDatabaseFile().exists());
+		assertTrue(getDatabaseFile().isFile());
 	}
 	
 	private void createHibernatePropertiesFile() throws Exception {
diff --git a/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/java/NoAnnotationsTest.java b/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/java/NoAnnotationsTest.java
index 848b948942..39a985faf9 100644
--- a/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/java/NoAnnotationsTest.java
+++ b/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/java/NoAnnotationsTest.java
@@ -23,8 +23,6 @@ public class NoAnnotationsTest extends TestTemplate {
 	private static final List<String> GRADLE_INIT_PROJECT_ARGUMENTS = List.of(
 			"init", "--type", "java-application", "--dsl", "groovy", "--test-framework", "junit-jupiter", "--java-version", "17");
 	
-	private File databaseFile;
-	
 	@Test
 	public void testTutorial() throws Exception {
 		assertTrue(getProjectDir().exists());
@@ -62,8 +60,8 @@ private void createGradleProject() throws Exception {
 		setGradleBuildFile(new File(appDir, "build.gradle"));
 		assertTrue(getGradleBuildFile().exists());
 		assertTrue(getGradleBuildFile().isFile());
-		databaseFile = new File(getProjectDir(), "database/test.mv.db");
-		assertFalse(databaseFile.exists());
+		setDatabaseFile(new File(getProjectDir(), "database/test.mv.db"));
+		assertFalse(getDatabaseFile().exists());
 	}
 	
 	private void editGradleBuildFile() throws Exception {
@@ -94,8 +92,8 @@ private void createDatabase() throws Exception {
 		statement.execute("insert into PERSON values (1, 'foo')");
 		statement.close();
 		connection.close();	
-		assertTrue(databaseFile.exists());
-		assertTrue(databaseFile.isFile());
+		assertTrue(getDatabaseFile().exists());
+		assertTrue(getDatabaseFile().isFile());
 	}
 	
 	private void createHibernatePropertiesFile() throws Exception {
diff --git a/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/java/NoGenerics.java b/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/java/NoGenerics.java
index 551a958739..fd279ad0ac 100644
--- a/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/java/NoGenerics.java
+++ b/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/java/NoGenerics.java
@@ -22,8 +22,6 @@ public class NoGenerics extends TestTemplate {
 	private static final List<String> GRADLE_INIT_PROJECT_ARGUMENTS = List.of(
 			"init", "--type", "java-application", "--dsl", "groovy", "--test-framework", "junit-jupiter", "--java-version", "17");
 	
-	private File databaseFile;
-	
 	@Test
 	public void testTutorial() throws Exception {
 		assertTrue(getProjectDir().exists());
@@ -52,8 +50,8 @@ private void createGradleProject() throws Exception {
 		setGradleBuildFile(new File(appDir, "build.gradle"));
 		assertTrue(getGradleBuildFile().exists());
 		assertTrue(getGradleBuildFile().isFile());
-		databaseFile = new File(getProjectDir(), "database/test.mv.db");
-		assertFalse(databaseFile.exists());
+		setDatabaseFile(new File(getProjectDir(), "database/test.mv.db"));
+		assertFalse(getDatabaseFile().exists());
 	}
 	
 	private void editGradleBuildFile() throws Exception {
@@ -88,8 +86,8 @@ private void createDatabase() throws Exception {
 		statement.execute(CREATE_ITEM_TABLE);
 		statement.close();
 		connection.close();
-		assertTrue(databaseFile.exists());
-		assertTrue(databaseFile.isFile());
+		assertTrue(getDatabaseFile().exists());
+		assertTrue(getDatabaseFile().isFile());
 	}
 	
 	private void createHibernatePropertiesFile() throws Exception {
diff --git a/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/java/UseGenerics.java b/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/java/UseGenerics.java
index 1f7aeae29b..6b11dc571e 100644
--- a/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/java/UseGenerics.java
+++ b/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/java/UseGenerics.java
@@ -22,8 +22,6 @@ public class UseGenerics extends TestTemplate {
 	private static final List<String> GRADLE_INIT_PROJECT_ARGUMENTS = List.of(
 			"init", "--type", "java-application", "--dsl", "groovy", "--test-framework", "junit-jupiter", "--java-version", "17");
 	
-	private File databaseFile;
-	
 	@Test
 	public void testTutorial() throws Exception {
 		assertTrue(getProjectDir().exists());
@@ -52,8 +50,8 @@ private void createGradleProject() throws Exception {
 		setGradleBuildFile(new File(appDir, "build.gradle"));
 		assertTrue(getGradleBuildFile().exists());
 		assertTrue(getGradleBuildFile().isFile());
-		databaseFile = new File(getProjectDir(), "database/test.mv.db");
-		assertFalse(databaseFile.exists());
+		setDatabaseFile(new File(getProjectDir(), "database/test.mv.db"));
+		assertFalse(getDatabaseFile().exists());
 	}
 	
 	private void editGradleBuildFile() throws Exception {
@@ -87,8 +85,8 @@ private void createDatabase() throws Exception {
 		statement.execute(CREATE_ITEM_TABLE);
 		statement.close();
 		connection.close();
-		assertTrue(databaseFile.exists());
-		assertTrue(databaseFile.isFile());
+		assertTrue(getDatabaseFile().exists());
+		assertTrue(getDatabaseFile().isFile());
 	}
 	
 	private void createHibernatePropertiesFile() throws Exception {
diff --git a/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/tutorial/TutorialTest.java b/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/tutorial/TutorialTest.java
index 46450ecdd1..b2e6c9df60 100644
--- a/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/tutorial/TutorialTest.java
+++ b/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/tutorial/TutorialTest.java
@@ -22,9 +22,7 @@ public class TutorialTest extends TestTemplate {
 	
 	private static final List<String> GRADLE_INIT_PROJECT_ARGUMENTS = List.of(
 			"init", "--type", "java-application", "--dsl", "groovy", "--test-framework", "junit-jupiter", "--java-version", "17");
-	
-	private File databaseFile;
-	
+
 	@Test
 	public void testTutorial() throws Exception {
 		assertTrue(getProjectDir().exists());
@@ -62,8 +60,8 @@ private void createGradleProject() throws Exception {
 		setGradleBuildFile(new File(appDir, "build.gradle"));
 		assertTrue(getGradleBuildFile().exists());
 		assertTrue(getGradleBuildFile().isFile());
-		databaseFile = new File(getProjectDir(), "database/test.mv.db");
-		assertFalse(databaseFile.exists());
+		setDatabaseFile(new File(getProjectDir(), "database/test.mv.db"));
+		assertFalse(getDatabaseFile().exists());
 	}
 	
 	private void editGradleBuildFile() throws Exception {
@@ -93,8 +91,8 @@ private void createDatabase() throws Exception {
 		statement.execute("insert into PERSON values (1, 'foo')");
 		statement.close();
 		connection.close();	
-		assertTrue(databaseFile.exists());
-		assertTrue(databaseFile.isFile());
+		assertTrue(getDatabaseFile().exists());
+		assertTrue(getDatabaseFile().isFile());
 	}
 	
 	private void createHibernatePropertiesFile() throws Exception {
diff --git a/gradle/plugin/src/functionalTest/java/org/hibernate/tool/it/gradle/TestTemplate.java b/gradle/plugin/src/functionalTest/java/org/hibernate/tool/it/gradle/TestTemplate.java
index b07eee3860..3f9c2c061c 100644
--- a/gradle/plugin/src/functionalTest/java/org/hibernate/tool/it/gradle/TestTemplate.java
+++ b/gradle/plugin/src/functionalTest/java/org/hibernate/tool/it/gradle/TestTemplate.java
@@ -11,11 +11,14 @@ public class TestTemplate {
 
     private File gradlePropertiesFile;
     private File gradleBuildFile;
+    private File databaseFile;
 
     protected File getProjectDir() { return projectDir; }
     protected File getGradlePropertiesFile() { return gradlePropertiesFile; }
     protected void setGradlePropertiesFile(File f) { this.gradlePropertiesFile = f; }
     protected File getGradleBuildFile() { return gradleBuildFile; }
     protected void setGradleBuildFile(File f) { gradleBuildFile = f; }
+    protected File getDatabaseFile() { return databaseFile; }
+    protected void setDatabaseFile(File f) { databaseFile = f; }
 
 }