diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/extension/engine/BytecodeEnhancedTestEngine.java b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/extension/engine/BytecodeEnhancedTestEngine.java
index 86914a9d2999..4ae99dfbb63c 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/extension/engine/BytecodeEnhancedTestEngine.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/extension/engine/BytecodeEnhancedTestEngine.java
@@ -39,6 +39,7 @@
 import org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor;
 import org.junit.jupiter.engine.descriptor.ClassTestDescriptor;
 import org.junit.jupiter.engine.descriptor.JupiterEngineDescriptor;
+import org.junit.jupiter.engine.descriptor.LauncherStoreFacade;
 import org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor;
 import org.junit.jupiter.engine.descriptor.TestTemplateTestDescriptor;
 import org.junit.jupiter.engine.execution.JupiterEngineExecutionContext;
@@ -215,7 +216,8 @@ private Method findMethodReplacement(ClassTestDescriptor updated, Method testMet
 	protected JupiterEngineExecutionContext createExecutionContext(ExecutionRequest request) {
 		return new JupiterEngineExecutionContext(
 				request.getEngineExecutionListener(),
-				this.getJupiterConfiguration( request )
+				this.getJupiterConfiguration( request ),
+				new LauncherStoreFacade( request.getStore() )
 		);
 	}
 
@@ -272,6 +274,11 @@ public boolean isParallelExecutionEnabled() {
 			return configuration.isParallelExecutionEnabled();
 		}
 
+		@Override
+		public boolean isClosingStoredAutoCloseablesEnabled() {
+			return configuration.isClosingStoredAutoCloseablesEnabled();
+		}
+
 		@Override
 		public boolean isExtensionAutoDetectionEnabled() {
 			return configuration.isExtensionAutoDetectionEnabled();
diff --git a/settings.gradle b/settings.gradle
index aa41fd2ebab6..4660a77deb53 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -164,7 +164,7 @@ dependencyResolutionManagement {
             library( "xjc", "org.glassfish.jaxb", "jaxb-xjc" ).versionRef( xjcVersion )
         }
         testLibs {
-            def junit5Version = version "junit5", "5.12.0"
+            def junit5Version = version "junit5", "5.13.0"
             def junit4Version = version "junit4", "4.13.2"
             def junit5LauncherVersion = version "junit5Launcher", "1.12.0"