diff --git a/ant/src/it/java/org/hibernate/tool/ant/Hbm2JavaTestIT.java b/ant/src/it/java/org/hibernate/tool/ant/Hbm2JavaTestIT.java
new file mode 100644
index 0000000000..b372bba6b8
--- /dev/null
+++ b/ant/src/it/java/org/hibernate/tool/ant/Hbm2JavaTestIT.java
@@ -0,0 +1,99 @@
+package org.hibernate.tool.ant;
+
+import org.hibernate.tool.it.ant.TestTemplate;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class Hbm2JavaTestIT extends TestTemplate {
+
+    @Test
+    public void testJpaDefault() throws Exception {
+        setHibernateToolTaskXml(
+                "        <hibernatetool destdir='generated'>                          \n" +
+                "            <jdbcconfiguration propertyfile='hibernate.properties'/> \n" +
+                "            <hbm2java/>                                              \n" +
+                "        </hibernatetool>                                             \n"
+        );
+        setDatabaseCreationScript(new String[] {
+                "create table PERSON (ID int not null, NAME varchar(20), primary key (ID))"
+        });
+        createProjectAndBuild();
+        assertFolderExists("generated", 1);
+        assertFileExists("generated/Person.java");
+        String generatedPersonJavaFileContents = getFileContents("generated/Person.java");
+        assertTrue(generatedPersonJavaFileContents.contains("import jakarta.persistence.Entity;"));
+        assertTrue(generatedPersonJavaFileContents.contains("public class Person "));
+    }
+
+    @Test
+    public void testNoAnnotations() throws Exception {
+        setHibernateToolTaskXml(
+                "        <hibernatetool destdir='generated'>                          \n" +
+                "            <jdbcconfiguration propertyfile='hibernate.properties'/> \n" +
+                "            <hbm2java ejb3='false'/>                                 \n" +
+                "        </hibernatetool>                                             \n"
+        );
+        setDatabaseCreationScript(new String[] {
+                "create table PERSON (ID int not null, NAME varchar(20), primary key (ID))"
+        });
+        createProjectAndBuild();
+        assertFolderExists("generated", 1);
+        assertFileExists("generated/Person.java");
+        String generatedPersonJavaFileContents = getFileContents("generated/Person.java");
+        assertFalse(generatedPersonJavaFileContents.contains("import jakarta.persistence.Entity;"));
+        assertTrue(generatedPersonJavaFileContents.contains("public class Person "));
+    }
+
+    @Test
+    public void testNoGenerics() throws Exception {
+        setHibernateToolTaskXml(
+                "        <hibernatetool destdir='generated'>                          \n" +
+                "            <jdbcconfiguration propertyfile='hibernate.properties'/> \n" +
+                "            <hbm2java jdk5='false'/>                                 \n" +
+                "        </hibernatetool>                                             \n"
+        );
+        setDatabaseCreationScript(new String[] {
+                "create table PERSON (ID int not null, NAME varchar(20), " +
+                        "primary key (ID))",
+                "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))"
+        });
+        createProjectAndBuild();
+        assertFolderExists("generated", 2);
+        assertFileExists("generated/Person.java");
+        String generatedPersonJavaFileContents = getFileContents("generated/Person.java");
+        assertTrue(generatedPersonJavaFileContents.contains("public class Person "));
+        assertFalse(generatedPersonJavaFileContents.contains("Set<Item>"));
+        assertFileExists("generated/Item.java");
+        String generatedItemJavaFileContents = getFileContents("generated/Item.java");
+        assertTrue(generatedItemJavaFileContents.contains("public class Item "));
+    }
+
+    @Test
+    public void testUseGenerics() throws Exception {
+        setHibernateToolTaskXml(
+                "        <hibernatetool destdir='generated'>                          \n" +
+                "            <jdbcconfiguration propertyfile='hibernate.properties'/> \n" +
+                "            <hbm2java/>                                              \n" +
+                "        </hibernatetool>                                             \n"
+        );
+        setDatabaseCreationScript(new String[] {
+                "create table PERSON (ID int not null, NAME varchar(20), " +
+                        "primary key (ID))",
+                "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))"
+        });
+        createProjectAndBuild();
+        assertFolderExists("generated", 2);
+        assertFileExists("generated/Person.java");
+        String generatedPersonJavaFileContents = getFileContents("generated/Person.java");
+        assertTrue(generatedPersonJavaFileContents.contains("public class Person "));
+        assertTrue(generatedPersonJavaFileContents.contains("Set<Item>"));
+        assertFileExists("generated/Item.java");
+        String generatedItemJavaFileContents = getFileContents("generated/Item.java");
+        assertTrue(generatedItemJavaFileContents.contains("public class Item "));
+    }
+
+}
diff --git a/ant/src/it/java/org/hibernate/tool/ant/TutorialTestIT.java b/ant/src/it/java/org/hibernate/tool/ant/TutorialTestIT.java
new file mode 100644
index 0000000000..232c5a004b
--- /dev/null
+++ b/ant/src/it/java/org/hibernate/tool/ant/TutorialTestIT.java
@@ -0,0 +1,26 @@
+package org.hibernate.tool.ant;
+
+import org.hibernate.tool.it.ant.TestTemplate;
+import org.junit.jupiter.api.Test;
+
+public class TutorialTestIT extends TestTemplate {
+	
+    @Test
+    public void testTutorial() throws Exception {
+		setHibernateToolTaskXml(
+				"        <hibernatetool destdir='generated-sources'>                  \n" +
+				"            <jdbcconfiguration propertyfile='hibernate.properties'/> \n" +
+				"            <hbm2java/>                                              \n" +
+				"        </hibernatetool>                                             \n"
+		);
+		setDatabaseCreationScript(new String[] {
+				"create table PERSON (ID int not null, NAME varchar(20), primary key (ID))"
+		});
+		createProjectAndBuild();
+		assertFolderExists("generated-sources", 1);
+		assertFileExists("generated-sources/Person.java");
+
+
+    }
+
+}
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
deleted file mode 100644
index b29b298cd1..0000000000
--- a/ant/src/it/java/org/hibernate/tool/ant/hbm2java/JpaDefaultTestIT.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.hibernate.tool.ant.hbm2java;
-
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import java.io.File;
-import java.nio.file.Files;
-
-import org.hibernate.tool.it.ant.TestTemplate;
-import org.junit.jupiter.api.Test;
-
-public class JpaDefaultTestIT extends TestTemplate {
-
-    @Test
-    public void testJpaDefault() throws Exception {
-		setHibernateToolTaskXml(
-				"        <hibernatetool destdir='generated'>                          \n" +
-				"            <jdbcconfiguration propertyfile='hibernate.properties'/> \n" +
-				"            <hbm2java/>                                              \n" +
-				"        </hibernatetool>                                             \n"
-		);
-		setDatabaseCreationScript(new String[] {
-				"create table PERSON (ID int not null, NAME varchar(20), primary key (ID))"
-		});
-		createProjectAndBuild();
-		assertFolderExists("generated", 1);
-		assertFileExists("generated/Person.java");
-		String generatedPersonJavaFileContents = getFileContents("generated/Person.java");
-		assertTrue(generatedPersonJavaFileContents.contains("import jakarta.persistence.Entity;"));
-		assertTrue(generatedPersonJavaFileContents.contains("public class Person "));
-   }
-
-}
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
deleted file mode 100644
index 61197ec829..0000000000
--- a/ant/src/it/java/org/hibernate/tool/ant/hbm2java/NoAnnotationsTestIT.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.hibernate.tool.ant.hbm2java;
-
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import java.io.File;
-import java.nio.file.Files;
-
-import org.hibernate.tool.it.ant.TestTemplate;
-import org.junit.jupiter.api.Test;
-
-public class NoAnnotationsTestIT extends TestTemplate {
-	
-    @Test
-    public void testNoAnnotations() throws Exception {
-		setHibernateToolTaskXml(
-				"        <hibernatetool destdir='generated'>                          \n" +
-				"            <jdbcconfiguration propertyfile='hibernate.properties'/> \n" +
-				"            <hbm2java ejb3='false'/>                                 \n" +
-				"        </hibernatetool>                                             \n"
-			);
-		setDatabaseCreationScript(new String[] {
-				"create table PERSON (ID int not null, NAME varchar(20), primary key (ID))"
-		});
-		createProjectAndBuild();
-		assertFolderExists("generated", 1);
-		assertFileExists("generated/Person.java");
-		String generatedPersonJavaFileContents = getFileContents("generated/Person.java");
-		assertFalse(generatedPersonJavaFileContents.contains("import jakarta.persistence.Entity;"));
-		assertTrue(generatedPersonJavaFileContents.contains("public class Person "));
-    }
-
-}
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
deleted file mode 100644
index b0e66f57eb..0000000000
--- a/ant/src/it/java/org/hibernate/tool/ant/hbm2java/NoGenericsTestIT.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.hibernate.tool.ant.hbm2java;
-
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import java.io.File;
-import java.nio.file.Files;
-
-import org.hibernate.tool.it.ant.TestTemplate;
-import org.junit.jupiter.api.Test;
-
-public class NoGenericsTestIT extends TestTemplate {
-	
-    @Test
-    public void testUseGenerics() throws Exception {
-		setHibernateToolTaskXml(
-				"        <hibernatetool destdir='generated'>                          \n" +
-				"            <jdbcconfiguration propertyfile='hibernate.properties'/> \n" +
-				"            <hbm2java jdk5='false'/>                                 \n" +
-				"        </hibernatetool>                                             \n"
-		);
-		setDatabaseCreationScript(new String[] {
-				"create table PERSON (ID int not null, NAME varchar(20), " +
-						"primary key (ID))",
-				"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))"
-		});
-		createProjectAndBuild();
-    	verifyResult();
-    }
-
-	private void verifyResult() throws Exception {
-		File generatedOutputFolder = new File(getProjectDir(), "generated");
-		assertTrue(generatedOutputFolder.exists());
-		assertTrue(generatedOutputFolder.isDirectory());
-		assertEquals(2, generatedOutputFolder.list().length);
-		File generatedPersonJavaFile = new File(generatedOutputFolder, "Person.java");
-		assertTrue(generatedPersonJavaFile.exists());
-		assertTrue(generatedPersonJavaFile.isFile());
-		String generatedPersonJavaFileContents = new String(
-				Files.readAllBytes(generatedPersonJavaFile.toPath()));
-		assertTrue(generatedPersonJavaFileContents.contains("public class Person "));
-		assertFalse(generatedPersonJavaFileContents.contains("Set<Item>"));
-		File generatedItemJavaFile = new File(generatedOutputFolder, "Item.java");
-		assertTrue(generatedItemJavaFile.exists());
-		assertTrue(generatedItemJavaFile.isFile());
-		String generatedItemJavaFileContents = new String(
-				Files.readAllBytes(generatedItemJavaFile.toPath()));
-		assertTrue(generatedItemJavaFileContents.contains("public class Item "));
-	}
-	
-}
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
deleted file mode 100644
index 6a390334f1..0000000000
--- a/ant/src/it/java/org/hibernate/tool/ant/hbm2java/UseGenericsTestIT.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.hibernate.tool.ant.hbm2java;
-
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import java.io.File;
-import java.nio.file.Files;
-
-import org.hibernate.tool.it.ant.TestTemplate;
-import org.junit.jupiter.api.Test;
-
-public class UseGenericsTestIT extends TestTemplate {
-	
-    @Test
-    public void testUseGenerics() throws Exception {
-		setHibernateToolTaskXml(
-				"        <hibernatetool destdir='generated'>                          \n" +
-				"            <jdbcconfiguration propertyfile='hibernate.properties'/> \n" +
-				"            <hbm2java/>                                              \n" +
-				"        </hibernatetool>                                             \n"
-		);
-		setDatabaseCreationScript(new String[] {
-				"create table PERSON (ID int not null, NAME varchar(20), " +
-						"primary key (ID))",
-				"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))"
-		});
-		createProjectAndBuild();
-    	verifyResult();
-    }
-
-	private void verifyResult() throws Exception {
-		File generatedOutputFolder = new File(getProjectDir(), "generated");
-		assertTrue(generatedOutputFolder.exists());
-		assertTrue(generatedOutputFolder.isDirectory());
-		assertEquals(2, generatedOutputFolder.list().length);
-		File generatedPersonJavaFile = new File(generatedOutputFolder, "Person.java");
-		assertTrue(generatedPersonJavaFile.exists());
-		assertTrue(generatedPersonJavaFile.isFile());
-		String generatedPersonJavaFileContents = new String(
-				Files.readAllBytes(generatedPersonJavaFile.toPath()));
-		assertTrue(generatedPersonJavaFileContents.contains("public class Person "));
-		assertTrue(generatedPersonJavaFileContents.contains("Set<Item>"));
-		File generatedItemJavaFile = new File(generatedOutputFolder, "Item.java");
-		assertTrue(generatedItemJavaFile.exists());
-		assertTrue(generatedItemJavaFile.isFile());
-		String generatedItemJavaFileContents = new String(
-				Files.readAllBytes(generatedItemJavaFile.toPath()));
-		assertTrue(generatedItemJavaFileContents.contains("public class Item "));
-	}
-	
-}
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
deleted file mode 100644
index d8ef3c134c..0000000000
--- a/ant/src/it/java/org/hibernate/tool/ant/tutorial/TutorialTestIT.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.hibernate.tool.ant.tutorial;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import java.io.File;
-import java.nio.file.Files;
-
-import org.hibernate.tool.it.ant.TestTemplate;
-import org.junit.jupiter.api.Test;
-
-public class TutorialTestIT extends TestTemplate {
-	
-    @Test
-    public void testTutorial() throws Exception {
-		setHibernateToolTaskXml(
-				"        <hibernatetool destdir='generated'>                          \n" +
-				"            <jdbcconfiguration propertyfile='hibernate.properties'/> \n" +
-				"            <hbm2java/>                                              \n" +
-				"        </hibernatetool>                                             \n"
-		);
-		setDatabaseCreationScript(new String[] {
-				"create table PERSON (ID int not null, NAME varchar(20), primary key (ID))"
-		});
-		createProjectAndBuild();
-    	verifyResult();
-    }
-
-	private void verifyResult() {
-		File generatedOutputFolder = new File(getProjectDir(), "generated");
-		assertTrue(generatedOutputFolder.exists());
-		assertTrue(generatedOutputFolder.isDirectory());
-		assertEquals(1, generatedOutputFolder.list().length);
-		File generatedPersonJavaFile = new File(generatedOutputFolder, "Person.java");
-		assertTrue(generatedPersonJavaFile.exists());
-		assertTrue(generatedPersonJavaFile.isFile());
-	}
-	
-}