diff --git a/test/maven/src/it/generateHbm/invoker.properties b/test/maven/src/it/generateHbm/invoker.properties
new file mode 100644
index 0000000000..13598db400
--- /dev/null
+++ b/test/maven/src/it/generateHbm/invoker.properties
@@ -0,0 +1,2 @@
+invoker.java.version = 1.8+
+invoker.goals = generate-resources
\ No newline at end of file
diff --git a/test/maven/src/it/generateHbm/pom.xml b/test/maven/src/it/generateHbm/pom.xml
new file mode 100644
index 0000000000..31b70c7f7e
--- /dev/null
+++ b/test/maven/src/it/generateHbm/pom.xml
@@ -0,0 +1,53 @@
+
+
+ 4.0.0
+
+ org.hibernate.tool.test
+ hbm2ddl
+ 0.0.1-SNAPSHOT
+
+
+ UTF-8
+ UTF-8
+
+ 1.8
+ 1.4.195
+
+
+
+
+
+ org.hibernate.tool
+ hibernate-tools-maven
+ @project.version@
+
+
+ HBM generation
+ generate-resources
+
+ generateHbm
+
+
+ ${project.build.directory}/generated-sources
+ ${project.basedir}/src/main/resources/templates/
+
+
+
+
+ ${project.basedir}/src/main/resources/hibernate.reveng.xml
+
+
+
+
+ com.h2database
+ h2
+ ${h2.version}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/test/maven/src/it/generateHbm/src/main/resources/hibernate.properties b/test/maven/src/it/generateHbm/src/main/resources/hibernate.properties
new file mode 100644
index 0000000000..71496b3adc
--- /dev/null
+++ b/test/maven/src/it/generateHbm/src/main/resources/hibernate.properties
@@ -0,0 +1,7 @@
+hibernate.dialect=org.hibernate.dialect.H2Dialect
+hibernate.connection.driver_class=org.h2.Driver
+hibernate.connection.url=jdbc:h2:./test;DB_CLOSE_ON_EXIT=FALSE
+hibernate.connection.username=sa
+hibernate.connection.password=
+hibernate.connection.pool_size=1
+hibernate.show_sql=true
\ No newline at end of file
diff --git a/test/maven/src/it/generateHbm/src/main/resources/hibernate.reveng.xml b/test/maven/src/it/generateHbm/src/main/resources/hibernate.reveng.xml
new file mode 100644
index 0000000000..7ac52fd2cf
--- /dev/null
+++ b/test/maven/src/it/generateHbm/src/main/resources/hibernate.reveng.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/test/maven/src/it/generateHbm/src/main/resources/templates/pojo/Pojo.ftl b/test/maven/src/it/generateHbm/src/main/resources/templates/pojo/Pojo.ftl
new file mode 100644
index 0000000000..84ff76a5b2
--- /dev/null
+++ b/test/maven/src/it/generateHbm/src/main/resources/templates/pojo/Pojo.ftl
@@ -0,0 +1,29 @@
+${pojo.getPackageDeclaration()}
+// Generated ${date} by Hibernate Tools ${version}
+
+<#assign classbody>
+<#include "PojoTypeDeclaration.ftl"/> {
+
+<#if !pojo.isInterface()>
+<#include "PojoFields.ftl"/>
+
+<#include "PojoConstructors.ftl"/>
+
+<#include "PojoPropertyAccessors.ftl"/>
+
+<#include "PojoToString.ftl"/>
+
+<#include "PojoEqualsHashcode.ftl"/>
+
+<#else>
+<#include "PojoInterfacePropertyAccessors.ftl"/>
+
+#if>
+<#include "PojoExtraClassCode.ftl"/>
+
+}
+#assign>
+
+${pojo.generateImports()}
+${classbody}
+
diff --git a/test/maven/src/it/generateHbm/src/main/resources/templates/pojo/PojoFields.ftl b/test/maven/src/it/generateHbm/src/main/resources/templates/pojo/PojoFields.ftl
new file mode 100644
index 0000000000..18cf396cc6
--- /dev/null
+++ b/test/maven/src/it/generateHbm/src/main/resources/templates/pojo/PojoFields.ftl
@@ -0,0 +1,7 @@
+<#-- // Fields -->
+<#list pojo.getAllPropertiesIterator() as field><#if pojo.getMetaAttribAsBool(field, "gen-property", true)><#if pojo.hasMetaAttribute(field, "field-description")> /**
+ ${pojo.getFieldJavaDoc(field, 0)}
+ */
+#if> ${pojo.getFieldModifiers(field)} ${pojo.getJavaTypeName(field, jdk5)} ${c2j.keyWordCheck(field.name)}<#if pojo.hasFieldInitializor(field, jdk5)> = ${pojo.getFieldInitialization(field, jdk5)}#if>;
+#if>
+#list>
diff --git a/test/maven/src/it/generateHbm/test.mv.db b/test/maven/src/it/generateHbm/test.mv.db
new file mode 100644
index 0000000000..72d79270f8
Binary files /dev/null and b/test/maven/src/it/generateHbm/test.mv.db differ
diff --git a/test/maven/src/it/generateHbm/verify.groovy b/test/maven/src/it/generateHbm/verify.groovy
new file mode 100644
index 0000000000..586fe51dc5
--- /dev/null
+++ b/test/maven/src/it/generateHbm/verify.groovy
@@ -0,0 +1,6 @@
+import java.io.*;
+
+File file = new File(basedir, "target/generated-sources/Person.hbm.xml");
+if (!file.isFile()) {
+ throw new FileNotFoundException("Could not find generated HBM file: " + file);
+}