diff --git a/ant/src/it/java/org/hibernate/tool/ant/hbm2java/JpaDefaultTestIT.java b/ant/src/it/java/org/hibernate/tool/ant/hbm2java/JpaDefaultTestIT.java
index 98625e2689..09f109034b 100644
--- a/ant/src/it/java/org/hibernate/tool/ant/hbm2java/JpaDefaultTestIT.java
+++ b/ant/src/it/java/org/hibernate/tool/ant/hbm2java/JpaDefaultTestIT.java
@@ -42,11 +42,15 @@ public void testJpaDefault() throws Exception {
     	runAntBuild();
     	verifyResult();
     }
-    
+
+	protected String hibernateToolTaskXml() {
+		return  hibernateToolTaskXml;
+	}
+
     private void createBuildXmlFile() throws Exception {
     	buildXmlFile = new File(getProjectDir(), "build.xml");
     	assertFalse(buildXmlFile.exists());
-    	Files.writeString(buildXmlFile.toPath(), buildXmlFileContents);
+    	Files.writeString(buildXmlFile.toPath(), constructBuildXmlFileContents());
     }
     
 	private void createDatabase() throws Exception {
@@ -108,18 +112,10 @@ private String constructJdbcConnectionString() {
 		return "jdbc:h2:" + getProjectDir().getAbsolutePath() + "/database/test;AUTO_SERVER=TRUE";
 	}
 	    
-    private static final String buildXmlFileContents = 
-    		
-    		"<project name='tutorial' default='reveng'>                           \n" +
-    		"    <taskdef                                                         \n" + 
-    		"            name='hibernatetool'                                     \n" +
-    	    "            classname='org.hibernate.tool.ant.HibernateToolTask'/>   \n" +    		
-    		"    <target name='reveng'>                                           \n" +
-    		"        <hibernatetool destdir='generated'>                          \n" +
-    		"            <jdbcconfiguration propertyfile='hibernate.properties'/> \n" +
-    		"            <hbm2java/>                                              \n" +
-    		"        </hibernatetool>                                             \n" +
-    		"    </target>                                                        \n" +		
-    		"</project>                                                           \n" ;
+	private static final String hibernateToolTaskXml =
+			"        <hibernatetool destdir='generated'>                          \n" +
+			"            <jdbcconfiguration propertyfile='hibernate.properties'/> \n" +
+			"            <hbm2java/>                                              \n" +
+			"        </hibernatetool>                                             \n" ;
 
 }
diff --git a/ant/src/it/java/org/hibernate/tool/ant/hbm2java/NoAnnotationsTestIT.java b/ant/src/it/java/org/hibernate/tool/ant/hbm2java/NoAnnotationsTestIT.java
index dd641f9fbc..d0536b93d2 100644
--- a/ant/src/it/java/org/hibernate/tool/ant/hbm2java/NoAnnotationsTestIT.java
+++ b/ant/src/it/java/org/hibernate/tool/ant/hbm2java/NoAnnotationsTestIT.java
@@ -42,11 +42,15 @@ public void testNoAnnotations() throws Exception {
     	runAntBuild();
     	verifyResult();
     }
-    
-    private void createBuildXmlFile() throws Exception {
+
+	protected String hibernateToolTaskXml() {
+		return  hibernateToolTaskXml;
+	}
+
+	private void createBuildXmlFile() throws Exception {
     	buildXmlFile = new File(getProjectDir(), "build.xml");
     	assertFalse(buildXmlFile.exists());
-    	Files.writeString(buildXmlFile.toPath(), buildXmlFileContents);
+    	Files.writeString(buildXmlFile.toPath(), constructBuildXmlFileContents());
     }
     
 	private void createDatabase() throws Exception {
@@ -108,18 +112,9 @@ private String constructJdbcConnectionString() {
 		return "jdbc:h2:" + getProjectDir().getAbsolutePath() + "/database/test;AUTO_SERVER=TRUE";
 	}
 	    
-    private static final String buildXmlFileContents = 
-    		
-    		"<project name='tutorial' default='reveng'>                           \n" +
-    		"    <taskdef                                                         \n" + 
-    		"            name='hibernatetool'                                     \n" +
-    	    "            classname='org.hibernate.tool.ant.HibernateToolTask'/>   \n" +    		
-    		"    <target name='reveng'>                                           \n" +
-    		"        <hibernatetool destdir='generated'>                          \n" +
-    		"            <jdbcconfiguration propertyfile='hibernate.properties'/> \n" +
-    		"            <hbm2java ejb3='false'/>                                 \n" +
-    		"        </hibernatetool>                                             \n" +
-    		"    </target>                                                        \n" +		
-    		"</project>                                                           \n" ;
-
+	private static final String hibernateToolTaskXml =
+			"        <hibernatetool destdir='generated'>                          \n" +
+			"            <jdbcconfiguration propertyfile='hibernate.properties'/> \n" +
+			"            <hbm2java ejb3='false'/>                                 \n" +
+			"        </hibernatetool>                                             \n" ;
 }
diff --git a/ant/src/it/java/org/hibernate/tool/ant/hbm2java/NoGenericsTestIT.java b/ant/src/it/java/org/hibernate/tool/ant/hbm2java/NoGenericsTestIT.java
index c227e04aac..baf55e3704 100644
--- a/ant/src/it/java/org/hibernate/tool/ant/hbm2java/NoGenericsTestIT.java
+++ b/ant/src/it/java/org/hibernate/tool/ant/hbm2java/NoGenericsTestIT.java
@@ -42,11 +42,15 @@ public void testUseGenerics() throws Exception {
     	runAntBuild();
     	verifyResult();
     }
-    
-    private void createBuildXmlFile() throws Exception {
+
+	protected String hibernateToolTaskXml() {
+		return  hibernateToolTaskXml;
+	}
+
+	private void createBuildXmlFile() throws Exception {
     	buildXmlFile = new File(getProjectDir(), "build.xml");
     	assertFalse(buildXmlFile.exists());
-    	Files.writeString(buildXmlFile.toPath(), buildXmlFileContents);
+    	Files.writeString(buildXmlFile.toPath(), constructBuildXmlFileContents());
     }
     
 	private void createDatabase() throws Exception {
@@ -118,18 +122,10 @@ private String constructJdbcConnectionString() {
 		return "jdbc:h2:" + getProjectDir().getAbsolutePath() + "/database/test;AUTO_SERVER=TRUE";
 	}
 	    
-    private static final String buildXmlFileContents = 
-    		
-    		"<project name='tutorial' default='reveng'>                           \n" +
-    		"    <taskdef                                                         \n" + 
-    		"            name='hibernatetool'                                     \n" +
-    	    "            classname='org.hibernate.tool.ant.HibernateToolTask'/>   \n" +    		
-    		"    <target name='reveng'>                                           \n" +
-    		"        <hibernatetool destdir='generated'>                          \n" +
-    		"            <jdbcconfiguration propertyfile='hibernate.properties'/> \n" +
-    		"            <hbm2java jdk5='false'/>                                 \n" +
-    		"        </hibernatetool>                                             \n" +
-    		"    </target>                                                        \n" +		
-    		"</project>                                                           \n" ;
+	private static final String hibernateToolTaskXml =
+			"        <hibernatetool destdir='generated'>                          \n" +
+			"            <jdbcconfiguration propertyfile='hibernate.properties'/> \n" +
+			"            <hbm2java jdk5='false'/>                                 \n" +
+			"        </hibernatetool>                                             \n" ;
 
 }
diff --git a/ant/src/it/java/org/hibernate/tool/ant/hbm2java/UseGenericsTestIT.java b/ant/src/it/java/org/hibernate/tool/ant/hbm2java/UseGenericsTestIT.java
index 1f5ead9bc9..93cddd071c 100644
--- a/ant/src/it/java/org/hibernate/tool/ant/hbm2java/UseGenericsTestIT.java
+++ b/ant/src/it/java/org/hibernate/tool/ant/hbm2java/UseGenericsTestIT.java
@@ -42,11 +42,15 @@ public void testUseGenerics() throws Exception {
     	runAntBuild();
     	verifyResult();
     }
-    
-    private void createBuildXmlFile() throws Exception {
+
+	protected String hibernateToolTaskXml() {
+		return  hibernateToolTaskXml;
+	}
+
+	private void createBuildXmlFile() throws Exception {
     	buildXmlFile = new File(getProjectDir(), "build.xml");
     	assertFalse(buildXmlFile.exists());
-    	Files.writeString(buildXmlFile.toPath(), buildXmlFileContents);
+    	Files.writeString(buildXmlFile.toPath(), constructBuildXmlFileContents());
     }
     
 	private void createDatabase() throws Exception {
@@ -118,18 +122,9 @@ private String constructJdbcConnectionString() {
 		return "jdbc:h2:" + getProjectDir().getAbsolutePath() + "/database/test;AUTO_SERVER=TRUE";
 	}
 	    
-    private static final String buildXmlFileContents = 
-    		
-    		"<project name='tutorial' default='reveng'>                           \n" +
-    		"    <taskdef                                                         \n" + 
-    		"            name='hibernatetool'                                     \n" +
-    	    "            classname='org.hibernate.tool.ant.HibernateToolTask'/>   \n" +    		
-    		"    <target name='reveng'>                                           \n" +
-    		"        <hibernatetool destdir='generated'>                          \n" +
-    		"            <jdbcconfiguration propertyfile='hibernate.properties'/> \n" +
-    		"            <hbm2java/>                                              \n" +
-    		"        </hibernatetool>                                             \n" +
-    		"    </target>                                                        \n" +		
-    		"</project>                                                           \n" ;
-
+	private static final String hibernateToolTaskXml =
+			"        <hibernatetool destdir='generated'>                          \n" +
+			"            <jdbcconfiguration propertyfile='hibernate.properties'/> \n" +
+			"            <hbm2java/>                                              \n" +
+			"        </hibernatetool>                                             \n" ;
 }
diff --git a/ant/src/it/java/org/hibernate/tool/ant/tutorial/TutorialTestIT.java b/ant/src/it/java/org/hibernate/tool/ant/tutorial/TutorialTestIT.java
index 3b4a8e9e08..f616e148e5 100644
--- a/ant/src/it/java/org/hibernate/tool/ant/tutorial/TutorialTestIT.java
+++ b/ant/src/it/java/org/hibernate/tool/ant/tutorial/TutorialTestIT.java
@@ -44,11 +44,15 @@ public void testTutorial() throws Exception {
     	runAntBuild();
     	verifyResult();
     }
-    
-    private void createBuildXmlFile() throws Exception {
+
+	protected String hibernateToolTaskXml() {
+		return  hibernateToolTaskXml;
+	}
+
+	private void createBuildXmlFile() throws Exception {
     	buildXmlFile = new File(getProjectDir(), "build.xml");
     	assertFalse(buildXmlFile.exists());
-    	Files.writeString(buildXmlFile.toPath(), buildXmlFileContents);
+    	Files.writeString(buildXmlFile.toPath(), constructBuildXmlFileContents());
     }
     
 	private void createDatabase() throws Exception {
@@ -106,18 +110,9 @@ private String constructJdbcConnectionString() {
 		return "jdbc:h2:" + getProjectDir().getAbsolutePath() + "/database/test;AUTO_SERVER=TRUE";
 	}
 	    
-    private static final String buildXmlFileContents = 
-    		
-    		"<project name='tutorial' default='reveng'>                           \n" +
-    		"    <taskdef                                                         \n" + 
-    		"            name='hibernatetool'                                     \n" +
-    	    "            classname='org.hibernate.tool.ant.HibernateToolTask'/>   \n" +    		
-    		"    <target name='reveng'>                                           \n" +
-    		"        <hibernatetool destdir='generated'>                          \n" +
-    		"            <jdbcconfiguration propertyfile='hibernate.properties'/> \n" +
-    		"            <hbm2java/>                                              \n" +
-    		"        </hibernatetool>                                             \n" +
-    		"    </target>                                                        \n" +		
-    		"</project>                                                           \n" ;
-
+	private static final String hibernateToolTaskXml =
+			"        <hibernatetool destdir='generated'>                          \n" +
+			"            <jdbcconfiguration propertyfile='hibernate.properties'/> \n" +
+			"            <hbm2java/>                                              \n" +
+			"        </hibernatetool>                                             \n" ;
 }
diff --git a/ant/src/it/java/org/hibernate/tool/it/ant/TestTemplate.java b/ant/src/it/java/org/hibernate/tool/it/ant/TestTemplate.java
index 359941de3c..943e8d094c 100644
--- a/ant/src/it/java/org/hibernate/tool/it/ant/TestTemplate.java
+++ b/ant/src/it/java/org/hibernate/tool/it/ant/TestTemplate.java
@@ -4,7 +4,7 @@
 
 import java.io.File;
 
-public class TestTemplate {
+public abstract class TestTemplate {
 
     @TempDir
     private File projectDir;
@@ -13,4 +13,20 @@ protected File getProjectDir() {
         return projectDir;
     }
 
+    protected abstract String hibernateToolTaskXml();
+
+    protected String constructBuildXmlFileContents() {
+        return buildXmlFileContents.replace("@hibernateToolTaskXml@", hibernateToolTaskXml());
+    }
+
+    private static final String buildXmlFileContents =
+            "<project name='tutorial' default='reveng'>                           \n" +
+            "    <taskdef                                                         \n" +
+            "            name='hibernatetool'                                     \n" +
+            "            classname='org.hibernate.tool.ant.HibernateToolTask'/>   \n" +
+            "    <target name='reveng'>                                           \n" +
+            "@hibernateToolTaskXml@" +
+            "    </target>                                                        \n" +
+            "</project>                                                           \n" ;
+
 }