HHH-18592 - Remove deprecated @TestForIssue

Signed-off-by: Jan Schatteman <jschatte@redhat.com>

hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0ConnectionProviderTest.java

@@ -18,7 +18,7 @@ import org.hibernate.cfg.Environment;
 import org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentInitiator.ConnectionProviderJdbcConnectionAccess;
 import org.hibernate.engine.jdbc.spi.JdbcServices;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 import org.junit.Test;
 
@@ -91,7 +91,7 @@ public class C3P0ConnectionProviderTest extends BaseCoreFunctionalTestCase {
 		assertTrue( "PooledDataSource BMean not found, please verify version of c3p0", mbeanfound );
 	}
 
-	@Test @TestForIssue(jiraKey="HHH-9498")
+	@Test @JiraKey(value="HHH-9498")
 	public void testIsolationPropertyCouldBeEmpty() {
 		C3P0ConnectionProvider provider = new C3P0ConnectionProvider();
 		try {

hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0DefaultIsolationLevelTest.java

@@ -11,7 +11,7 @@ import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.dialect.H2Dialect;
 
 import org.hibernate.testing.RequiresDialect;
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.jdbc.SQLStatementInterceptor;
 import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase;
 import org.junit.Test;
@@ -25,7 +25,7 @@ import static org.mockito.Mockito.verify;
 /**
  * @author Vlad Mihalcea
  */
-@TestForIssue(jiraKey = "HHH-12749")
+@JiraKey(value = "HHH-12749")
 @RequiresDialect(H2Dialect.class)
 public class C3P0DefaultIsolationLevelTest extends
 		BaseNonConfigCoreFunctionalTestCase {

hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3P0DifferentIsolationLevelTest.java

@@ -11,7 +11,7 @@ import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.dialect.H2Dialect;
 
 import org.hibernate.testing.RequiresDialect;
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.jdbc.SQLStatementInterceptor;
 import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase;
 import org.junit.Test;
@@ -25,7 +25,7 @@ import static org.mockito.Mockito.verify;
 /**
  * @author Vlad Mihalcea
  */
-@TestForIssue(jiraKey = "HHH-12749")
+@JiraKey(value = "HHH-12749")
 @RequiresDialect(H2Dialect.class)
 public class C3P0DifferentIsolationLevelTest extends
 		BaseNonConfigCoreFunctionalTestCase {

hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/JdbcCompatibilityTest.java

@@ -10,7 +10,7 @@ import java.sql.Statement;
 
 import org.hibernate.dialect.SQLServerDialect;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.RequiresDialect;
 import org.hibernate.testing.orm.junit.SessionFactory;
@@ -33,7 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 public class JdbcCompatibilityTest {
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-11308")
+	@JiraKey(value = "HHH-11308")
 	public void testJdbc41(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
 			session.doWork( connection -> {
@@ -45,7 +45,7 @@ public class JdbcCompatibilityTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-11308")
+	@JiraKey(value = "HHH-11308")
 	public void testJdbc42(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
 			for ( int i = 0; i < 5; i++ ) {

hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/OracleSQLCallableStatementProxyTest.java

@@ -18,7 +18,7 @@ import org.hibernate.cfg.Configuration;
 import org.hibernate.dialect.OracleDialect;
 
 import org.hibernate.testing.RequiresDialect;
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 import org.junit.Before;
 import org.junit.Test;
@@ -30,7 +30,7 @@ import static org.junit.Assert.assertEquals;
  * @author Vlad Mihalcea
  */
 @RequiresDialect(OracleDialect.class)
-@TestForIssue( jiraKey = "HHH-10256" )
+@JiraKey(value = "HHH-10256")
 public class OracleSQLCallableStatementProxyTest extends
 		BaseCoreFunctionalTestCase {
 

hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/StatementCacheTest.java

@@ -14,8 +14,8 @@ import jakarta.persistence.criteria.CriteriaQuery;
 import org.junit.Assert;
 import org.junit.Test;
 
-import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
+import org.hibernate.testing.orm.junit.JiraKey;
 
 /**
  * Tests that when using cached prepared statement with batching enabled doesn't bleed over into new transactions. 
@@ -24,7 +24,7 @@ import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
  */
 public class StatementCacheTest extends BaseCoreFunctionalTestCase {
 	@Test
-	@TestForIssue( jiraKey = "HHH-7193" )
+	@JiraKey(value = "HHH-7193")
 	public void testStatementCaching() {
 		inSession(
 				session -> {

hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DB2LegacyDialectTestCase.java

@@ -12,7 +12,7 @@ import org.hibernate.engine.jdbc.Size;
 import org.hibernate.query.spi.Limit;
 import org.hibernate.type.spi.TypeConfiguration;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.junit4.BaseUnitTestCase;
 import org.junit.Before;
 import org.junit.Test;
@@ -37,7 +37,7 @@ public class DB2LegacyDialectTestCase extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-6866")
+	@JiraKey(value = "HHH-6866")
 	public void testGetDefaultBinaryTypeName() {
 		String actual = typeConfiguration.getDdlTypeRegistry().getTypeName( Types.BINARY, dialect );
 		assertEquals(
@@ -48,7 +48,7 @@ public class DB2LegacyDialectTestCase extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-6866")
+	@JiraKey(value = "HHH-6866")
 	public void testGetExplicitBinaryTypeName() {
 		// lower bound
 		String actual = typeConfiguration.getDdlTypeRegistry().getTypeName( Types.BINARY, Size.length( 1) );
@@ -76,7 +76,7 @@ public class DB2LegacyDialectTestCase extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-12369")
+	@JiraKey(value = "HHH-12369")
 	public void testIntegerOverflowForMaxResults() {
 		Limit rowSelection = new Limit();
 		rowSelection.setFirstRow(1);

hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyLegacyDialectTestCase.java

@@ -11,7 +11,7 @@ import org.hibernate.query.spi.Limit;
 
 import static org.junit.Assert.assertEquals;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.junit4.BaseUnitTestCase;
 import org.junit.Test;
 
@@ -23,7 +23,7 @@ import org.junit.Test;
 public class DerbyLegacyDialectTestCase extends BaseUnitTestCase {
 
 	@Test
-	@TestForIssue( jiraKey = "HHH-3972" )
+	@JiraKey( value = "HHH-3972" )
 	public void testInsertLimitClause() {
 		final int limit = 50;
 		final String input = "select * from tablename t where t.cat = 5";
@@ -34,7 +34,7 @@ public class DerbyLegacyDialectTestCase extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue( jiraKey = "HHH-3972" )
+	@JiraKey( value = "HHH-3972" )
 	public void testInsertLimitWithOffsetClause() {
 		final int limit = 50;
 		final int offset = 200;
@@ -46,7 +46,7 @@ public class DerbyLegacyDialectTestCase extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue( jiraKey = "HHH-3972" )
+	@JiraKey( value = "HHH-3972" )
 	public void testInsertLimitWithForUpdateClause() {
 		final int limit = 50;
 		final int offset = 200;
@@ -59,7 +59,7 @@ public class DerbyLegacyDialectTestCase extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue( jiraKey = "HHH-3972" )
+	@JiraKey( value = "HHH-3972" )
 	public void testInsertLimitWithWithClause() {
 		final int limit = 50;
 		final int offset = 200;
@@ -72,7 +72,7 @@ public class DerbyLegacyDialectTestCase extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue( jiraKey = "HHH-3972" )
+	@JiraKey( value = "HHH-3972" )
 	public void testInsertLimitWithForUpdateAndWithClauses() {
 		final int limit = 50;
 		final int offset = 200;

hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/InformixFunctionTest.java

@@ -14,7 +14,7 @@ import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.RequiresDialect;
 import org.hibernate.testing.orm.junit.SessionFactory;
@@ -50,7 +50,7 @@ public class InformixFunctionTest {
 	}
 
 	@Test
-	@TestForIssue( jiraKey = "HHH-10846" )
+	@JiraKey( value = "HHH-10846" )
 	public void testConcat(SessionFactoryScope scope) {
 		scope.inTransaction(
 				(session) -> {
@@ -66,7 +66,7 @@ public class InformixFunctionTest {
 	}
 
 	@Test
-	@TestForIssue( jiraKey = "HHH-10846" )
+	@JiraKey( value = "HHH-10846" )
 	public void testSubstring(SessionFactoryScope scope) {
 		scope.inTransaction(
 				(session) -> {
@@ -82,7 +82,7 @@ public class InformixFunctionTest {
 	}
 
 	@Test
-	@TestForIssue( jiraKey = "HHH-10846" )
+	@JiraKey( value = "HHH-10846" )
 	public void testSubstr(SessionFactoryScope scope) {
 		scope.inTransaction(
 				(session) -> {
@@ -98,7 +98,7 @@ public class InformixFunctionTest {
 	}
 
 	@Test
-	@TestForIssue( jiraKey = "HHH-10846" )
+	@JiraKey( value = "HHH-10846" )
 	public void testCoalesceAndNvl(SessionFactoryScope scope) {
 		scope.inTransaction(
 				(session) -> {
@@ -122,7 +122,7 @@ public class InformixFunctionTest {
 	}
 
 	@Test
-	@TestForIssue( jiraKey = "HHH-10800" )
+	@JiraKey( value = "HHH-10800" )
 	public void testCurrentDate(SessionFactoryScope scope) {
 		scope.inTransaction(
 				(session) -> {
@@ -145,7 +145,7 @@ public class InformixFunctionTest {
 	}
 
 	@Test
-	@TestForIssue( jiraKey = "HHH-10800" )
+	@JiraKey( value = "HHH-10800" )
 	public void testCurrentTimestamp(SessionFactoryScope scope) {
 		scope.inTransaction(
 				(session) -> {

hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/SQLServer2005DialectTestCase.java

@@ -13,7 +13,7 @@ import org.hibernate.LockOptions;
 import org.hibernate.dialect.DatabaseVersion;
 import org.hibernate.query.spi.Limit;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.junit4.BaseUnitTestCase;
 import org.junit.After;
 import org.junit.Before;
@@ -53,7 +53,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-10736")
+	@JiraKey(value = "HHH-10736")
 	public void testGetLimitStringWithNewlineAfterSelect() {
 		final String query = "select" + System.lineSeparator() + "* FROM Employee E WHERE E.firstName = :firstName";
 		assertEquals(
@@ -64,7 +64,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-10736")
+	@JiraKey(value = "HHH-10736")
 	public void testGetLimitStringWithNewlineAfterSelectWithMultipleSpaces() {
 		final String query = "select    " + System.lineSeparator() + "* FROM Employee E WHERE E.firstName = :firstName";
 		assertEquals(
@@ -75,7 +75,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-8507")
+	@JiraKey(value = "HHH-8507")
 	public void testGetLimitStringWithNewlineAfterColumnList() {
 		final String query = "select E.fieldA,E.fieldB\r\nFROM Employee E WHERE E.firstName = :firstName";
 		assertEquals(
@@ -88,7 +88,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-6950")
+	@JiraKey(value = "HHH-6950")
 	public void testGetLimitStringWithFromColumnName() {
 		final String fromColumnNameSQL = "select persistent0_.rid as rid1688_, " +
 				"persistent0_.deviationfromtarget as deviati16_1688_, " + // "from" character sequence as a part of the column name
@@ -105,7 +105,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-8301")
+	@JiraKey(value = "HHH-8301")
 	public void testGetLimitStringAliasGeneration() {
 		final String notAliasedSQL = "select column1, column2, column3, column4 from table1";
 
@@ -118,7 +118,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-10994")
+	@JiraKey(value = "HHH-10994")
 	public void testGetLimitStringAliasGenerationWithAliasesNoAs() {
 		final String aliasedSQLNoAs = "select column1 c1, column c2, column c3, column c4 from table1";
 		assertEquals(
@@ -130,7 +130,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-11352")
+	@JiraKey(value = "HHH-11352")
 	public void testPagingWithColumnNameStartingWithFrom() {
 		final String sql = "select column1 c1, from_column c2 from table1";
 		assertEquals( "with query_ as (select row_.*,row_number() over (order by current_timestamp) as rownumber_ from (" +
@@ -140,7 +140,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-7019")
+	@JiraKey(value = "HHH-7019")
 	public void testGetLimitStringWithSubselect() {
 		final String subselectInSelectClauseSQL = "select persistent0_.id as col_0_0_, " +
 				"(select max(persistent1_.acceptancedate) " +
@@ -158,7 +158,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-11084")
+	@JiraKey(value = "HHH-11084")
 	public void testGetLimitStringWithSelectDistinctSubselect() {
 		final String selectDistinctSubselectSQL = "select col0_.CONTENTID as CONTENT1_12_ " +
 				"where col0_.CONTENTTYPE='PAGE' and (col0_.CONTENTID in " +
@@ -173,7 +173,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-11084")
+	@JiraKey(value = "HHH-11084")
 	public void testGetLimitStringWithSelectDistinctSubselectNotFirst() {
 		final String selectDistinctSubselectSQL = "select col0_.CONTENTID as CONTENT1_12_ FROM CONTEXT col0_ " +
 				"where col0_.CONTENTTYPE='PAGE' and (col0_.CONTENTID in " +
@@ -188,7 +188,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-6728")
+	@JiraKey(value = "HHH-6728")
 	public void testGetLimitStringCaseSensitive() {
 		final String caseSensitiveSQL = "select persistent0_.id, persistent0_.uid AS tmp1, " +
 				"(select case when persistent0_.name = 'Smith' then 'Neo' else persistent0_.id end) " +
@@ -207,7 +207,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-6310")
+	@JiraKey(value = "HHH-6310")
 	public void testGetLimitStringDistinctWithinAggregation() {
 		final String distinctInAggregateSQL = "select aggregate_function(distinct p.n) as f1 from table849752 p order by f1";
 
@@ -220,7 +220,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-10994")
+	@JiraKey(value = "HHH-10994")
 	public void testGetLimitStringDistinctWithinAggregationWithoutAlias() {
 		final String distinctInAggregateSQL = "select aggregate_function(distinct p.n) from table849752 p order by f1";
 
@@ -233,7 +233,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-10994")
+	@JiraKey(value = "HHH-10994")
 	public void testGetLimitStringDistinctWithinAggregationWithAliasNoAs() {
 		final String distinctInAggregateSQL = "select aggregate_function(distinct p.n) f1 from table849752 p order by f1";
 
@@ -246,7 +246,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-7370")
+	@JiraKey(value = "HHH-7370")
 	public void testGetLimitStringWithMaxOnly() {
 		final String query = "select product2x0_.id as id0_, product2x0_.description as descript2_0_ " +
 				"from Product2 product2x0_ order by product2x0_.id";
@@ -268,7 +268,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-7781")
+	@JiraKey(value = "HHH-7781")
 	public void testGetLimitStringWithCastOperator() {
 		final String query = "select cast(lc302_doku6_.redniBrojStavke as varchar(255)) as col_0_0_, lc302_doku6_.dokumentiID as col_1_0_ " +
 				"from LC302_Dokumenti lc302_doku6_ order by lc302_doku6_.dokumentiID DESC";
@@ -283,7 +283,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-10994")
+	@JiraKey(value = "HHH-10994")
 	public void testGetLimitStringWithCastOperatorWithAliasNoAs() {
 		final String query = "select cast(lc302_doku6_.redniBrojStavke as varchar(255)) f1, lc302_doku6_.dokumentiID f2 " +
 				"from LC302_Dokumenti lc302_doku6_ order by lc302_doku6_.dokumentiID DESC";
@@ -298,7 +298,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-10994")
+	@JiraKey(value = "HHH-10994")
 	public void testGetLimitStringWithCastOperatorWithoutAliases() {
 		final String query = "select cast(lc302_doku6_.redniBrojStavke as varchar(255)), lc302_doku6_.dokumentiID " +
 				"from LC302_Dokumenti lc302_doku6_ order by lc302_doku6_.dokumentiID DESC";
@@ -313,7 +313,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-8007")
+	@JiraKey(value = "HHH-8007")
 	public void testGetLimitStringSelectingMultipleColumnsFromSeveralTables() {
 		final String query = "select t1.*, t2.* from tab1 t1, tab2 t2 where t1.ref = t2.ref order by t1.id desc";
 
@@ -326,7 +326,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-8007")
+	@JiraKey(value = "HHH-8007")
 	public void testGetLimitStringSelectingAllColumns() {
 		final String query = "select * from tab1 t1, tab2 t2 where t1.ref = t2.ref order by t1.id desc";
 
@@ -339,7 +339,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-11145")
+	@JiraKey(value = "HHH-11145")
 	public void testGetLimitStringWithFromInColumnName() {
 		final String query = "select [Created From Nonstock Item], field2 from table1";
 
@@ -351,7 +351,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-11145")
+	@JiraKey(value = "HHH-11145")
 	public void testGetLimitStringWithQuotedColumnNamesAndAlias() {
 		final String query = "select [Created From Item] c1, field2 from table1";
 
@@ -363,7 +363,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-11145")
+	@JiraKey(value = "HHH-11145")
 	public void testGetLimitStringWithQuotedColumnNamesAndAliasWithAs() {
 		final String query = "select [Created From Item] as c1, field2 from table1";
 
@@ -375,7 +375,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-11324")
+	@JiraKey(value = "HHH-11324")
 	public void testGetLimitStringWithSelectClauseNestedQueryUsingParenthesis() {
 		final String query = "select t1.c1 as col_0_0, (select case when count(t2.c1)>0 then 'ADDED' else 'UNMODIFIED' end from table2 t2 WHERE (t2.c1 in (?))) as col_1_0 from table1 t1 WHERE 1=1 ORDER BY t1.c1 ASC";
 
@@ -388,7 +388,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-11650")
+	@JiraKey(value = "HHH-11650")
 	public void testGetLimitWithStringValueContainingParenthesis() {
 		final String query = "select t1.c1 as col_0_0 FROM table1 t1 where t1.c1 = '(123' ORDER BY t1.c1 ASC";
 
@@ -400,7 +400,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-11324")
+	@JiraKey(value = "HHH-11324")
 	public void testGetLimitStringWithSelectClauseNestedQueryUsingParenthesisOnlyTop() {
 		final String query = "select t1.c1 as col_0_0, (select case when count(t2.c1)>0 then 'ADDED' else 'UNMODIFIED' end from table2 t2 WHERE (t2.c1 in (?))) as col_1_0 from table1 t1 WHERE 1=1 ORDER BY t1.c1 ASC";
 
@@ -411,7 +411,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-8916")
+	@JiraKey(value = "HHH-8916")
 	public void testGetLimitStringUsingCTEQueryNoOffset() {
 		Limit selection = toRowSelection( 0, 5 );
 
@@ -449,7 +449,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-8916")
+	@JiraKey(value = "HHH-8916")
 	public void testGetLimitStringUsingCTEQueryWithOffset() {
 		Limit selection = toRowSelection( 1, 5 );
 
@@ -497,7 +497,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-9635")
+	@JiraKey(value = "HHH-9635")
 	public void testAppendLockHintReadPastLocking() {
 		final String expectedLockHint = "tab1 with (updlock,rowlock,readpast)";
 
@@ -508,7 +508,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-9635")
+	@JiraKey(value = "HHH-9635")
 	public void testAppendLockHintReadPastLockingNoTimeOut() {
 		final String expectedLockHint = "tab1 with (updlock,rowlock,readpast,nowait)";
 
@@ -520,7 +520,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-9635")
+	@JiraKey(value = "HHH-9635")
 	public void testAppendLockHintPessimisticRead() {
 		final String expectedLockHint = "tab1 with (holdlock,rowlock)";
 
@@ -531,7 +531,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-9635")
+	@JiraKey(value = "HHH-9635")
 	public void testAppendLockHintPessimisticReadNoTimeOut() {
 		final String expectedLockHint = "tab1 with (holdlock,rowlock,nowait)";
 
@@ -543,7 +543,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-9635")
+	@JiraKey(value = "HHH-9635")
 	public void testAppendLockHintWrite() {
 		final String expectedLockHint = "tab1 with (updlock,holdlock,rowlock)";
 
@@ -554,7 +554,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-9635")
+	@JiraKey(value = "HHH-9635")
 	public void testAppendLockHintWriteWithNoTimeOut() {
 		final String expectedLockHint = "tab1 with (updlock,holdlock,rowlock,nowait)";
 
@@ -567,7 +567,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-9635")
+	@JiraKey(value = "HHH-9635")
 	public void testAppendLockHintUpgradeNoWait() {
 		final String expectedLockHint = "tab1 with (updlock,holdlock,rowlock,nowait)";
 
@@ -578,7 +578,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-9635")
+	@JiraKey(value = "HHH-9635")
 	public void testAppendLockHintUpgradeNoWaitNoTimeout() {
 		final String expectedLockHint = "tab1 with (updlock,holdlock,rowlock,nowait)";
 
@@ -590,7 +590,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-9635")
+	@JiraKey(value = "HHH-9635")
 	public void testAppendLockHintUpgrade() {
 		final String expectedLockHint = "tab1 with (updlock,holdlock,rowlock)";
 
@@ -601,7 +601,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-9635")
+	@JiraKey(value = "HHH-9635")
 	public void testAppendLockHintUpgradeNoTimeout() {
 		final String expectedLockHint = "tab1 with (updlock,holdlock,rowlock,nowait)";
 
@@ -613,7 +613,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-9635")
+	@JiraKey(value = "HHH-9635")
 	public void testAppendLockHintPessimisticWrite() {
 		final String expectedLockHint = "tab1 with (updlock,holdlock,rowlock)";
 
@@ -624,7 +624,7 @@ public class SQLServer2005DialectTestCase extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-9635")
+	@JiraKey(value = "HHH-9635")
 	public void testAppendLockHintPessimisticWriteNoTimeOut() {
 		final String expectedLockHint = "tab1 with (updlock,holdlock,rowlock,nowait)";
 

hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/sequence/DB2390SequenceInformationExtractorTest.java

@@ -12,12 +12,12 @@ import org.hibernate.orm.test.dialect.unit.sequence.AbstractSequenceInformationE
 import org.hibernate.tool.schema.extract.internal.SequenceInformationExtractorNoOpImpl;
 import org.hibernate.tool.schema.extract.spi.SequenceInformationExtractor;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 
 /**
  * @author Andrea Boriero
  */
-@TestForIssue(jiraKey = "HHH-11470")
+@JiraKey(value = "HHH-11470")
 public class DB2390SequenceInformationExtractorTest extends AbstractSequenceInformationExtractorTest {
 
 	@Override

hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/sequence/DB2400SequenceInformationExtractorTest.java

@@ -12,13 +12,13 @@ import org.hibernate.orm.test.dialect.unit.sequence.AbstractSequenceInformationE
 import org.hibernate.tool.schema.extract.internal.SequenceInformationExtractorNoOpImpl;
 import org.hibernate.tool.schema.extract.spi.SequenceInformationExtractor;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 
 
 /**
  * @author Andrea Boriero
  */
-@TestForIssue(jiraKey = "HHH-11470")
+@JiraKey(value = "HHH-11470")
 public class DB2400SequenceInformationExtractorTest extends AbstractSequenceInformationExtractorTest {
 
 	@Override

hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/sequence/DerbyTenFiveDialectSequenceInformationExtractorTest.java

@@ -13,12 +13,12 @@ import org.hibernate.orm.test.dialect.unit.sequence.AbstractSequenceInformationE
 import org.hibernate.tool.schema.extract.internal.SequenceInformationExtractorNoOpImpl;
 import org.hibernate.tool.schema.extract.spi.SequenceInformationExtractor;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 
 /**
  * @author Andrea Boriero
  */
-@TestForIssue(jiraKey = "HHH-11470")
+@JiraKey(value = "HHH-11470")
 public class DerbyTenFiveDialectSequenceInformationExtractorTest extends AbstractSequenceInformationExtractorTest {
 
 	@Override

hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/sequence/DerbyTenSevenDialectSequenceInformationExtractorTest.java

@@ -13,12 +13,12 @@ import org.hibernate.orm.test.dialect.unit.sequence.AbstractSequenceInformationE
 import org.hibernate.tool.schema.extract.internal.SequenceInformationExtractorLegacyImpl;
 import org.hibernate.tool.schema.extract.spi.SequenceInformationExtractor;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 
 /**
  * @author Andrea Boriero
  */
-@TestForIssue(jiraKey = "HHH-11470")
+@JiraKey(value = "HHH-11470")
 public class DerbyTenSevenDialectSequenceInformationExtractorTest extends AbstractSequenceInformationExtractorTest {
 	@Override
 	public Dialect getDialect() {

hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/sequence/DerbyTenSixDialectSequenceInformationExtractorTest.java

@@ -13,12 +13,12 @@ import org.hibernate.orm.test.dialect.unit.sequence.AbstractSequenceInformationE
 import org.hibernate.tool.schema.extract.internal.SequenceInformationExtractorLegacyImpl;
 import org.hibernate.tool.schema.extract.spi.SequenceInformationExtractor;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 
 /**
  * @author Andrea Boriero
  */
-@TestForIssue(jiraKey = "HHH-11470")
+@JiraKey(value = "HHH-11470")
 public class DerbyTenSixDialectSequenceInformationExtractorTest extends AbstractSequenceInformationExtractorTest {
 	@Override
 	public Dialect getDialect() {

hibernate-core/src/test/java/NoPackageTest.java

@@ -7,7 +7,7 @@
 
 import org.hibernate.query.Query;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 import org.junit.Test;
 
@@ -17,7 +17,7 @@ import static org.junit.Assert.assertEquals;
  * Test using an entity which is in no package.
  * We had problems with ByteBuddy in the past.
  */
-@TestForIssue(jiraKey = "HHH-13112")
+@JiraKey(value = "HHH-13112")
 public class NoPackageTest extends BaseCoreFunctionalTestCase {
 
 	@Test

hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/ByteBuddyBasicProxyFactoryTest.java

@@ -15,10 +15,10 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 import org.hibernate.bytecode.internal.bytebuddy.BasicProxyFactoryImpl;
 import org.hibernate.bytecode.internal.bytebuddy.ByteBuddyState;
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.junit.Test;
 
-@TestForIssue(jiraKey = "HHH-12786")
+@JiraKey(value = "HHH-12786")
 public class ByteBuddyBasicProxyFactoryTest {
 
 	private static final BasicProxyFactoryImpl BASIC_PROXY_FACTORY = new BasicProxyFactoryImpl( Entity.class, null, new ByteBuddyState() );

hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/EnhanceByteCodeNotInProvidedClassLoaderTest.java

@@ -15,7 +15,7 @@ import org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImpl;
 import org.hibernate.bytecode.enhance.spi.DefaultEnhancementContext;
 import org.hibernate.bytecode.enhance.spi.Enhancer;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -26,7 +26,7 @@ import org.junit.Test;
 public class EnhanceByteCodeNotInProvidedClassLoaderTest {
 
 	@Test
-	@TestForIssue( jiraKey = "HHH-13343" )
+	@JiraKey( value = "HHH-13343" )
 	public void test() {
 		Enhancer enhancer = createByteBuddyEnhancer();
 		byte[] buffer = readResource( SimpleEntity.class );

hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/EnhancerWildFlyNamesTest.java

@@ -14,7 +14,7 @@ import org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImpl;
 import org.hibernate.bytecode.enhance.spi.DefaultEnhancementContext;
 import org.hibernate.bytecode.enhance.spi.Enhancer;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -26,7 +26,7 @@ import org.junit.Test;
 public class EnhancerWildFlyNamesTest {
 
 	@Test
-	@TestForIssue( jiraKey = "HHH-12545" )
+	@JiraKey( value = "HHH-12545" )
 	public void test() {
 		Enhancer enhancer = createByteBuddyEnhancer();
 		String internalName = SimpleEntity.class.getName().replace( '.', '/' );

hibernate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/SuperTypesEnhancementTest.java

@@ -18,7 +18,7 @@ import org.hibernate.proxy.ProxyFactory;
 import org.hibernate.proxy.pojo.bytebuddy.ByteBuddyProxyFactory;
 import org.hibernate.proxy.pojo.bytebuddy.ByteBuddyProxyHelper;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -35,7 +35,7 @@ import org.junit.jupiter.params.provider.MethodSource;
  *
  * @author Sanne Grinovero
  */
-@TestForIssue( jiraKey = "HHH-15790" )
+@JiraKey( value = "HHH-15790" )
 public class SuperTypesEnhancementTest {
 
 	private static final ByteBuddyProxyHelper helper = new ByteBuddyProxyHelper( new ByteBuddyState() );

hibernate-core/src/test/java/org/hibernate/dialect/H2DialectDatabaseVersionTest.java

@@ -18,13 +18,13 @@ import org.hibernate.tool.hbm2ddl.SchemaUpdate;
 import org.hibernate.tool.schema.TargetType;
 
 import org.hibernate.testing.RequiresDialect;
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.junit4.BaseUnitTestCase;
 import org.hibernate.testing.util.ServiceRegistryUtil;
 import org.junit.Test;
 
 @RequiresDialect(H2Dialect.class)
-@TestForIssue(jiraKey = "HHH-17791")
+@JiraKey(value = "HHH-17791")
 public class H2DialectDatabaseVersionTest extends BaseUnitTestCase {
 
 	@Test

hibernate-core/src/test/java/org/hibernate/dialect/MySQLDialectDatabaseVersionTest.java

@@ -3,7 +3,7 @@ package org.hibernate.dialect;
 import java.util.Map;
 import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo;
 import org.hibernate.testing.RequiresDialect;
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.junit4.BaseUnitTestCase;
 import org.junit.Test;
 
@@ -11,7 +11,7 @@ import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 
 @RequiresDialect(MySQLDialect.class)
-@TestForIssue(jiraKey = "HHH-18518")
+@JiraKey(value = "HHH-18518")
 public class MySQLDialectDatabaseVersionTest extends BaseUnitTestCase {
 
 	@Test

hibernate-core/src/test/java/org/hibernate/engine/jdbc/env/internal/SkipLoadingSequenceInformationTest.java

@@ -20,7 +20,7 @@ import org.hibernate.id.SequenceMismatchStrategy;
 import org.hibernate.tool.schema.extract.spi.SequenceInformationExtractor;
 
 import org.hibernate.testing.RequiresDialect;
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 import org.junit.Test;
 
@@ -29,7 +29,7 @@ import org.junit.Test;
  * is going to skip loading the sequence information from the database.
  */
 @RequiresDialect( H2Dialect.class )
-@TestForIssue( jiraKey = "HHH-14667")
+@JiraKey( value = "HHH-14667")
 public class SkipLoadingSequenceInformationTest extends BaseCoreFunctionalTestCase {
 
 	@Override

hibernate-core/src/test/java/org/hibernate/event/PreUpdateEventListenerVetoTest.java

@@ -8,7 +8,7 @@ import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.event.service.spi.EventListenerRegistry;
 import org.hibernate.event.spi.EventType;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.BaseSessionFactoryFunctionalTest;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -20,7 +20,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
  * @author Nathan Xu
  * @author Tassilo Karge
  */
-@TestForIssue(jiraKey = "HHH-14413")
+@JiraKey(value = "HHH-14413")
 public class PreUpdateEventListenerVetoTest extends BaseSessionFactoryFunctionalTest {
 
 	private static final Long EXAMPLE_ID_VALUE = 1L;

hibernate-core/src/test/java/org/hibernate/event/service/internal/EventListenerDuplicationStrategyTest.java

@@ -10,7 +10,7 @@ import org.hibernate.event.spi.ClearEvent;
 import org.hibernate.event.spi.ClearEventListener;
 import org.hibernate.event.spi.EventType;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -22,7 +22,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
  * Note: I'm using ClearEvent for the tests because it's the simpler one I've found.
  * </p>
  */
-@TestForIssue(jiraKey = "HHH-13831")
+@JiraKey(value = "HHH-13831")
 public class EventListenerDuplicationStrategyTest {
 
 	Tracker tracker = new Tracker();

hibernate-core/src/test/java/org/hibernate/event/service/internal/EventListenerGroupAppendListenerTest.java

@@ -17,7 +17,7 @@ import org.hibernate.event.spi.MergeEventListener;
 import org.hibernate.jpa.event.spi.CallbackRegistry;
 import org.hibernate.service.spi.ServiceRegistryImplementor;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.BaseSessionFactoryFunctionalTest;
 import org.junit.jupiter.api.Test;
 
@@ -28,7 +28,7 @@ import static org.junit.jupiter.api.Assertions.fail;
 /**
  * @author Frank Doherty
  */
-@TestForIssue(jiraKey = "HHH-13070")
+@JiraKey(value = "HHH-13070")
 public class EventListenerGroupAppendListenerTest extends BaseSessionFactoryFunctionalTest {
 
 	private static final DuplicationStrategy DUPLICATION_STRATEGY_REPLACE_ORIGINAL = new DuplicationStrategy() {

hibernate-core/src/test/java/org/hibernate/event/service/internal/NewlyInstantiatdCollectionSkipDeleteOrphanTest.java

@@ -28,7 +28,7 @@ import org.hibernate.annotations.Cascade;
 import org.hibernate.annotations.CascadeType;
 import org.hibernate.annotations.DynamicUpdate;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.RequiresDialectFeature;
@@ -45,7 +45,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
  * @author Artem K.
  * @author Nathan Xu
  */
-@TestForIssue(jiraKey = "HHH-14178")
+@JiraKey(value = "HHH-14178")
 @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsIdentityColumns.class)
 @DomainModel(
 		annotatedClasses = {

hibernate-core/src/test/java/org/hibernate/orm/test/actionqueue/CustomAfterCompletionTest.java

@@ -15,7 +15,7 @@ import org.hibernate.HibernateException;
 import org.hibernate.action.spi.AfterTransactionCompletionProcess;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 import org.junit.Assert;
 import org.junit.Test;
@@ -28,7 +28,7 @@ import static org.junit.Assert.assertThat;
 public class CustomAfterCompletionTest extends BaseCoreFunctionalTestCase {
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-13666")
+	@JiraKey(value = "HHH-13666")
 	public void success() {
 		inSession( session -> {
 			AtomicBoolean called = new AtomicBoolean( false );
@@ -54,7 +54,7 @@ public class CustomAfterCompletionTest extends BaseCoreFunctionalTestCase {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-13666")
+	@JiraKey(value = "HHH-13666")
 	public void failure() {
 		try {
 			inSession( session -> {

hibernate-core/src/test/java/org/hibernate/orm/test/actionqueue/CustomBeforeCompletionTest.java

@@ -15,7 +15,7 @@ import org.hibernate.HibernateException;
 import org.hibernate.action.spi.BeforeTransactionCompletionProcess;
 import org.hibernate.engine.spi.SessionImplementor;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 import org.junit.Assert;
 import org.junit.Test;
@@ -28,7 +28,7 @@ import static org.junit.Assert.assertThat;
 public class CustomBeforeCompletionTest extends BaseCoreFunctionalTestCase {
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-13666")
+	@JiraKey(value = "HHH-13666")
 	public void success() {
 		inSession( session -> {
 			AtomicBoolean called = new AtomicBoolean( false );
@@ -54,7 +54,7 @@ public class CustomBeforeCompletionTest extends BaseCoreFunctionalTestCase {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-13666")
+	@JiraKey(value = "HHH-13666")
 	public void failure() {
 		try {
 			inSession( session -> {

hibernate-core/src/test/java/org/hibernate/orm/test/aggregation/UuidAggregationTest.java

@@ -2,7 +2,7 @@ package org.hibernate.orm.test.aggregation;
 
 import java.util.UUID;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -36,7 +36,7 @@ public class UuidAggregationTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-15495")
+	@JiraKey(value = "HHH-15495")
 	public void testMaxUuid(SessionFactoryScope scope) {
 		scope.inTransaction(
 				s -> {

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/CreationTimestampTest.java

@@ -17,7 +17,7 @@ import java.time.*;
 import java.util.Calendar;
 import java.util.Date;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 
 import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
 
@@ -179,7 +179,7 @@ public class CreationTimestampTest extends BaseEntityManagerFunctionalTestCase {
     }
 
     @Test
-    @TestForIssue( jiraKey = "HHH-16240")
+    @JiraKey( value = "HHH-16240")
     public void generatesCurrentTimestampInStatelessSession() {
         doInJPA(this::entityManagerFactory, entityManager -> {
             Session session = entityManager.unwrap( Session.class);

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/HHH16122Test.java

@@ -6,10 +6,10 @@ import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import jakarta.persistence.MappedSuperclass;
 import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.junit.Test;
 
-@TestForIssue( jiraKey = "HHH-16122" )
+@JiraKey( value = "HHH-16122" )
 public class HHH16122Test extends BaseEntityManagerFunctionalTestCase {
     @Override
     protected Class<?>[] getAnnotatedClasses() {

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/InMemoryCreationTimestampNullableColumnTest.java

@@ -16,7 +16,7 @@ import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.annotations.NaturalId;
 import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -25,7 +25,7 @@ import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
 /**
  * @author Vlad Mihalcea
  */
-@TestForIssue(jiraKey = "HHH-11096")
+@JiraKey(value = "HHH-11096")
 public class InMemoryCreationTimestampNullableColumnTest extends BaseEntityManagerFunctionalTestCase {
 
 	@Override

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/UpdateTimestampTest.java

@@ -23,7 +23,7 @@ import java.time.*;
 import java.util.Calendar;
 import java.util.Date;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 
 import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
 
@@ -185,7 +185,7 @@ public class UpdateTimestampTest extends BaseEntityManagerFunctionalTestCase {
     }
 
     @Test
-    @TestForIssue( jiraKey = "HHH-16240")
+    @JiraKey( value = "HHH-16240")
     public void generatesCurrentTimestampInStatelessSession() {
         doInJPA(this::entityManagerFactory, entityManager -> {
             Session session = entityManager.unwrap( Session.class);

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/backquotes/BackquoteTest.java

@@ -22,7 +22,7 @@ import org.hibernate.cfg.Environment;
 import org.hibernate.service.ServiceRegistry;
 
 import org.hibernate.testing.ServiceRegistryBuilder;
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -58,7 +58,7 @@ public class BackquoteTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "ANN-718")
+	@JiraKey(value = "ANN-718")
 	public void testBackquotes() {
 		try {
 			Configuration config = new Configuration();
@@ -88,7 +88,7 @@ public class BackquoteTest {
 	 * The same issue exists with getLogicalColumnName()
 	 */
 	@Test
-	@TestForIssue(jiraKey = "HHH-4647")
+	@JiraKey(value = "HHH-4647")
 	public void testInvalidReferenceToQuotedTableName() {
 		try (BootstrapServiceRegistry serviceRegistry = new BootstrapServiceRegistryBuilder().build()) {
 			Configuration config = new Configuration( serviceRegistry );

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionTest.java

@@ -22,7 +22,7 @@ import org.hibernate.Transaction;
 
 import org.hibernate.boot.beanvalidation.ValidationMode;
 import org.hibernate.cfg.Configuration;
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 import org.junit.Test;
 
@@ -31,7 +31,7 @@ import static org.hibernate.cfg.ValidationSettings.JAKARTA_VALIDATION_MODE;
 /**
  * @author Ryan Emerson
  */
-@TestForIssue( jiraKey = "HHH-9979")
+@JiraKey( value = "HHH-9979")
 public class MergeNotNullCollectionTest extends BaseCoreFunctionalTestCase {
 
 	@Override

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionUsingIdentityTest.java

@@ -28,7 +28,7 @@ import org.hibernate.cfg.Configuration;
 import org.hibernate.testing.DialectChecks;
 import org.hibernate.testing.FailureExpected;
 import org.hibernate.testing.RequiresDialectFeature;
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 
 import static org.hibernate.cfg.ValidationSettings.JAKARTA_VALIDATION_MODE;
@@ -40,7 +40,7 @@ import static org.hibernate.cfg.ValidationSettings.JAKARTA_VALIDATION_MODE;
 		DialectChecks.SupportsIdentityColumns.class,
 		DialectChecks.SupportsNoColumnInsert.class
 }, jiraKey = "HHH-9979")
-@TestForIssue( jiraKey = "HHH-9979")
+@JiraKey( value = "HHH-9979")
 public class MergeNotNullCollectionUsingIdentityTest extends BaseCoreFunctionalTestCase {
 
 	@Override

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/CascadeCircleIdentityIdTest.java

@@ -6,7 +6,7 @@
  */
 package org.hibernate.orm.test.annotations.cascade.circle.identity;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.RequiresDialectFeature;
@@ -31,7 +31,7 @@ import org.junit.jupiter.api.Test;
 public class CascadeCircleIdentityIdTest {
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-5472")
+	@JiraKey(value = "HHH-5472")
 	public void testCascade(SessionFactoryScope scope) {
 		A a = new A();
 		B b = new B();

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/CascadeCircleSequenceIdTest.java

@@ -6,7 +6,7 @@
  */
 package org.hibernate.orm.test.annotations.cascade.circle.sequence;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.RequiresDialectFeature;
@@ -31,7 +31,7 @@ import org.junit.jupiter.api.Test;
 public class CascadeCircleSequenceIdTest {
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-5472")
+	@JiraKey(value = "HHH-5472")
 	public void testCascade(SessionFactoryScope scope) {
 		A a = new A();
 		B b = new B();

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdFkGeneratedValueIdentityTest.java

@@ -15,7 +15,7 @@ import jakarta.persistence.Id;
 import jakarta.persistence.IdClass;
 import jakarta.persistence.ManyToOne;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.FailureExpected;
@@ -24,7 +24,7 @@ import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.junit.jupiter.api.Test;
 
-@TestForIssue(jiraKey = "HHH-10956")
+@JiraKey(value = "HHH-10956")
 @RequiresDialectFeature(feature = DialectFeatureChecks.SupportsIdentityColumns.class)
 @DomainModel(
 		annotatedClasses = {

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdFkGeneratedValueTest.java

@@ -19,7 +19,7 @@ import jakarta.persistence.PersistenceException;
 
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.SQLServerDialect;
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -43,7 +43,7 @@ import static org.junit.jupiter.api.Assertions.fail;
  * {@link GenerationType#IDENTITY}
  * @see <a href='https://hibernate.atlassian.net/browse/HHH-4848'>HHH-4848</a> introduced the regression
  */
-@TestForIssue(jiraKey = "HHH-10956")
+@JiraKey(value = "HHH-10956")
 @DomainModel(
 		annotatedClasses = {
 				CompositeIdFkGeneratedValueTest.Head.class,

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdIdentityTest.java

@@ -19,7 +19,7 @@ import jakarta.persistence.Table;
 import org.hibernate.testing.DialectChecks;
 import org.hibernate.testing.FailureExpected;
 import org.hibernate.testing.RequiresDialectFeature;
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 import org.junit.Test;
 
@@ -29,7 +29,7 @@ import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate;
  * @author Vlad Mihalcea
  */
 @RequiresDialectFeature(DialectChecks.SupportsIdentityColumns.class)
-@TestForIssue( jiraKey = "HHH-9662" )
+@JiraKey( value = "HHH-9662" )
 public class CompositeIdIdentityTest extends BaseCoreFunctionalTestCase {
 
 	@Test

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/CompositeIdTest.java

@@ -16,7 +16,7 @@ import jakarta.persistence.criteria.Root;
 import org.hibernate.Session;
 import org.hibernate.query.Query;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -155,7 +155,7 @@ public class CompositeIdTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-10476")
+	@JiraKey(value = "HHH-10476")
 	public void testManyToOneInCompositePkInPC(SessionFactoryScope scope) {
 		ParentPk ppk = new ParentPk();
 		ChildPk cpk = new ChildPk();
@@ -295,7 +295,7 @@ public class CompositeIdTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-10476")
+	@JiraKey(value = "HHH-10476")
 	public void testManyToOneInCompositeIdClassInPC(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
@@ -329,7 +329,7 @@ public class CompositeIdTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-10476")
+	@JiraKey(value = "HHH-10476")
 	public void testGetWithUpdatedDetachedEntityInCompositeID(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
@@ -367,7 +367,7 @@ public class CompositeIdTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-10476")
+	@JiraKey(value = "HHH-10476")
 	public void testGetWithDetachedEntityInCompositeIDWithManagedCopy(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cid/keymanytoone/EagerKeyManyToOneTest.java

@@ -6,7 +6,7 @@
  */
 package org.hibernate.orm.test.annotations.cid.keymanytoone;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.jdbc.SQLStatementInspector;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
@@ -59,7 +59,7 @@ public class EagerKeyManyToOneTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-4147")
+	@JiraKey(value = "HHH-4147")
 	public void testLoadEntityWithEagerFetchingToKeyManyToOneReferenceBackToSelf(SessionFactoryScope scope) {
 		// based on the core testsuite test of same name in org.hibernate.orm.test.keymanytoone.bidir.component.EagerKeyManyToOneTest
 		// meant to test against regression relating to http://opensource.atlassian.com/projects/hibernate/browse/HHH-2277

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/CustomImprovedNamingCollectionElementTest.java

@@ -8,7 +8,7 @@ package org.hibernate.orm.test.annotations.collectionelement;
 
 import org.hibernate.cfg.AvailableSettings;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.testing.orm.junit.Setting;
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
 public class CustomImprovedNamingCollectionElementTest extends ImprovedNamingCollectionElementTest {
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-9387")
+	@JiraKey(value = "HHH-9387")
 	public void testDefaultTableNameOwnerEntityNameAndPKColumnOverride(SessionFactoryScope scope) {
 		// NOTE: expected JPA entity names are explicit here (rather than just getting them from the PersistentClass)
 		//       to ensure that entity names/tables are not changed (which would invalidate these test cases).
@@ -34,7 +34,7 @@ public class CustomImprovedNamingCollectionElementTest extends ImprovedNamingCol
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-9387")
+	@JiraKey(value = "HHH-9387")
 	public void testDefaultTableNameOwnerPrimaryTableAndEntityNamesOverride(SessionFactoryScope scope) {
 		// NOTE: expected JPA entity names are explicit here (rather than just getting them from the PersistentClass)
 		//       to ensure that entity names/tables are not changed (which would invalidate these test cases).
@@ -51,7 +51,7 @@ public class CustomImprovedNamingCollectionElementTest extends ImprovedNamingCol
 
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-9389")
+	@JiraKey(value = "HHH-9389")
 	public void testDefaultJoinColumnOwnerEntityNameAndPKColumnOverride(SessionFactoryScope scope) {
 		// NOTE: expected JPA entity names are explicit here (rather than just getting them from the PersistentClass)
 		//       to ensure that entity names/tables are not changed (which would invalidate these test cases).
@@ -63,7 +63,7 @@ public class CustomImprovedNamingCollectionElementTest extends ImprovedNamingCol
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-9389")
+	@JiraKey(value = "HHH-9389")
 	public void testDefaultJoinColumnOwnerPrimaryTableAndEntityNamesOverride(SessionFactoryScope scope) {
 		// NOTE: expected JPA entity names are explicit here (rather than just getting them from the PersistentClass)
 		//       to ensure that entity names/tables are not changed (which would invalidate these test cases).
@@ -74,7 +74,7 @@ public class CustomImprovedNamingCollectionElementTest extends ImprovedNamingCol
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-9389")
+	@JiraKey(value = "HHH-9389")
 	public void testDefaultJoinColumnOwnerPrimaryTableOverride(SessionFactoryScope scope) {
 		// NOTE: expected JPA entity names are explicit here (rather than just getting them from the PersistentClass)
 		//       to ensure that entity names/tables are not changed (which would invalidate these test cases).
@@ -85,7 +85,7 @@ public class CustomImprovedNamingCollectionElementTest extends ImprovedNamingCol
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-9387")
+	@JiraKey(value = "HHH-9387")
 	public void testDefaultTableNameOwnerPrimaryTableOverride(SessionFactoryScope scope) {
 		// NOTE: expected JPA entity names are explicit here (rather than just getting them from the PersistentClass)
 		//       to ensure that entity names/tables are not changed (which would invalidate these test cases).

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/DefaultNamingCollectionElementTest.java

@@ -19,7 +19,7 @@ import org.hibernate.mapping.Column;
 import org.hibernate.mapping.ForeignKey;
 import org.hibernate.query.Query;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.SessionFactory;
@@ -301,7 +301,7 @@ public class DefaultNamingCollectionElementTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-9387")
+	@JiraKey(value = "HHH-9387")
 	public void testDefaultTableNameNoOverrides(SessionFactoryScope scope) {
 		// NOTE: expected JPA entity names are explicit here (rather than just getting them from the PersistentClass)
 		//       to ensure that entity names/tables are not changed (which would invalidate these test cases).
@@ -311,7 +311,7 @@ public class DefaultNamingCollectionElementTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-9387")
+	@JiraKey(value = "HHH-9387")
 	public void testDefaultTableNameOwnerPrimaryTableOverride(SessionFactoryScope scope) {
 		// NOTE: expected JPA entity names are explicit here (rather than just getting them from the PersistentClass)
 		//       to ensure that entity names/tables are not changed (which would invalidate these test cases).
@@ -321,7 +321,7 @@ public class DefaultNamingCollectionElementTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-9387")
+	@JiraKey(value = "HHH-9387")
 	public void testDefaultTableNameOwnerEntityNameAndPKColumnOverride(SessionFactoryScope scope) {
 		// NOTE: expected JPA entity names are explicit here (rather than just getting them from the PersistentClass)
 		//       to ensure that entity names/tables are not changed (which would invalidate these test cases).
@@ -332,7 +332,7 @@ public class DefaultNamingCollectionElementTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-9389")
+	@JiraKey(value = "HHH-9389")
 	public void testDefaultJoinColumnOwnerPrimaryTableAndEntityNamesOverride(SessionFactoryScope scope) {
 		// NOTE: expected JPA entity names are explicit here (rather than just getting them from the PersistentClass)
 		//       to ensure that entity names/tables are not changed (which would invalidate these test cases).
@@ -355,7 +355,7 @@ public class DefaultNamingCollectionElementTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-9389")
+	@JiraKey(value = "HHH-9389")
 	public void testDefaultJoinColumnNoOverrides(SessionFactoryScope scope) {
 		// NOTE: expected JPA entity names are explicit here (rather than just getting them from the PersistentClass)
 		//       to ensure that entity names/tables are not changed (which would invalidate these test cases).
@@ -365,7 +365,7 @@ public class DefaultNamingCollectionElementTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-9389")
+	@JiraKey(value = "HHH-9389")
 	public void testDefaultJoinColumnOwnerPrimaryTableOverride(SessionFactoryScope scope) {
 		// NOTE: expected JPA entity names are explicit here (rather than just getting them from the PersistentClass)
 		//       to ensure that entity names/tables are not changed (which would invalidate these test cases).
@@ -375,7 +375,7 @@ public class DefaultNamingCollectionElementTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-9389")
+	@JiraKey(value = "HHH-9389")
 	public void testDefaultJoinColumnOwnerEntityNameAndPKColumnOverride(SessionFactoryScope scope) {
 		// NOTE: expected JPA entity names are explicit here (rather than just getting them from the PersistentClass)
 		//       to ensure that entity names/tables are not changed (which would invalidate these test cases).
@@ -386,7 +386,7 @@ public class DefaultNamingCollectionElementTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-9387")
+	@JiraKey(value = "HHH-9387")
 	public void testDefaultTableNameOwnerPrimaryTableAndEntityNamesOverride(SessionFactoryScope scope) {
 		// NOTE: expected JPA entity names are explicit here (rather than just getting them from the PersistentClass)
 		//       to ensure that entity names/tables are not changed (which would invalidate these test cases).

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ElementCollectionOfEmbeddableWithEntityWithEntityCollectionTest.java

@@ -16,7 +16,7 @@ import org.hibernate.orm.test.annotations.collectionelement.ElementCollectionOfE
 import org.hibernate.orm.test.annotations.collectionelement.ElementCollectionOfEmbeddableWithEntityWithEntityCollectionTest.Plan;
 import org.hibernate.orm.test.annotations.collectionelement.ElementCollectionOfEmbeddableWithEntityWithEntityCollectionTest.SubPlan;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.jdbc.SQLStatementInspector;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
@@ -48,7 +48,7 @@ import static org.hibernate.annotations.FetchMode.SUBSELECT;
 		}
 )
 @SessionFactory( useCollectingStatementInspector = true )
-@TestForIssue(jiraKey = "HHH-15713")
+@JiraKey(value = "HHH-15713")
 public class ElementCollectionOfEmbeddableWithEntityWithEntityCollectionTest {
 
 	@BeforeEach

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ElementCollectionWithEntityAndFKForElementTest.java

@@ -3,7 +3,7 @@ package org.hibernate.orm.test.annotations.collectionelement;
 import java.io.Serializable;
 import java.util.Set;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.Jpa;
 import org.junit.jupiter.api.Test;
@@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 		}
 
 )
-@TestForIssue(jiraKey = "HHH-15759")
+@JiraKey(value = "HHH-15759")
 public class ElementCollectionWithEntityAndFKForElementTest {
 
 

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/EmbeddableCollectionElementWithLazyManyToOneTest.java

@@ -22,7 +22,7 @@ import org.hibernate.query.criteria.HibernateCriteriaBuilder;
 import org.hibernate.query.criteria.JpaCriteriaQuery;
 import org.hibernate.query.criteria.JpaRoot;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -45,7 +45,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 public class EmbeddableCollectionElementWithLazyManyToOneTest {
 
 	@Test
-	@TestForIssue(jiraKey = "???")
+	@JiraKey(value = "???")
 	public void testLazyManyToOneInEmbeddable(SessionFactoryScope scope) {
 		Parent p = new Parent();
 		p.containedChild = new ContainedChild( new Child() );
@@ -69,7 +69,7 @@ public class EmbeddableCollectionElementWithLazyManyToOneTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "???")
+	@JiraKey(value = "???")
 	public void testLazyManyToOneInCollectionElementEmbeddable(SessionFactoryScope scope) {
 		Parent p = new Parent();
 		p.containedChildren.add( new ContainedChild( new Child() ) );
@@ -96,7 +96,7 @@ public class EmbeddableCollectionElementWithLazyManyToOneTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "???")
+	@JiraKey(value = "???")
 	public void testLazyBoth(SessionFactoryScope scope) {
 		Parent p = new Parent();
 		ContainedChild containedChild = new ContainedChild( new Child() );
@@ -126,7 +126,7 @@ public class EmbeddableCollectionElementWithLazyManyToOneTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-13045")
+	@JiraKey(value = "HHH-13045")
 	public void testAccessIdOfManyToOneInEmbeddable(SessionFactoryScope scope) {
 		Parent p = new Parent();
 		p.containedChildren.add( new ContainedChild( new Child() ) );

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ImprovedNamingCollectionElementTest.java

@@ -8,7 +8,7 @@ package org.hibernate.orm.test.annotations.collectionelement;
 
 import org.hibernate.cfg.AvailableSettings;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.testing.orm.junit.Setting;
@@ -26,7 +26,7 @@ import org.junit.jupiter.api.Test;
 public class ImprovedNamingCollectionElementTest extends DefaultNamingCollectionElementTest {
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-9387")
+	@JiraKey(value = "HHH-9387")
 	public void testDefaultTableNameOwnerEntityNameAndPKColumnOverride(SessionFactoryScope scope) {
 		// NOTE: expected JPA entity names are explicit here (rather than just getting them from the PersistentClass)
 		//       to ensure that entity names/tables are not changed (which would invalidate these test cases).
@@ -36,7 +36,7 @@ public class ImprovedNamingCollectionElementTest extends DefaultNamingCollection
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-9387")
+	@JiraKey(value = "HHH-9387")
 	public void testDefaultTableNameOwnerPrimaryTableAndEntityNamesOverride(SessionFactoryScope scope) {
 		// NOTE: expected JPA entity names are explicit here (rather than just getting them from the PersistentClass)
 		//       to ensure that entity names/tables are not changed (which would invalidate these test cases).
@@ -46,7 +46,7 @@ public class ImprovedNamingCollectionElementTest extends DefaultNamingCollection
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-9389")
+	@JiraKey(value = "HHH-9389")
 	public void testDefaultJoinColumnOwnerEntityNameAndPKColumnOverride(SessionFactoryScope scope) {
 		// NOTE: expected JPA entity names are explicit here (rather than just getting them from the PersistentClass)
 		//       to ensure that entity names/tables are not changed (which would invalidate these test cases).
@@ -56,7 +56,7 @@ public class ImprovedNamingCollectionElementTest extends DefaultNamingCollection
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-9389")
+	@JiraKey(value = "HHH-9389")
 	public void testDefaultJoinColumnOwnerPrimaryTableAndEntityNamesOverride(SessionFactoryScope scope) {
 		// NOTE: expected JPA entity names are explicit here (rather than just getting them from the PersistentClass)
 		//       to ensure that entity names/tables are not changed (which would invalidate these test cases).

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/OrphanRemovalOfAnEntityWithElementCollectionTest.java

@@ -11,7 +11,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -34,7 +34,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 		}
 )
 @SessionFactory
-@TestForIssue(jiraKey = "HHH-15159")
+@JiraKey(value = "HHH-15159")
 public class OrphanRemovalOfAnEntityWithElementCollectionTest {
 
 	@Test

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/OrphanRemovalOfAnEntityWithElementCollectionWithUpdatesAndInsertsOrderTest.java

@@ -13,7 +13,7 @@ import java.util.Set;
 
 import org.hibernate.cfg.AvailableSettings;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.SessionFactory;
@@ -44,7 +44,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 				@Setting(name = AvailableSettings.ORDER_UPDATES, value = "true")
 		}
 )
-@TestForIssue(jiraKey = "HHH-15159")
+@JiraKey(value = "HHH-15159")
 public class OrphanRemovalOfAnEntityWithElementCollectionWithUpdatesAndInsertsOrderTest {
 
 	@Test

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/QueryTest.java

@@ -8,7 +8,7 @@ package org.hibernate.orm.test.annotations.collectionelement;
 
 import java.util.List;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -49,7 +49,7 @@ public class QueryTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-5209")
+	@JiraKey(value = "HHH-5209")
 	public void testMemberOfSyntax(SessionFactoryScope scope) {
 		// performs syntax checking of the MEMBER OF predicate against a basic collection
 		scope.inSession(

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/embeddables/withcustomenumdef/TestBasicOps.java

@@ -10,7 +10,7 @@ import java.util.Iterator;
 
 import org.hibernate.Transaction;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -49,7 +49,7 @@ public class TestBasicOps {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-7072")
+	@JiraKey(value = "HHH-7072")
 	public void testEmbeddableWithNullables(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/ordered/ElementCollectionSortingTest.java

@@ -18,7 +18,7 @@ import org.hibernate.metamodel.mapping.ordering.OrderByFragmentImpl;
 import org.hibernate.metamodel.mapping.ordering.ast.OrderingSpecification;
 import org.hibernate.persister.collection.BasicCollectionPersister;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -65,7 +65,7 @@ public class ElementCollectionSortingTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-6875")
+	@JiraKey(value = "HHH-6875")
 	public void testSortingEmbeddableCollectionOfPrimitives(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/collectionelement/recreate/RecreateCollectionTest.java

@@ -10,7 +10,7 @@ import java.util.Date;
 
 import org.hibernate.BaseSessionEventListener;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -41,7 +41,7 @@ public class RecreateCollectionTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-9474")
+	@JiraKey(value = "HHH-9474")
 	public void testUpdateCollectionOfElements(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/comment/CommentTest.java

@@ -24,7 +24,7 @@ import org.hibernate.boot.registry.StandardServiceRegistry;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.mapping.Column;
 import org.hibernate.mapping.Table;
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.BaseUnitTest;
 import org.hibernate.testing.util.ServiceRegistryUtil;
 import org.junit.jupiter.api.Test;
@@ -39,7 +39,7 @@ public class CommentTest {
 	private static final String TABLE_COMMENT = "I am table";
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-4369")
+	@JiraKey(value = "HHH-4369")
 	public void testComments() {
 		StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistry();
 		Metadata metadata = new MetadataSources(ssr).addAnnotatedClass(TestEntity.class).buildMetadata();

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/comment/CommentsTest.java

@@ -20,7 +20,7 @@ import org.hibernate.boot.Metadata;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.registry.StandardServiceRegistry;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.BaseUnitTest;
 import org.hibernate.testing.util.ServiceRegistryUtil;
 import org.junit.jupiter.api.Test;
@@ -45,7 +45,7 @@ public class CommentsTest {
 	private static final String SEC_TABLE_COMMENT = "I am a table too";
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-4369")
+	@JiraKey(value = "HHH-4369")
 	public void testComments() {
 		StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistry();
 		Metadata metadata = new MetadataSources(ssr).addAnnotatedClass(TestEntity.class).buildMetadata();

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/CompositeDerivedIdentityTest.java

@@ -6,7 +6,7 @@
  */
 package org.hibernate.orm.test.annotations.derivedidentities.bidirectional;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -72,7 +72,7 @@ public class CompositeDerivedIdentityTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-10476")
+	@JiraKey(value = "HHH-10476")
 	public void testBidirectonalKeyManyToOneId(SessionFactoryScope scope) {
 		Product product = new Product();
 		product.setName( "Product 1" );

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/CompositeIdDerivedIdWithIdClassTest.java

@@ -13,7 +13,7 @@ import java.util.Objects;
 
 import org.hibernate.jpa.internal.PersistenceUnitUtilImpl;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.ImplicitListAsBagProvider;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
@@ -67,7 +67,7 @@ public class CompositeIdDerivedIdWithIdClassTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-11328")
+	@JiraKey(value = "HHH-11328")
 	public void testMergeTransientIdManyToOne(SessionFactoryScope scope) {
 		ShoppingCart transientCart = new ShoppingCart( "cart1" );
 		transientCart.addLineItem( new LineItem( 0, "description2", transientCart ) );
@@ -96,7 +96,7 @@ public class CompositeIdDerivedIdWithIdClassTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-10623")
+	@JiraKey(value = "HHH-10623")
 	public void testMergeDetachedIdManyToOne(SessionFactoryScope scope) {
 		ShoppingCart cart = new ShoppingCart( "cart1" );
 
@@ -125,7 +125,7 @@ public class CompositeIdDerivedIdWithIdClassTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-12007")
+	@JiraKey(value = "HHH-12007")
 	public void testBindTransientEntityWithTransientKeyManyToOne(SessionFactoryScope scope) {
 
 		ShoppingCart cart = new ShoppingCart( "cart" );
@@ -147,7 +147,7 @@ public class CompositeIdDerivedIdWithIdClassTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-12007")
+	@JiraKey(value = "HHH-12007")
 	public void testBindTransientEntityWithPersistentKeyManyToOne(SessionFactoryScope scope) {
 		ShoppingCart cart = new ShoppingCart( "cart" );
 		LineItem item = new LineItem( 0, "desc", cart );
@@ -169,7 +169,7 @@ public class CompositeIdDerivedIdWithIdClassTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-12007")
+	@JiraKey(value = "HHH-12007")
 	public void testBindTransientEntityWithDetachedKeyManyToOne(SessionFactoryScope scope) {
 
 		ShoppingCart cart = new ShoppingCart( "cart" );
@@ -191,7 +191,7 @@ public class CompositeIdDerivedIdWithIdClassTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-12007")
+	@JiraKey(value = "HHH-12007")
 	public void testBindTransientEntityWithCopiedKeyManyToOne(SessionFactoryScope scope) {
 
 		ShoppingCart cart = new ShoppingCart( "cart" );

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/ManyToOneEagerDerivedIdFetchModeJoinTest.java

@@ -13,7 +13,7 @@ import java.util.Set;
 
 import org.hibernate.Hibernate;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -45,7 +45,7 @@ public class ManyToOneEagerDerivedIdFetchModeJoinTest {
 	private Foo foo;
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-14466")
+	@JiraKey(value = "HHH-14466")
 	public void testQuery(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
 			Bar newBar = (Bar) session.createQuery( "SELECT b FROM Bar b WHERE b.foo.id = :id" )
@@ -63,7 +63,7 @@ public class ManyToOneEagerDerivedIdFetchModeJoinTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-14466")
+	@JiraKey(value = "HHH-14466")
 	public void testQueryById(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
 			Bar newBar = (Bar) session.createQuery( "SELECT b FROM Bar b WHERE b.foo = :foo" )
@@ -81,7 +81,7 @@ public class ManyToOneEagerDerivedIdFetchModeJoinTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-14466")
+	@JiraKey(value = "HHH-14466")
 	public void testFindByPrimaryKey(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
 			Bar newBar = session.find( Bar.class, foo.getId() );
@@ -97,7 +97,7 @@ public class ManyToOneEagerDerivedIdFetchModeJoinTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-14466")
+	@JiraKey(value = "HHH-14466")
 	public void testFindByInversePrimaryKey(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
 			Foo newFoo = session.find( Foo.class, foo.getId() );

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/OneToOneEagerDerivedIdFetchModeSelectTest.java

@@ -11,7 +11,7 @@ import java.io.Serializable;
 import org.hibernate.annotations.Fetch;
 import org.hibernate.annotations.FetchMode;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -42,7 +42,7 @@ public class OneToOneEagerDerivedIdFetchModeSelectTest {
 	private Foo foo;
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-14390")
+	@JiraKey(value = "HHH-14390")
 	public void testQuery(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
 			Bar newBar = (Bar) session.createQuery( "SELECT b FROM Bar b WHERE b.foo.id = :id" )
@@ -56,7 +56,7 @@ public class OneToOneEagerDerivedIdFetchModeSelectTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-14390")
+	@JiraKey(value = "HHH-14390")
 	public void testQueryById(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
 			Bar newBar = (Bar) session.createQuery( "SELECT b FROM Bar b WHERE b.foo = :foo" )
@@ -70,7 +70,7 @@ public class OneToOneEagerDerivedIdFetchModeSelectTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-14390")
+	@JiraKey(value = "HHH-14390")
 	public void testFindByPrimaryKey(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
 			Bar newBar = session.find( Bar.class, foo.getId() );

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/OneToOneLazyDerivedIdFetchModeSelectTest.java

@@ -11,7 +11,7 @@ import java.io.Serializable;
 import org.hibernate.annotations.Fetch;
 import org.hibernate.annotations.FetchMode;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -41,7 +41,7 @@ public class OneToOneLazyDerivedIdFetchModeSelectTest {
 	private Foo foo;
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-14390")
+	@JiraKey(value = "HHH-14390")
 	public void testQuery(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
 			Bar newBar = (Bar) session.createQuery( "SELECT b FROM Bar b WHERE b.foo.id = :id" )
@@ -55,7 +55,7 @@ public class OneToOneLazyDerivedIdFetchModeSelectTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-14390")
+	@JiraKey(value = "HHH-14390")
 	public void testQueryById(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
 			Bar newBar = (Bar) session.createQuery( "SELECT b FROM Bar b WHERE b.foo = :foo" )
@@ -69,7 +69,7 @@ public class OneToOneLazyDerivedIdFetchModeSelectTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-14390")
+	@JiraKey(value = "HHH-14390")
 	public void testFindByPrimaryKey(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
 			Bar newBar = session.find( Bar.class, foo.getId() );

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/bidirectional/OneToOneWithDerivedIdentityTest.java

@@ -10,7 +10,7 @@ import java.util.List;
 
 import org.hibernate.query.Query;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -48,7 +48,7 @@ public class OneToOneWithDerivedIdentityTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-11903")
+	@JiraKey(value = "HHH-11903")
 	public void testInsertFooAndBarWithDerivedId(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
@@ -78,7 +78,7 @@ public class OneToOneWithDerivedIdentityTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-14389")
+	@JiraKey(value = "HHH-14389")
 	public void testQueryById(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
@@ -108,7 +108,7 @@ public class OneToOneWithDerivedIdentityTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-14389")
+	@JiraKey(value = "HHH-14389")
 	public void testFindById(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
@@ -135,7 +135,7 @@ public class OneToOneWithDerivedIdentityTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-14389")
+	@JiraKey(value = "HHH-14389")
 	public void testFindByPrimaryKey(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
@@ -163,7 +163,7 @@ public class OneToOneWithDerivedIdentityTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-10476")
+	@JiraKey(value = "HHH-10476")
 	public void testInsertFooAndBarWithDerivedIdPC(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
@@ -194,7 +194,7 @@ public class OneToOneWithDerivedIdentityTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-6813")
+	@JiraKey(value = "HHH-6813")
 	public void testSelectWithDerivedId(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
@@ -222,7 +222,7 @@ public class OneToOneWithDerivedIdentityTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-6813")
+	@JiraKey(value = "HHH-6813")
 	// Regression test utilizing multiple types of queries.
 	public void testCase(SessionFactoryScope scope) {
 		scope.inTransaction(

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/e4/c/DerivedIdentitySimpleParentSimpleDepSecondPassOrderingTest.java

@@ -10,7 +10,7 @@ import java.io.Serializable;
 
 import org.hibernate.boot.spi.MetadataImplementor;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -32,7 +32,7 @@ import static org.hibernate.orm.test.util.SchemaUtil.getColumnNames;
  * <p>
  * org.hibernate.MappingException: Foreign key (FK2m2b1kaetxfvcsaih4raaocn8:ref_mto_derived [])) must have same number of columns as the referenced primary key (mto_derived [idsource_id])
  */
-@TestForIssue(jiraKey = "HHH-14467")
+@JiraKey(value = "HHH-14467")
 @DomainModel(
 		annotatedClasses = {
 				// These two must be mentioned first in order to trigger the bug.

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/unidirectional/OneToOneEagerDerivedIdFetchModeSelectTest.java

@@ -11,7 +11,7 @@ import java.io.Serializable;
 import org.hibernate.annotations.Fetch;
 import org.hibernate.annotations.FetchMode;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -40,7 +40,7 @@ public class OneToOneEagerDerivedIdFetchModeSelectTest {
 	private Foo foo;
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-14390")
+	@JiraKey(value = "HHH-14390")
 	public void testQuery(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
 			Bar newBar = (Bar) session.createQuery( "SELECT b FROM Bar b WHERE b.foo.id = :id" )
@@ -54,7 +54,7 @@ public class OneToOneEagerDerivedIdFetchModeSelectTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-14390")
+	@JiraKey(value = "HHH-14390")
 	public void testQueryById(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
 			Bar newBar = (Bar) session.createQuery( "SELECT b FROM Bar b WHERE b.foo = :foo" )
@@ -68,7 +68,7 @@ public class OneToOneEagerDerivedIdFetchModeSelectTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-14390")
+	@JiraKey(value = "HHH-14390")
 	public void testFindByPrimaryKey(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
 			Bar newBar = session.find( Bar.class, foo.getId() );

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/derivedidentities/unidirectional/OneToOneLazyDerivedIdFetchModeSelectTest.java

@@ -11,7 +11,7 @@ import java.io.Serializable;
 import org.hibernate.annotations.Fetch;
 import org.hibernate.annotations.FetchMode;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -40,7 +40,7 @@ public class OneToOneLazyDerivedIdFetchModeSelectTest {
 	private Foo foo;
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-14390")
+	@JiraKey(value = "HHH-14390")
 	public void testQuery(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
 			Bar newBar = (Bar) session.createQuery( "SELECT b FROM Bar b WHERE b.foo.id = :id" )
@@ -54,7 +54,7 @@ public class OneToOneLazyDerivedIdFetchModeSelectTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-14390")
+	@JiraKey(value = "HHH-14390")
 	public void testQueryById(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
 			Bar newBar = (Bar) session.createQuery( "SELECT b FROM Bar b WHERE b.foo = :foo" )
@@ -68,7 +68,7 @@ public class OneToOneLazyDerivedIdFetchModeSelectTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-14390")
+	@JiraKey(value = "HHH-14390")
 	public void testFindByPrimaryKey(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
 			Bar newBar = session.find( Bar.class, foo.getId() );

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/EmbeddableAndMappedSuperClassWithGenericsTest.java

@@ -8,7 +8,7 @@ package org.hibernate.orm.test.annotations.embeddables;
 
 import java.util.List;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -31,7 +31,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 		}
 )
 @SessionFactory
-@TestForIssue(jiraKey = "HHH-15552")
+@JiraKey(value = "HHH-15552")
 public class EmbeddableAndMappedSuperClassWithGenericsTest {
 
 	private final static long POPULAR_BOOK_ID = 1l;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/EmbeddableWithGenericAndMappedSuperClassTest.java

@@ -2,7 +2,7 @@ package org.hibernate.orm.test.annotations.embeddables;
 
 import java.util.List;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -186,7 +186,7 @@ public class EmbeddableWithGenericAndMappedSuperClassTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-4299")
+	@JiraKey(value = "HHH-4299")
 	public void testGenericEmbeddedAttribute(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/EmbeddableWithManyToManyTest.java

@@ -11,7 +11,7 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -34,7 +34,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 		}
 )
 @SessionFactory
-@TestForIssue(jiraKey = "HHH-15453")
+@JiraKey(value = "HHH-15453")
 public class EmbeddableWithManyToManyTest {
 
 	@Test

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithManyToMany_HHH_11302_Test.java

@@ -28,12 +28,12 @@ import jakarta.persistence.Version;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.internal.util.StringHelper;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 
 /**
  * @author Vlad Mihalcea
  */
-@TestForIssue(jiraKey = "HHH-11302")
+@JiraKey(value = "HHH-11302")
 public class EmbeddableWithManyToMany_HHH_11302_Test
 		extends AbstractEmbeddableWithManyToManyTest {
 

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithOneToMany_HHH_11302_Test.java

@@ -28,12 +28,12 @@ import jakarta.persistence.Version;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.internal.util.StringHelper;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 
 /**
  * @author Vlad Mihalcea
  */
-@TestForIssue(jiraKey = "HHH-11302")
+@JiraKey(value = "HHH-11302")
 public class EmbeddableWithOneToMany_HHH_11302_Test
 		extends AbstractEmbeddableWithManyToManyTest {
 

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithOneToMany_HHH_8564_Test.java

@@ -23,12 +23,12 @@ import jakarta.validation.constraints.Size;
 
 import org.hibernate.boot.MetadataSources;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 
 /**
  * @author Vlad Mihalcea
  */
-@TestForIssue(jiraKey = "HHH-8564")
+@JiraKey(value = "HHH-8564")
 public class EmbeddableWithOneToMany_HHH_8564_Test
 		extends AbstractEmbeddableWithManyToManyTest {
 

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/EmbeddableWithOneToMany_HHH_8860_Test.java

@@ -21,12 +21,12 @@ import jakarta.persistence.Version;
 
 import org.hibernate.boot.MetadataSources;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 
 /**
  * @author Vlad Mihalcea
  */
-@TestForIssue(jiraKey = "HHH-8860")
+@JiraKey(value = "HHH-8860")
 public class EmbeddableWithOneToMany_HHH_8860_Test
 		extends AbstractEmbeddableWithManyToManyTest {
 

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embeddables/collection/xml/EmbeddableWithOneToMany_HHH_11302_xml_Test.java

@@ -9,12 +9,12 @@ package org.hibernate.orm.test.annotations.embeddables.collection.xml;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.orm.test.annotations.embeddables.collection.AbstractEmbeddableWithManyToManyTest;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 
 /**
  * @author Vlad Mihalcea
  */
-@TestForIssue(jiraKey = "HHH-11302")
+@JiraKey(value = "HHH-11302")
 public class EmbeddableWithOneToMany_HHH_11302_xml_Test extends AbstractEmbeddableWithManyToManyTest {
 
 	protected void addResources(MetadataSources metadataSources) {

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/HibernateAnnotationMappingTest.java

@@ -13,7 +13,7 @@ import java.util.ConcurrentModificationException;
 import org.hibernate.SessionFactory;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.cfg.Environment;
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.junit4.BaseUnitTestCase;
 import org.hibernate.testing.util.ServiceRegistryUtil;
 import org.junit.Test;
@@ -24,7 +24,7 @@ import org.junit.Test;
 public class HibernateAnnotationMappingTest extends BaseUnitTestCase {
 	
 	@Test
-	@TestForIssue( jiraKey = "HHH-7446" )
+	@JiraKey( value = "HHH-7446" )
 	public void testUniqueConstraintAnnotationOnNaturalIds() throws Exception {
 		Configuration configuration = new Configuration();
 		ServiceRegistryUtil.applySettings( configuration.getStandardServiceRegistryBuilder() );

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entitynonentity/EntityNonEntityTest.java

@@ -10,7 +10,7 @@ import org.hibernate.Session;
 import org.hibernate.Transaction;
 import org.hibernate.UnknownEntityTypeException;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 import org.junit.Test;
 
@@ -49,7 +49,7 @@ public class EntityNonEntityTest extends BaseCoreFunctionalTestCase {
 	}
 
 	@Test
-	@TestForIssue( jiraKey = "HHH-9856" )
+	@JiraKey( value = "HHH-9856" )
 	public void testGetAndFindNonEntityThrowsIllegalArgumentException() {
 		try {
             sessionFactory().getMetamodel().locateEntityPersister(Cellular.class);

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenerics2Test.java

@@ -1,6 +1,6 @@
 package org.hibernate.orm.test.annotations.enumerated;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -21,7 +21,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 		}
 )
 @SessionFactory
-@TestForIssue(jiraKey = "HHH-16479")
+@JiraKey(value = "HHH-16479")
 public class EnumeratedAndGenerics2Test {
 
 	@Test

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenerics3Test.java

@@ -1,6 +1,6 @@
 package org.hibernate.orm.test.annotations.enumerated;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -20,7 +20,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 		}
 )
 @SessionFactory
-@TestForIssue(jiraKey = "HHH-16479")
+@JiraKey(value = "HHH-16479")
 public class EnumeratedAndGenerics3Test {
 
 	@Test

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenericsTest.java

@@ -1,6 +1,6 @@
 package org.hibernate.orm.test.annotations.enumerated;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -21,7 +21,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 		}
 )
 @SessionFactory
-@TestForIssue( jiraKey = "HHH-16479")
+@JiraKey( value = "HHH-16479")
 public class EnumeratedAndGenericsTest {
 
 	@Test

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/ormXml/OrmXmlEnumTypeTest.java

@@ -13,7 +13,7 @@ import org.hibernate.type.Type;
 import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry;
 
 import org.hibernate.testing.ServiceRegistryBuilder;
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.junit4.BaseUnitTestCase;
 import org.hibernate.testing.junit4.ExtraAssertions;
 import org.hibernate.type.internal.BasicTypeImpl;
@@ -26,7 +26,7 @@ import static org.junit.Assert.assertEquals;
 /**
  * @author Steve Ebersole
  */
-@TestForIssue( jiraKey = "HHH-7645" )
+@JiraKey( value = "HHH-7645" )
 public class OrmXmlEnumTypeTest extends BaseUnitTestCase {
 	@Test
 	public void testOrmXmlDefinedEnumType() {

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/FetchProfileTest.java

@@ -18,7 +18,7 @@ import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.service.ServiceRegistry;
 
 import org.hibernate.testing.ServiceRegistryBuilder;
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.junit4.BaseUnitTestCase;
 import org.hibernate.testing.util.ServiceRegistryUtil;
 import org.junit.After;
@@ -34,7 +34,7 @@ import static org.junit.Assert.fail;
  *
  * @author Hardy Ferentschik
  */
-@TestForIssue( jiraKey = "HHH-4812" )
+@JiraKey( value = "HHH-4812" )
 public class FetchProfileTest extends BaseUnitTestCase {
 
 	private ServiceRegistry serviceRegistry;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/MappedByFetchProfileFunctionTest.java

@@ -5,13 +5,13 @@ import org.hibernate.Session;
 import org.hibernate.Transaction;
 import org.hibernate.orm.test.annotations.fetchprofile.mappedby.Address;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 import org.junit.Test;
 
 import static org.junit.Assert.assertTrue;
 
-@TestForIssue( jiraKey = "HHH-14071" )
+@JiraKey( value = "HHH-14071" )
 public class MappedByFetchProfileFunctionTest extends BaseCoreFunctionalTestCase {
 
 	@Test

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/fetchprofile/MappedByFetchProfileUnitTest.java

@@ -7,7 +7,7 @@ import org.hibernate.orm.test.annotations.fetchprofile.mappedby.Address;
 import org.hibernate.service.ServiceRegistry;
 
 import org.hibernate.testing.ServiceRegistryBuilder;
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.junit4.BaseUnitTestCase;
 import org.junit.After;
 import org.junit.Before;
@@ -15,7 +15,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertTrue;
 
-@TestForIssue( jiraKey = "HHH-14071" )
+@JiraKey( value = "HHH-14071" )
 public class MappedByFetchProfileUnitTest extends BaseUnitTestCase {
 
 	private ServiceRegistry serviceRegistry;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinColumnOrFormulaTest.java

@@ -24,7 +24,7 @@ import org.hibernate.boot.registry.StandardServiceRegistry;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 
 import org.hibernate.testing.FailureExpected;
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.junit4.BaseUnitTestCase;
 import org.hibernate.testing.util.ServiceRegistryUtil;
 import org.junit.After;
@@ -50,7 +50,7 @@ public class JoinColumnOrFormulaTest extends BaseUnitTestCase {
 	}
 
 	@Test
-	@TestForIssue( jiraKey = "HHH-9897" )
+	@JiraKey( value = "HHH-9897" )
 	@FailureExpected( jiraKey = "HHH-9897" )
 	public void testUseOfJoinColumnOrFormula() {
 		Metadata metadata = new MetadataSources( ssr )

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaManyToOneLazyFetchingTest.java

@@ -22,7 +22,7 @@ import org.hibernate.annotations.JoinColumnOrFormula;
 import org.hibernate.annotations.JoinFormula;
 import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.junit.Test;
 
 import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
@@ -30,7 +30,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.fail;
 
-@TestForIssue(jiraKey = "HHH-12770")
+@JiraKey(value = "HHH-12770")
 public class JoinFormulaManyToOneLazyFetchingTest extends BaseEntityManagerFunctionalTestCase {
 
 	@Override

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaManyToOneNotIgnoreLazyFetchingTest.java

@@ -18,7 +18,7 @@ import org.hibernate.boot.model.internal.ToOneBinder;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.logger.LoggerInspectionRule;
 import org.hibernate.testing.logger.Triggerable;
 import org.junit.Rule;
@@ -40,7 +40,7 @@ import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
-@TestForIssue(jiraKey = "HHH-12770")
+@JiraKey(value = "HHH-12770")
 public class JoinFormulaManyToOneNotIgnoreLazyFetchingTest extends BaseEntityManagerFunctionalTestCase {
 
 	@Rule

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/JoinFormulaOneToOneNotIgnoreLazyFetchingTest.java

@@ -18,7 +18,7 @@ import org.hibernate.boot.model.internal.ToOneBinder;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.logger.LoggerInspectionRule;
 import org.hibernate.testing.logger.Triggerable;
 import org.junit.Rule;
@@ -40,7 +40,7 @@ import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
-@TestForIssue(jiraKey = "HHH-12770")
+@JiraKey(value = "HHH-12770")
 public class JoinFormulaOneToOneNotIgnoreLazyFetchingTest extends BaseEntityManagerFunctionalTestCase {
 
 	@Rule

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/formula/ManyToManyNotIgnoreLazyFetchingTest.java

@@ -19,9 +19,10 @@ import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.logger.LoggerInspectionRule;
 import org.hibernate.testing.logger.Triggerable;
+import org.hibernate.testing.orm.junit.JiraKeyGroup;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -42,7 +43,10 @@ import static org.hibernate.testing.transaction.TransactionUtil2.fromTransaction
 import static org.junit.Assert.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-@TestForIssue(jiraKey = {"HHH-12770", "HHH-15545"})
+@JiraKeyGroup( value = {
+				@JiraKey( value = "HHH-12770" ),
+				@JiraKey( value = "HHH-15545" )
+} )
 public class ManyToManyNotIgnoreLazyFetchingTest extends BaseEntityManagerFunctionalTestCase {
 
 	@Rule

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/MappedSuperclassAndGenericsTest.java

@@ -1,6 +1,6 @@
 package org.hibernate.orm.test.annotations.generics;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -23,7 +23,7 @@ import jakarta.persistence.MappedSuperclass;
 		}
 )
 @SessionFactory
-@TestForIssue( jiraKey = "HHH-15970")
+@JiraKey( value = "HHH-15970")
 public class MappedSuperclassAndGenericsTest {
 
 	public enum MyEnum {

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/MultipleBoundsTest.java

@@ -2,7 +2,7 @@ package org.hibernate.orm.test.annotations.generics;
 
 import java.util.List;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -28,7 +28,7 @@ import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 		}
 )
 @SessionFactory
-@TestForIssue( jiraKey = "HHH-15687")
+@JiraKey( value = "HHH-15687")
 public class MultipleBoundsTest {
 
 	@BeforeEach

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/TypeVariableTest.java

@@ -2,7 +2,7 @@ package org.hibernate.orm.test.annotations.generics;
 
 import org.hibernate.query.Query;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -28,7 +28,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
 		}
 )
 @SessionFactory
-@TestForIssue(jiraKey = "HHH-15646")
+@JiraKey(value = "HHH-15646")
 public class TypeVariableTest {
 
 	@BeforeEach

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/WildcardsTest.java

@@ -6,7 +6,7 @@ import java.util.HashSet;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.Jpa;
 import org.junit.jupiter.api.BeforeEach;
@@ -27,7 +27,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 				WildcardsTest.BalanceUsage.class
 		}
 )
-@TestForIssue(jiraKey = "HHH-15624")
+@JiraKey(value = "HHH-15624")
 public class WildcardsTest {
 
 	@BeforeEach

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/EnumIdTest.java

@@ -6,7 +6,7 @@
  */
 package org.hibernate.orm.test.annotations.id;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -23,7 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertNull;
  *
  * @author Hardy Ferentschik
  */
-@TestForIssue(jiraKey = "ANN-744")
+@JiraKey(value = "ANN-744")
 @DomainModel(
 		annotatedClasses = PlanetCheatSheet.class
 )

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/IdClassAndAssociationsTest.java

@@ -5,7 +5,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.Jpa;
 import org.junit.jupiter.api.BeforeEach;
@@ -36,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 				IdClassAndAssociationsTest.UserRole.class
 		}
 )
-@TestForIssue( jiraKey = "HHH-16075")
+@JiraKey( value = "HHH-16075")
 public class IdClassAndAssociationsTest {
 
 	@BeforeEach

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/JoinColumnOverrideTest.java

@@ -15,7 +15,7 @@ import org.hibernate.boot.spi.MetadataImplementor;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.tool.schema.internal.SchemaCreatorImpl;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.BaseUnitTest;
 import org.hibernate.testing.util.ServiceRegistryUtil;
 
@@ -40,7 +40,7 @@ public class JoinColumnOverrideTest {
 			"id numeric(128,0) not null, primary key (id))";
 
 	@Test
-	@TestForIssue(jiraKey = "ANN-748")
+	@JiraKey(value = "ANN-748")
 	public void testBlownPrecision() {
 		StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistryBuilder()
 				.applySetting( AvailableSettings.DIALECT, "SQLServer" )

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/NewGeneratorMappingsTest.java

@@ -13,7 +13,7 @@ import org.hibernate.id.enhanced.PooledOptimizer;
 import org.hibernate.id.enhanced.SequenceStyleGenerator;
 import org.hibernate.id.enhanced.TableGenerator;
 import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.SessionFactory;
@@ -127,7 +127,7 @@ public class NewGeneratorMappingsTest  {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-6790")
+	@JiraKey(value = "HHH-6790")
 	public void testSequencePerEntity(SessionFactoryScope scope) {
 		// Checking first entity.
         EntityPersister persister = scope.getSessionFactory().getRuntimeMetamodels().getMappingMetamodel().getEntityDescriptor(DedicatedSequenceEntity1.class.getName());

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/EnumIdTest.java

@@ -6,7 +6,7 @@
  */
 package org.hibernate.orm.test.annotations.id.sequences;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
@@ -22,7 +22,7 @@ import static org.junit.jupiter.api.Assertions.assertNull;
  *
  * @author Hardy Ferentschik
  */
-@TestForIssue(jiraKey = "ANN-744")
+@JiraKey(value = "ANN-744")
 @DomainModel(
 		annotatedClasses = PlanetCheatSheet.class
 )

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/HibernateSequenceTest.java

@@ -14,7 +14,7 @@ import org.hibernate.id.enhanced.SequenceStyleGenerator;
 import org.hibernate.mapping.Table;
 import org.hibernate.persister.entity.EntityPersister;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.RequiresDialect;
 import org.hibernate.testing.orm.junit.SessionFactory;
@@ -29,7 +29,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 /**
  * @author Lukasz Antoniak
  */
-@TestForIssue(jiraKey = "HHH-6068")
+@JiraKey(value = "HHH-6068")
 @RequiresDialect(value = H2Dialect.class)
 @DomainModel(
 		annotatedClasses = HibernateSequenceEntity.class,

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/IdTest.java

@@ -8,7 +8,7 @@ package org.hibernate.orm.test.annotations.id.sequences;
 
 import org.hibernate.mapping.Column;
 
-import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.RequiresDialectFeature;
@@ -289,7 +289,7 @@ public class IdTest {
 	}
 
 	@Test
-	@TestForIssue(jiraKey = "HHH-6790")
+	@JiraKey(value = "HHH-6790")
 	public void testSequencePerEntity(SessionFactoryScope scope) {
 		DedicatedSequenceEntity1 entity1 = new DedicatedSequenceEntity1();
 		DedicatedSequenceEntity2 entity2 = new DedicatedSequenceEntity2();