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 6cf3df048a..7d93f2a374 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
@@ -26,12 +26,7 @@ public void testTutorial() throws Exception {
 				"create table PERSON (ID int not null, NAME varchar(20), primary key (ID))",
 				"insert into PERSON values (1, 'foo')"
 		});
-		assertTrue(getProjectDir().exists());
-		createGradleProject();
-		editGradleBuildFile();
-		editGradlePropertiesFile();
-		createDatabase();
-		createHibernatePropertiesFile();
+		createProject();
 		executeGenerateJavaTask();
 		verifyProject();
 	}
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 92f988882d..2f9bd16a12 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
@@ -26,12 +26,7 @@ public void testTutorial() throws Exception {
 				"create table PERSON (ID int not null, NAME varchar(20), primary key (ID))",
 				"insert into PERSON values (1, 'foo')"
 		});
-		assertTrue(getProjectDir().exists());
-		createGradleProject();
-		editGradleBuildFile();
-		editGradlePropertiesFile();
-		createDatabase();
-		createHibernatePropertiesFile();
+		createProject();
 		executeGenerateJavaTask();
 		verifyProject();
 	}
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 3fa24e4bbf..4c50c9cfd1 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
@@ -26,12 +26,7 @@ public void testTutorial() throws Exception {
 				"create table ITEM (ID int not null,  NAME varchar(20), OWNER_ID int not null, " +
 						"   primary key (ID), foreign key (OWNER_ID) references PERSON(ID))"
 		});
-		assertTrue(getProjectDir().exists());
-		createGradleProject();
-		editGradleBuildFile();
-		editGradlePropertiesFile();
-		createDatabase();
-		createHibernatePropertiesFile();
+		createProject();
 		executeGenerateJavaTask();
 		verifyProject();
 	}
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 1724c07a24..5258dba729 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
@@ -26,12 +26,7 @@ public void testTutorial() throws Exception {
 				"create table ITEM (ID int not null,  NAME varchar(20), OWNER_ID int not null, " +
 						"   primary key (ID), foreign key (OWNER_ID) references PERSON(ID))"
 		});
-		assertTrue(getProjectDir().exists());
-		createGradleProject();
-		editGradleBuildFile();
-		editGradlePropertiesFile();
-		createDatabase();
-		createHibernatePropertiesFile();
+		createProject();
 		executeGenerateJavaTask();
 		verifyProject();
 	}
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 dd60585d6b..eb29a25338 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
@@ -26,12 +26,7 @@ public void testTutorial() throws Exception {
 				"create table PERSON (ID int not null, NAME varchar(20), primary key (ID))",
 				"insert into PERSON values (1, 'foo')"
 		});
-		assertTrue(getProjectDir().exists());
-		createGradleProject();
-		editGradleBuildFile();
-		editGradlePropertiesFile();
-		createDatabase();
-		createHibernatePropertiesFile();
+		createProject();
 		executeGenerateJavaTask();
 		verifyProject();
 	}
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 51da771179..0a471d9e43 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
@@ -39,7 +39,15 @@ public class TestTemplate {
     protected String[] getDatabaseCreationScript() { return databaseCreationScript; }
     protected void setDatabaseCreationScript(String[] script) { databaseCreationScript = script; }
 
-    protected void createGradleProject() throws Exception {
+    protected void createProject() throws Exception {
+        initGradleProject();
+        editGradleBuildFile();
+        editGradlePropertiesFile();
+        createDatabase();
+        createHibernatePropertiesFile();
+    }
+
+    protected void initGradleProject() throws Exception {
         GradleRunner runner = GradleRunner.create();
         runner.withArguments(GRADLE_INIT_PROJECT_ARGUMENTS);
         runner.forwardOutput();