diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/idgenerator/SequenceGeneratorsTest.java b/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/idgenerator/SequenceGeneratorsTest.java
new file mode 100644
index 0000000000..808a79d2bc
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/idgenerator/SequenceGeneratorsTest.java
@@ -0,0 +1,124 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ */
+package org.hibernate.test.schemaupdate.idgenerator;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.SequenceGenerators;
+import javax.persistence.Table;
+
+import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.registry.StandardServiceRegistry;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.boot.spi.MetadataImplementor;
+import org.hibernate.cfg.Environment;
+import org.hibernate.tool.hbm2ddl.SchemaExport;
+import org.hibernate.tool.schema.TargetType;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertThat;
+
+/**
+ * @author Andrea Boriero
+ */
+public class SequenceGeneratorsTest {
+	private StandardServiceRegistry ssr;
+	private File output;
+	private MetadataImplementor metadata;
+
+	@Before
+	public void setUp() throws Exception {
+		ssr = new StandardServiceRegistryBuilder()
+				.applySetting( Environment.HBM2DDL_AUTO, "none" )
+				.build();
+		output = File.createTempFile( "update_script", ".sql" );
+		output.deleteOnExit();
+		metadata = (MetadataImplementor) new MetadataSources( ssr )
+				.addAnnotatedClass( TestEntity.class )
+				.buildMetadata();
+		metadata.validate();
+	}
+
+	@Test
+	public void testSequenceIsGenerated() throws Exception {
+		new SchemaExport()
+				.setOutputFile( output.getAbsolutePath() )
+				.create( EnumSet.of( TargetType.SCRIPT, TargetType.DATABASE ), metadata );
+
+		List<String> commands = Files.readAllLines( output.toPath() );
+
+		assertThat(
+				isCommandGenerated( commands, "create table test_entity \\(id .*, primary key \\(id\\)\\)" ),
+				is( true )
+		);
+
+		assertThat(
+				isCommandGenerated( commands, "create sequence sequence_generator start with 5 increment by 3" ),
+				is( true )
+		);
+	}
+
+	@After
+	public void tearDown() {
+		try {
+			new SchemaExport()
+					.drop( EnumSet.of( TargetType.DATABASE ), metadata );
+		}
+		finally {
+			StandardServiceRegistryBuilder.destroy( ssr );
+		}
+
+	}
+
+	private boolean isCommandGenerated(List<String> commands, String expectedCommnad) {
+		final Pattern pattern = Pattern.compile( expectedCommnad.toLowerCase() );
+		for ( String command : commands ) {
+			Matcher matcher = pattern.matcher( command.toLowerCase() );
+			if ( matcher.matches() ) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+
+	@Entity(name = "TestEntity")
+	@Table(name = "TEST_ENTITY")
+	public static class TestEntity {
+		Long id;
+
+		@Id
+		@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQUENCEGENERATOR")
+		@SequenceGenerators({
+				@SequenceGenerator(
+						name = "SEQUENCEGENERATOR",
+						allocationSize = 3,
+						initialValue = 5,
+						sequenceName = "SEQUENCE_GENERATOR")
+		})
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+	}
+}
diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/idgenerator/TableGeneratorsTest.java b/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/idgenerator/TableGeneratorsTest.java
new file mode 100644
index 0000000000..b2ac490845
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/idgenerator/TableGeneratorsTest.java
@@ -0,0 +1,145 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ */
+package org.hibernate.test.schemaupdate.idgenerator;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+import javax.persistence.TableGenerators;
+
+import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.registry.StandardServiceRegistry;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.boot.spi.MetadataImplementor;
+import org.hibernate.cfg.Environment;
+import org.hibernate.tool.hbm2ddl.SchemaExport;
+import org.hibernate.tool.schema.TargetType;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertTrue;
+
+/**
+ * @author Andrea Boriero
+ */
+public class TableGeneratorsTest {
+
+	private StandardServiceRegistry ssr;
+	private File output;
+	private MetadataImplementor metadata;
+	private static final int INITIAL_VALUE = 5;
+	private static final int EXPECTED_DB_INSERTED_VALUE = INITIAL_VALUE;
+
+	@Before
+	public void setUp() throws Exception {
+		ssr = new StandardServiceRegistryBuilder()
+				.applySetting( Environment.HBM2DDL_AUTO, "none" )
+				.build();
+
+		output = File.createTempFile( "update_script", ".sql" );
+		output.deleteOnExit();
+
+		metadata = (MetadataImplementor) new MetadataSources( ssr )
+				.addAnnotatedClass( TestEntity.class )
+				.buildMetadata();
+		metadata.validate();
+	}
+
+	@Test
+	public void testTableGeneratorIsGenerated() throws Exception {
+		new SchemaExport()
+				.setOutputFile( output.getAbsolutePath() )
+				.create( EnumSet.of( TargetType.SCRIPT, TargetType.DATABASE ), metadata );
+
+		final List<String> commands = Files.readAllLines( output.toPath() );
+
+		final String expectedTestEntityTableCreationCommand = "create table test_entity \\(id .*, primary key \\(id\\)\\)";
+		assertTrue(
+				"The command '" + expectedTestEntityTableCreationCommand + "' has not been correctly generated",
+				isCommandGenerated( commands, expectedTestEntityTableCreationCommand )
+		);
+
+		final String expectedIdTableGeneratorCreationCommand = "create table ID_TABLE_GENERATOR \\(PK .*, VALUE .*, primary key \\(PK\\)\\)";
+
+		assertTrue(
+				"The command '" + expectedIdTableGeneratorCreationCommand + "' has not been correctly generated",
+
+				isCommandGenerated(
+						commands,
+						expectedIdTableGeneratorCreationCommand
+				)
+		);
+
+		final String expectedInsertIntoTableGeneratorCommand = "INSERT INTO ID_TABLE_GENERATOR\\(PK, VALUE\\) values \\('TEST_ENTITY_ID'," + EXPECTED_DB_INSERTED_VALUE + "\\)";
+
+		assertTrue(
+				"The command '" + expectedInsertIntoTableGeneratorCommand + "' has not been correctly generated",
+				isCommandGenerated(
+						commands,
+						expectedInsertIntoTableGeneratorCommand
+				)
+		);
+	}
+
+	@After
+	public void tearDown() {
+		try {
+			new SchemaExport().drop( EnumSet.of( TargetType.DATABASE ), metadata );
+		}
+		finally {
+			StandardServiceRegistryBuilder.destroy( ssr );
+		}
+	}
+
+	@Entity(name = "TestEntity")
+	@Table(name = "TEST_ENTITY")
+	@TableGenerators({
+			@TableGenerator(name = "tableGenerator",
+					table = "ID_TABLE_GENERATOR",
+					pkColumnName = "PK",
+					pkColumnValue = "TEST_ENTITY_ID",
+					valueColumnName = "VALUE",
+					allocationSize = 3,
+					initialValue = INITIAL_VALUE)
+	}
+	)
+	public static class TestEntity {
+		Long id;
+
+		@Id
+		@GeneratedValue(strategy = GenerationType.TABLE, generator = "tableGenerator")
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+	}
+
+	private boolean isCommandGenerated(List<String> commands, String expectedCommnad) {
+		final Pattern pattern = Pattern.compile( expectedCommnad.toLowerCase() );
+		for ( String command : commands ) {
+			Matcher matcher = pattern.matcher( command.toLowerCase() );
+			if ( matcher.matches() ) {
+				return true;
+			}
+		}
+		return false;
+	}
+}