diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/DomainModelExtension.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/DomainModelExtension.java
index dd9699891fb3..5af5096c77f2 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/DomainModelExtension.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/DomainModelExtension.java
@@ -300,7 +300,7 @@ private static boolean isLob(SimpleValue value) {
 		return false;
 	}
 
-	public static class DomainModelScopeImpl implements DomainModelScope, ExtensionContext.Store.CloseableResource {
+	public static class DomainModelScopeImpl implements DomainModelScope, AutoCloseable {
 		private final ServiceRegistryScope serviceRegistryScope;
 		private final DomainModelProducer producer;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/ServiceRegistryExtension.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/ServiceRegistryExtension.java
index d2f2cf4cac8f..18a3efbed80c 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/ServiceRegistryExtension.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/ServiceRegistryExtension.java
@@ -331,7 +331,7 @@ public void handleTestExecutionException(ExtensionContext context, Throwable thr
 		throw throwable;
 	}
 
-	private static class ServiceRegistryScopeImpl implements ServiceRegistryScope, ExtensionContext.Store.CloseableResource {
+	private static class ServiceRegistryScopeImpl implements ServiceRegistryScope, AutoCloseable {
 		private BootstrapServiceRegistryProducer bsrProducer;
 		private ServiceRegistryProducer ssrProducer;
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SessionFactoryExtension.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SessionFactoryExtension.java
index a1f6d65ddbf1..9aecfab6aa08 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SessionFactoryExtension.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/SessionFactoryExtension.java
@@ -232,7 +232,7 @@ public void handleTestExecutionException(ExtensionContext context, Throwable thr
 		throw throwable;
 	}
 
-	private static class SessionFactoryScopeImpl implements SessionFactoryScope, ExtensionContext.Store.CloseableResource {
+	private static class SessionFactoryScopeImpl implements SessionFactoryScope, AutoCloseable {
 		private final DomainModelScope modelScope;
 		private final SessionFactoryProducer producer;