diff --git a/spring-jms/src/test/java/org/springframework/jms/listener/MessageListenerContainerObservationTests.java b/spring-jms/src/test/java/org/springframework/jms/listener/MessageListenerContainerObservationTests.java
index 93342b00ff1..fa9a5eb7bee 100644
--- a/spring-jms/src/test/java/org/springframework/jms/listener/MessageListenerContainerObservationTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/listener/MessageListenerContainerObservationTests.java
@@ -28,9 +28,8 @@ import jakarta.jms.MessageListener;
 import jakarta.jms.TextMessage;
 import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
 import org.apache.activemq.artemis.junit.EmbeddedActiveMQExtension;
-import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.AutoClose;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -48,12 +47,14 @@ import static org.junit.jupiter.params.provider.Arguments.argumentSet;
  */
 class MessageListenerContainerObservationTests {
 
-	@RegisterExtension
+	@AutoClose("stop")
 	EmbeddedActiveMQExtension server = new EmbeddedActiveMQExtension();
 
+	@AutoClose
+	ActiveMQConnectionFactory connectionFactory;
+
 	TestObservationRegistry registry = TestObservationRegistry.create();
 
-	ActiveMQConnectionFactory connectionFactory;
 
 	@BeforeEach
 	void setupServer() {
@@ -145,10 +146,4 @@ class MessageListenerContainerObservationTests {
 		);
 	}
 
-	@AfterEach
-	void shutdownServer() {
-		connectionFactory.close();
-		server.stop();
-	}
-
 }
diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientResponseExceptionTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientResponseExceptionTests.java
index eb89c1276c5..0a1abfb514d 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientResponseExceptionTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientResponseExceptionTests.java
@@ -16,11 +16,9 @@
 
 package org.springframework.web.reactive.function.client;
 
-import java.util.stream.Stream;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.EnumSource;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
@@ -99,7 +97,7 @@ class WebClientResponseExceptionTests {
 	}
 
 	@ParameterizedTest
-	@MethodSource("httpStatusValues")
+	@EnumSource
 	void createExceptionWithStatus(HttpStatus status) {
 		WebClientResponseException exception = WebClientResponseException
 				.create(status, "reasonPhrase", new HttpHeaders(), new byte[0], null, null);
@@ -107,8 +105,4 @@ class WebClientResponseExceptionTests {
 		assertThat(exception.getStatusCode()).isEqualTo(status);
 	}
 
-	static Stream<HttpStatus> httpStatusValues() {
-		return Stream.of(HttpStatus.values());
-	}
-
 }