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 4aea46cec7..00567b361a 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,7 +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 gradleBuildFile;
 	private File databaseFile;
 	
 	@Test
@@ -60,19 +59,19 @@ private void createGradleProject() throws Exception {
 		File appDir = new File(getProjectDir(), "app");
 		assertTrue(appDir.exists());
 		assertTrue(appDir.isDirectory());
-		gradleBuildFile = new File(appDir, "build.gradle");
-		assertTrue(gradleBuildFile.exists());
-		assertTrue(gradleBuildFile.isFile());
+		setGradleBuildFile(new File(appDir, "build.gradle"));
+		assertTrue(getGradleBuildFile().exists());
+		assertTrue(getGradleBuildFile().isFile());
 		databaseFile = new File(getProjectDir(), "database/test.mv.db");
 		assertFalse(databaseFile.exists());
 	}
 	
 	private void editGradleBuildFile() throws Exception {
 		StringBuffer gradleBuildFileContents = new StringBuffer(
-				new String(Files.readAllBytes(gradleBuildFile.toPath())));
+				new String(Files.readAllBytes(getGradleBuildFile().toPath())));
 		addHibernateToolsPluginLine(gradleBuildFileContents);
 		addH2DatabaseDependencyLine(gradleBuildFileContents);
-		Files.writeString(gradleBuildFile.toPath(), gradleBuildFileContents.toString());
+		Files.writeString(getGradleBuildFile().toPath(), gradleBuildFileContents.toString());
 	}
 	
 	private void editGradlePropertiesFile() 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 e33fed26f3..848b948942 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,7 +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 gradleBuildFile;
 	private File databaseFile;
 	
 	@Test
@@ -60,20 +59,20 @@ private void createGradleProject() throws Exception {
 		File appDir = new File(getProjectDir(), "app");
 		assertTrue(appDir.exists());
 		assertTrue(appDir.isDirectory());
-		gradleBuildFile = new File(appDir, "build.gradle");
-		assertTrue(gradleBuildFile.exists());
-		assertTrue(gradleBuildFile.isFile());
+		setGradleBuildFile(new File(appDir, "build.gradle"));
+		assertTrue(getGradleBuildFile().exists());
+		assertTrue(getGradleBuildFile().isFile());
 		databaseFile = new File(getProjectDir(), "database/test.mv.db");
 		assertFalse(databaseFile.exists());
 	}
 	
 	private void editGradleBuildFile() throws Exception {
 		StringBuffer gradleBuildFileContents = new StringBuffer(
-				new String(Files.readAllBytes(gradleBuildFile.toPath())));
+				new String(Files.readAllBytes(getGradleBuildFile().toPath())));
 		addHibernateToolsPluginLine(gradleBuildFileContents);
 		addH2DatabaseDependencyLine(gradleBuildFileContents);
 		addHibernateToolsExtension(gradleBuildFileContents);
-		Files.writeString(gradleBuildFile.toPath(), gradleBuildFileContents.toString());
+		Files.writeString(getGradleBuildFile().toPath(), gradleBuildFileContents.toString());
 	}
 	
 	private void editGradlePropertiesFile() 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 39799846f0..551a958739 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,7 +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 gradleBuildFile;
 	private File databaseFile;
 	
 	@Test
@@ -50,20 +49,20 @@ private void createGradleProject() throws Exception {
 		File appDir = new File(getProjectDir(), "app");
 		assertTrue(appDir.exists());
 		assertTrue(appDir.isDirectory());
-		gradleBuildFile = new File(appDir, "build.gradle");
-		assertTrue(gradleBuildFile.exists());
-		assertTrue(gradleBuildFile.isFile());
+		setGradleBuildFile(new File(appDir, "build.gradle"));
+		assertTrue(getGradleBuildFile().exists());
+		assertTrue(getGradleBuildFile().isFile());
 		databaseFile = new File(getProjectDir(), "database/test.mv.db");
 		assertFalse(databaseFile.exists());
 	}
 	
 	private void editGradleBuildFile() throws Exception {
 		StringBuffer gradleBuildFileContents = new StringBuffer(
-				new String(Files.readAllBytes(gradleBuildFile.toPath())));
+				new String(Files.readAllBytes(getGradleBuildFile().toPath())));
 		addHibernateToolsPluginLine(gradleBuildFileContents);
 		addH2DatabaseDependencyLine(gradleBuildFileContents);
 		addHibernateToolsExtension(gradleBuildFileContents);
-		Files.writeString(gradleBuildFile.toPath(), gradleBuildFileContents.toString());
+		Files.writeString(getGradleBuildFile().toPath(), gradleBuildFileContents.toString());
 	}
 	
 	private void editGradlePropertiesFile() 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 7e7e5f0838..1f7aeae29b 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,7 +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 gradleBuildFile;
 	private File databaseFile;
 	
 	@Test
@@ -50,19 +49,19 @@ private void createGradleProject() throws Exception {
 		File appDir = new File(getProjectDir(), "app");
 		assertTrue(appDir.exists());
 		assertTrue(appDir.isDirectory());
-		gradleBuildFile = new File(appDir, "build.gradle");
-		assertTrue(gradleBuildFile.exists());
-		assertTrue(gradleBuildFile.isFile());
+		setGradleBuildFile(new File(appDir, "build.gradle"));
+		assertTrue(getGradleBuildFile().exists());
+		assertTrue(getGradleBuildFile().isFile());
 		databaseFile = new File(getProjectDir(), "database/test.mv.db");
 		assertFalse(databaseFile.exists());
 	}
 	
 	private void editGradleBuildFile() throws Exception {
 		StringBuffer gradleBuildFileContents = new StringBuffer(
-				new String(Files.readAllBytes(gradleBuildFile.toPath())));
+				new String(Files.readAllBytes(getGradleBuildFile().toPath())));
 		addHibernateToolsPluginLine(gradleBuildFileContents);
 		addH2DatabaseDependencyLine(gradleBuildFileContents);
-		Files.writeString(gradleBuildFile.toPath(), gradleBuildFileContents.toString());
+		Files.writeString(getGradleBuildFile().toPath(), gradleBuildFileContents.toString());
 	}
 	
 	private void editGradlePropertiesFile() 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 75ab709dff..46450ecdd1 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
@@ -23,7 +23,6 @@ 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 gradleBuildFile;
 	private File databaseFile;
 	
 	@Test
@@ -60,19 +59,19 @@ private void createGradleProject() throws Exception {
 		File appDir = new File(getProjectDir(), "app");
 		assertTrue(appDir.exists());
 		assertTrue(appDir.isDirectory());
-		gradleBuildFile = new File(appDir, "build.gradle");
-		assertTrue(gradleBuildFile.exists());
-		assertTrue(gradleBuildFile.isFile());
+		setGradleBuildFile(new File(appDir, "build.gradle"));
+		assertTrue(getGradleBuildFile().exists());
+		assertTrue(getGradleBuildFile().isFile());
 		databaseFile = new File(getProjectDir(), "database/test.mv.db");
 		assertFalse(databaseFile.exists());
 	}
 	
 	private void editGradleBuildFile() throws Exception {
 		StringBuffer gradleBuildFileContents = new StringBuffer(
-				new String(Files.readAllBytes(gradleBuildFile.toPath())));
+				new String(Files.readAllBytes(getGradleBuildFile().toPath())));
 		addHibernateToolsPluginLine(gradleBuildFileContents);
 		addH2DatabaseDependencyLine(gradleBuildFileContents);
-		Files.writeString(gradleBuildFile.toPath(), gradleBuildFileContents.toString());
+		Files.writeString(getGradleBuildFile().toPath(), gradleBuildFileContents.toString());
 	}
 	
 	private void editGradlePropertiesFile() 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 a68b7dd5a6..b07eee3860 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
@@ -10,17 +10,12 @@ public class TestTemplate {
     private File projectDir;
 
     private File gradlePropertiesFile;
+    private File gradleBuildFile;
 
-    protected File getProjectDir() {
-        return projectDir;
-    }
-
-    protected File getGradlePropertiesFile() {
-        return gradlePropertiesFile;
-    }
-
-    protected void setGradlePropertiesFile(File f) {
-        this.gradlePropertiesFile = f;
-    }
+    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; }
 
 }