diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/HibernateAnnotationMappingTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/HibernateAnnotationMappingTest.java
similarity index 98%
rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/HibernateAnnotationMappingTest.java
rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entity/HibernateAnnotationMappingTest.java
index 20a34230db..6200ce36e6 100644
--- a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/HibernateAnnotationMappingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/HibernateAnnotationMappingTest.java
@@ -40,7 +40,7 @@ import org.junit.Test;
 public class HibernateAnnotationMappingTest extends BaseUnitTestCase {
 	
 	@Test
-	@TestForIssue( jiraKey = "HHH-5281" )
+	@TestForIssue( jiraKey = "HHH-7446" )
 	public void testUniqueConstraintAnnotationOnNaturalIds() throws Exception {
 		Configuration configuration = new Configuration();
 		configuration.setProperty( Environment.HBM2DDL_AUTO, "create-drop" );
diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/Month.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Month.java
similarity index 100%
rename from hibernate-core/src/matrix/java/org/hibernate/test/annotations/entity/Month.java
rename to hibernate-core/src/test/java/org/hibernate/test/annotations/entity/Month.java