diff --git a/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/GenerateJavaTest.java b/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/GenerateJavaTest.java
index cbfc8c757f..e52a57856c 100644
--- a/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/GenerateJavaTest.java
+++ b/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/GenerateJavaTest.java
@@ -32,7 +32,7 @@ class GenerateJavaTest extends TestTemplate {
 
 	@BeforeEach
 	public void beforeEach() {
-		setGradleCommandToExecute("generateJava");
+		setGradleTaskToPerform("generateJava");
 		setDatabaseCreationScript(new String[] {
 				"create table PERSON (ID int not null, NAME varchar(20), primary key (ID))"
 		});
diff --git a/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/RunSqlTest.java b/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/RunSqlTest.java
index 92a8acd8df..2618c1fbc2 100644
--- a/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/RunSqlTest.java
+++ b/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/RunSqlTest.java
@@ -17,43 +17,34 @@
  */
 package org.hibernate.tool.gradle;
 
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import java.io.File;
-import java.io.IOException;
-
-import org.gradle.testkit.runner.BuildResult;
-import org.hibernate.tool.gradle.test.func.utils.FuncTestConstants;
-import org.hibernate.tool.gradle.test.func.utils.FuncTestTemplate;
+import org.hibernate.tool.it.gradle.TestTemplate;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-class RunSqlTest extends FuncTestTemplate implements FuncTestConstants {
+class RunSqlTest extends TestTemplate {
 
-    private static final String BUILD_FILE_HIBERNATE_TOOLS_SECTION = 
+    private static final String HIBERNATE_TOOLS_EXTENSION_SECTION =
     		"hibernateTools {\n" +
     		"  sqlToRun = 'create table foo (id int not null primary key, baz varchar(256))'\n" +
-    		"  hibernateProperties = 'foo.bar'" +
     		"}\n";
 
-	@Override
-	public String getBuildFileHibernateToolsSection() {
-	    return BUILD_FILE_HIBERNATE_TOOLS_SECTION;
-	}
-	
-	@Override
-	public String getHibernatePropertiesFileName() {
-		return "foo.bar";
+	@BeforeEach
+	public void beforeEach() {
+		setGradleTaskToPerform("runSql");
 	}
 
-    @Test 
-    void testRunSql() throws IOException {
-    	performTask("runSql", false);
+	@Test
+    void testRunSql() throws Exception {
+		setHibernateToolsExtensionSection(HIBERNATE_TOOLS_EXTENSION_SECTION);
+		assertNull(getDatabaseFile());
+    	createProjectAndExecuteGradleCommand();
+		assertTrue(getBuildResult().getOutput().contains("Running SQL: create table foo (id int not null primary key, baz varchar(256))"));
+		assertNotNull(getDatabaseFile());
+		assertTrue(getDatabaseFile().exists());
     }
     
-    @Override
-    protected void verifyBuild(BuildResult buildResult) {
-        assertTrue(buildResult.getOutput().contains("Running SQL: create table foo (id int not null primary key, baz varchar(256))"));
-        assertTrue(new File(projectDir, DATABASE_FOLDER_NAME + "/" + DATABASE_FILE_NAME).exists());
-    }
-
  }
\ No newline at end of file
diff --git a/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/TutorialTest.java b/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/TutorialTest.java
index 74ee3da4e2..ca834daf72 100644
--- a/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/TutorialTest.java
+++ b/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/TutorialTest.java
@@ -14,7 +14,7 @@ public class TutorialTest extends TestTemplate {
 
 	@BeforeEach
 	public void beforeEach() {
-		setGradleCommandToExecute("generateJava");
+		setGradleTaskToPerform("generateJava");
 		setDatabaseCreationScript(new String[] {
 				"create table PERSON (ID int not null, NAME varchar(20), primary key (ID))"
 		});
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 09793d4274..e43cbf828f 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
@@ -28,7 +28,8 @@ public class TestTemplate {
 
     private String[] databaseCreationScript;
     private String hibernateToolsExtensionSection;
-    private String gradleCommandToExecute;
+    private String gradleTaskToPerform;
+    private BuildResult buildResult;
 
     protected File getProjectDir() { return projectDir; }
     protected File getGradlePropertiesFile() { return gradlePropertiesFile; }
@@ -41,8 +42,9 @@ public class TestTemplate {
     protected void setDatabaseCreationScript(String[] script) { databaseCreationScript = script; }
     protected String getHibernateToolsExtensionSection() { return hibernateToolsExtensionSection; }
     protected void setHibernateToolsExtensionSection(String s) { hibernateToolsExtensionSection = s; }
-    protected String getGradleCommandToExecute() { return gradleCommandToExecute; }
-    protected void setGradleCommandToExecute(String command) { gradleCommandToExecute = command; }
+    protected String getGradleTaskToPerform() { return gradleTaskToPerform; }
+    protected void setGradleTaskToPerform(String command) { gradleTaskToPerform = command; }
+    protected BuildResult getBuildResult() { return buildResult; }
 
     protected void executeGradleCommand(String ... gradleCommandLine) {
         GradleRunner runner = GradleRunner.create();
@@ -50,7 +52,7 @@ protected void executeGradleCommand(String ... gradleCommandLine) {
         runner.forwardOutput();
         runner.withPluginClasspath();
         runner.withProjectDir(getProjectDir());
-        BuildResult buildResult = runner.build();
+        buildResult = runner.build();
         assertTrue(buildResult.getOutput().contains("BUILD SUCCESSFUL"));
     }
 
@@ -64,7 +66,7 @@ protected void createProject() throws Exception {
 
     protected void createProjectAndExecuteGradleCommand() throws Exception {
         createProject();
-        executeGradleCommand(getGradleCommandToExecute());
+        executeGradleCommand(getGradleTaskToPerform());
     }
 
     protected void initGradleProject() throws Exception {