diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/NewGeneratorMappingsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/NewGeneratorMappingsTest.java
index 451695107d..f3c0cccfd1 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/NewGeneratorMappingsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/generationmappings/NewGeneratorMappingsTest.java
@@ -19,6 +19,7 @@ import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -48,7 +49,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 @SessionFactory(
 		exportSchema = false
 )
-@ServiceRegistry(settings = @ServiceRegistry.Setting(name =Environment.HBM2DDL_AUTO, value = ""))
+@ServiceRegistry(settings = @Setting(name =Environment.HBM2DDL_AUTO, value = ""))
 public class NewGeneratorMappingsTest  {
 
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/id/idClass/IdClassNamingStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/test/id/idClass/IdClassNamingStrategyTest.java
index 32e7bb5697..d9a9270b6d 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/id/idClass/IdClassNamingStrategyTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/id/idClass/IdClassNamingStrategyTest.java
@@ -11,6 +11,7 @@ import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.ServiceRegistry;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
 import org.junit.jupiter.api.Test;
 
 import static org.hibernate.cfg.AvailableSettings.IMPLICIT_NAMING_STRATEGY;
@@ -31,7 +32,7 @@ import static org.hibernate.cfg.AvailableSettings.IMPLICIT_NAMING_STRATEGY;
  *   primary key (id_idA, id_idB)
  * )
  */
-@ServiceRegistry(settings = @ServiceRegistry.Setting(name = IMPLICIT_NAMING_STRATEGY, value = "component-path"))
+@ServiceRegistry(settings = @Setting(name = IMPLICIT_NAMING_STRATEGY, value = "component-path"))
 public class IdClassNamingStrategyTest {
 
 	@Test