diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/AbstractLimitHandlerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/AbstractLimitHandlerTest.java
index 39f4f7fda54d..2067f9d10bcd 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/AbstractLimitHandlerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/AbstractLimitHandlerTest.java
@@ -68,4 +68,5 @@ else if (hasFirstRow(limit)) {
 		}
 		return " limit ?";
 	}
+
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2DialectTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2DialectTestCase.java
index 84c4f8282d1a..b3bb82f6f225 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2DialectTestCase.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2DialectTestCase.java
@@ -9,6 +9,7 @@
 import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.engine.jdbc.Size;
 import org.hibernate.query.spi.Limit;
+import org.hibernate.testing.orm.junit.RequiresDialect;
 import org.hibernate.type.spi.TypeConfiguration;
 
 import org.junit.Before;
@@ -26,6 +27,7 @@
  * @author Hardy Ferentschik
  */
 
+@RequiresDialect(DB2Dialect.class)
 public class DB2DialectTestCase extends BaseUnitTestCase {
 	private final DB2Dialect dialect = new DB2Dialect();
 	private TypeConfiguration typeConfiguration;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2LimitHandlerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2LimitHandlerTest.java
index e332897aadac..61eedfac2503 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2LimitHandlerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2LimitHandlerTest.java
@@ -4,12 +4,15 @@
  */
 package org.hibernate.orm.test.dialect;
 
+import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.dialect.pagination.AbstractLimitHandler;
 import org.hibernate.dialect.pagination.DB2LimitHandler;
+import org.hibernate.testing.orm.junit.RequiresDialect;
 
 /**
  * @author Yanming Zhou
  */
+@RequiresDialect(DB2Dialect.class)
 public class DB2LimitHandlerTest extends AbstractLimitHandlerTest {
 
 	@Override
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/Db2VariantDialectInitTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/Db2VariantDialectInitTests.java
index e2169e8fb1bf..bc5324e235aa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/Db2VariantDialectInitTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/Db2VariantDialectInitTests.java
@@ -7,6 +7,7 @@
 import org.hibernate.dialect.DB2iDialect;
 import org.hibernate.dialect.DB2zDialect;
 import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.RequiresDialect;
 import org.junit.Test;
 
 import static org.junit.Assert.assertNotNull;
@@ -15,6 +16,8 @@
  * @author Steve Ebersole
  */
 @JiraKey(value = "HHH-15046")
+@RequiresDialect(DB2iDialect.class)
+@RequiresDialect(DB2zDialect.class)
 public class Db2VariantDialectInitTests {
 	@Test
 	public void testDB2zDialectInit() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/Oracle12LimitHandlerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/Oracle12LimitHandlerTest.java
index 6b5c6c087caf..b905ce672960 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/Oracle12LimitHandlerTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/Oracle12LimitHandlerTest.java
@@ -4,18 +4,21 @@
  */
 package org.hibernate.orm.test.dialect;
 
+import org.hibernate.dialect.OracleDialect;
 import org.hibernate.dialect.pagination.AbstractLimitHandler;
 
 import org.hibernate.dialect.pagination.Oracle12LimitHandler;
 import org.hibernate.query.spi.Limit;
 import org.hibernate.testing.orm.junit.JiraKey;
 
+import org.hibernate.testing.orm.junit.RequiresDialect;
 import org.junit.jupiter.api.Test;
 
 import static org.hibernate.dialect.pagination.AbstractLimitHandler.hasFirstRow;
 import static org.hibernate.dialect.pagination.AbstractLimitHandler.hasMaxRows;
 
 @JiraKey( value = "HHH-14649")
+@RequiresDialect(OracleDialect.class)
 public class Oracle12LimitHandlerTest extends AbstractLimitHandlerTest {
 
 	@Override
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/PostgreSQLDialectTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/PostgreSQLDialectTestCase.java
index 00b3b6d8d92a..e5812f246508 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/PostgreSQLDialectTestCase.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/PostgreSQLDialectTestCase.java
@@ -32,6 +32,7 @@
 import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.junit4.BaseUnitTestCase;
+import org.hibernate.testing.orm.junit.RequiresDialect;
 import org.hibernate.type.spi.TypeConfiguration;
 import org.junit.Test;
 
@@ -49,6 +50,7 @@
  * @author Bryan Varner
  * @author Christoph Dreis
  */
+@RequiresDialect(PostgreSQLDialect.class)
 public class PostgreSQLDialectTestCase extends BaseUnitTestCase {
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/CockroachDialectVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/CockroachDialectVersionTest.java
index c9a0384b5c4d..f56eb1f67091 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/CockroachDialectVersionTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/CockroachDialectVersionTest.java
@@ -11,6 +11,7 @@
 
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.logger.Triggerable;
+import org.hibernate.testing.orm.junit.RequiresDialect;
 import org.hibernate.testing.orm.logger.LoggerInspectionExtension;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -26,6 +27,7 @@
 /**
  * @author Jan Schatteman
  */
+@RequiresDialect(CockroachDialect.class)
 public class CockroachDialectVersionTest {
 
 	private Triggerable triggerable;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/lockhint/MySQLStorageEngineTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/lockhint/MySQLStorageEngineTest.java
index 10ef4a101388..f1a3da96e901 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/lockhint/MySQLStorageEngineTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/lockhint/MySQLStorageEngineTest.java
@@ -9,6 +9,7 @@
 import org.hibernate.dialect.MySQLDialect;
 
 import org.hibernate.testing.junit4.BaseUnitTestCase;
+import org.hibernate.testing.orm.junit.RequiresDialect;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
@@ -17,6 +18,7 @@
 import java.lang.reflect.Field;
 import java.util.Properties;
 
+@RequiresDialect(MySQLDialect.class)
 public class MySQLStorageEngineTest extends BaseUnitTestCase {
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/lockhint/SQLServerLockHintsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/lockhint/SQLServerLockHintsTest.java
index 5de2d9c06c15..1d62b69e3917 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/lockhint/SQLServerLockHintsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/lockhint/SQLServerLockHintsTest.java
@@ -6,10 +6,12 @@
 
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.SQLServerDialect;
+import org.hibernate.testing.orm.junit.RequiresDialect;
 
 /**
  * @author Steve Ebersole
  */
+@RequiresDialect(SQLServerDialect.class)
 public class SQLServerLockHintsTest extends AbstractLockHintTest {
 	public static final Dialect DIALECT = new SQLServerDialect();
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/lockhint/SybaseLockHintsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/lockhint/SybaseLockHintsTest.java
index ca32009fb948..e2d178829a5d 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/lockhint/SybaseLockHintsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/lockhint/SybaseLockHintsTest.java
@@ -6,10 +6,12 @@
 
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.SybaseDialect;
+import org.hibernate.testing.orm.junit.RequiresDialect;
 
 /**
  * @author Steve Ebersole
  */
+@RequiresDialect(SybaseDialect.class)
 public class SybaseLockHintsTest extends AbstractLockHintTest {
 	public static final Dialect DIALECT = new SybaseDialect();
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/locktimeout/DB2LockTimeoutTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/locktimeout/DB2LockTimeoutTest.java
index ca76f67aa5d2..ebdc318f25e6 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/locktimeout/DB2LockTimeoutTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/locktimeout/DB2LockTimeoutTest.java
@@ -10,6 +10,7 @@
 import org.hibernate.dialect.DatabaseVersion;
 import org.hibernate.dialect.Dialect;
 import org.hibernate.testing.junit4.BaseUnitTestCase;
+import org.hibernate.testing.orm.junit.RequiresDialect;
 import org.junit.Test;
 
 import static org.hibernate.Timeouts.SKIP_LOCKED;
@@ -18,6 +19,7 @@
 /**
  * @author Gavin King
  */
+@RequiresDialect(DB2Dialect.class)
 public class DB2LockTimeoutTest extends BaseUnitTestCase {
 
 	private final Dialect dialect = new DB2Dialect( DatabaseVersion.make( 11, 5 ) );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/locktimeout/HANALockTimeoutTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/locktimeout/HANALockTimeoutTest.java
index 6e4af48e1dd4..85b21d5f0123 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/locktimeout/HANALockTimeoutTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/locktimeout/HANALockTimeoutTest.java
@@ -9,6 +9,7 @@
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.HANADialect;
 import org.hibernate.testing.junit4.BaseUnitTestCase;
+import org.hibernate.testing.orm.junit.RequiresDialect;
 import org.junit.Test;
 
 import static org.hibernate.Timeouts.NO_WAIT;
@@ -22,6 +23,7 @@
  *
  * @author Vlad Mihalcea
  */
+@RequiresDialect(HANADialect.class)
 public class HANALockTimeoutTest extends BaseUnitTestCase {
 
 	private final Dialect dialect = new HANADialect();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/locktimeout/PostgreSQLLockTimeoutTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/locktimeout/PostgreSQLLockTimeoutTest.java
index 372f97b1efec..c6c7f54c3978 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/locktimeout/PostgreSQLLockTimeoutTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/locktimeout/PostgreSQLLockTimeoutTest.java
@@ -10,6 +10,7 @@
 import org.hibernate.dialect.PostgreSQLDialect;
 
 import org.hibernate.testing.junit4.BaseUnitTestCase;
+import org.hibernate.testing.orm.junit.RequiresDialect;
 import org.junit.Test;
 
 import static org.hibernate.Timeouts.NO_WAIT;
@@ -19,6 +20,7 @@
 /**
  * @author Vlad Mihalcea
  */
+@RequiresDialect(PostgreSQLDialect.class)
 public class PostgreSQLLockTimeoutTest extends BaseUnitTestCase {
 
 	private final Dialect dialect = new PostgreSQLDialect();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/sequence/DB2iSequenceInformationExtractorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/sequence/DB2iSequenceInformationExtractorTest.java
index dc18f9fa6e2f..74b5a7d67b73 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/sequence/DB2iSequenceInformationExtractorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/sequence/DB2iSequenceInformationExtractorTest.java
@@ -6,6 +6,7 @@
 
 import org.hibernate.dialect.DB2iDialect;
 import org.hibernate.dialect.Dialect;
+import org.hibernate.testing.orm.junit.RequiresDialect;
 import org.hibernate.tool.schema.extract.internal.SequenceInformationExtractorNoOpImpl;
 import org.hibernate.tool.schema.extract.spi.SequenceInformationExtractor;
 
@@ -16,6 +17,7 @@
  * @author Andrea Boriero
  */
 @JiraKey(value = "HHH-11470")
+@RequiresDialect(DB2iDialect.class)
 public class DB2iSequenceInformationExtractorTest extends AbstractSequenceInformationExtractorTest {
 
 	@Override
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/sequence/DB2zSequenceInformationExtractorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/sequence/DB2zSequenceInformationExtractorTest.java
index 4e5d5c5f1eb3..c9d196883d59 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/sequence/DB2zSequenceInformationExtractorTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/unit/sequence/DB2zSequenceInformationExtractorTest.java
@@ -6,6 +6,7 @@
 
 import org.hibernate.dialect.DB2zDialect;
 import org.hibernate.dialect.Dialect;
+import org.hibernate.testing.orm.junit.RequiresDialect;
 import org.hibernate.tool.schema.extract.internal.SequenceInformationExtractorDB2DatabaseImpl;
 import org.hibernate.tool.schema.extract.spi.SequenceInformationExtractor;
 
@@ -15,6 +16,7 @@
  * @author Andrea Boriero
  */
 @JiraKey(value = "HHH-11470")
+@RequiresDialect(DB2zDialect.class)
 public class DB2zSequenceInformationExtractorTest extends AbstractSequenceInformationExtractorTest {
 
 	@Override