diff --git a/clients/src/test/java/org/apache/kafka/clients/consumer/KafkaConsumerTest.java b/clients/src/test/java/org/apache/kafka/clients/consumer/KafkaConsumerTest.java
index 5595ed2e214..1cd7b65f152 100644
--- a/clients/src/test/java/org/apache/kafka/clients/consumer/KafkaConsumerTest.java
+++ b/clients/src/test/java/org/apache/kafka/clients/consumer/KafkaConsumerTest.java
@@ -3330,19 +3330,18 @@ public void testClosingConsumerUnregistersConsumerMetrics(GroupProtocol groupPro
         ClientTelemetryReporter clientTelemetryReporter = mock(ClientTelemetryReporter.class);
         clientTelemetryReporter.configure(any());
 
-        MockedStatic<CommonClientConfigs> mockedCommonClientConfigs = mockStatic(CommonClientConfigs.class, new CallsRealMethods());
-        mockedCommonClientConfigs.when(() -> CommonClientConfigs.telemetryReporter(anyString(), any())).thenReturn(Optional.of(clientTelemetryReporter));
+        try (MockedStatic<CommonClientConfigs> mockedCommonClientConfigs = mockStatic(CommonClientConfigs.class, new CallsRealMethods())) {
+            mockedCommonClientConfigs.when(() -> CommonClientConfigs.telemetryReporter(anyString(), any())).thenReturn(Optional.of(clientTelemetryReporter));
 
-        ClientTelemetrySender clientTelemetrySender = mock(ClientTelemetrySender.class);
-        Uuid expectedUuid = Uuid.randomUuid();
-        when(clientTelemetryReporter.telemetrySender()).thenReturn(clientTelemetrySender);
-        when(clientTelemetrySender.clientInstanceId(any())).thenReturn(Optional.of(expectedUuid));
+            ClientTelemetrySender clientTelemetrySender = mock(ClientTelemetrySender.class);
+            Uuid expectedUuid = Uuid.randomUuid();
+            when(clientTelemetryReporter.telemetrySender()).thenReturn(clientTelemetrySender);
+            when(clientTelemetrySender.clientInstanceId(any())).thenReturn(Optional.of(expectedUuid));
 
-        consumer = newConsumer(props, new StringDeserializer(), new StringDeserializer());
-        Uuid uuid = consumer.clientInstanceId(Duration.ofMillis(0));
-        assertEquals(expectedUuid, uuid);
-
-        mockedCommonClientConfigs.close();
+            consumer = newConsumer(props, new StringDeserializer(), new StringDeserializer());
+            Uuid uuid = consumer.clientInstanceId(Duration.ofMillis(0));
+            assertEquals(expectedUuid, uuid);
+        }
     }
 
     @ParameterizedTest
diff --git a/clients/src/test/java/org/apache/kafka/clients/producer/KafkaProducerTest.java b/clients/src/test/java/org/apache/kafka/clients/producer/KafkaProducerTest.java
index 19c4b98ede2..3cb6fc0782d 100644
--- a/clients/src/test/java/org/apache/kafka/clients/producer/KafkaProducerTest.java
+++ b/clients/src/test/java/org/apache/kafka/clients/producer/KafkaProducerTest.java
@@ -1689,20 +1689,19 @@ public class KafkaProducerTest {
         ClientTelemetryReporter clientTelemetryReporter = mock(ClientTelemetryReporter.class);
         clientTelemetryReporter.configure(any());
 
-        MockedStatic<CommonClientConfigs> mockedCommonClientConfigs = mockStatic(CommonClientConfigs.class, new CallsRealMethods());
-        mockedCommonClientConfigs.when(() -> CommonClientConfigs.telemetryReporter(anyString(), any())).thenReturn(Optional.of(clientTelemetryReporter));
+        try (MockedStatic<CommonClientConfigs> mockedCommonClientConfigs = mockStatic(CommonClientConfigs.class, new CallsRealMethods())) {
+            mockedCommonClientConfigs.when(() -> CommonClientConfigs.telemetryReporter(anyString(), any())).thenReturn(Optional.of(clientTelemetryReporter));
 
-        ClientTelemetrySender clientTelemetrySender = mock(ClientTelemetrySender.class);
-        Uuid expectedUuid = Uuid.randomUuid();
-        when(clientTelemetryReporter.telemetrySender()).thenReturn(clientTelemetrySender);
-        when(clientTelemetrySender.clientInstanceId(any())).thenReturn(Optional.of(expectedUuid));
+            ClientTelemetrySender clientTelemetrySender = mock(ClientTelemetrySender.class);
+            Uuid expectedUuid = Uuid.randomUuid();
+            when(clientTelemetryReporter.telemetrySender()).thenReturn(clientTelemetrySender);
+            when(clientTelemetrySender.clientInstanceId(any())).thenReturn(Optional.of(expectedUuid));
 
-        KafkaProducer<String, String> producer = new KafkaProducer<>(props, new StringSerializer(), new StringSerializer());
-        Uuid uuid = producer.clientInstanceId(Duration.ofMillis(0));
-        assertEquals(expectedUuid, uuid);
-
-        mockedCommonClientConfigs.close();
-        producer.close();
+            try (KafkaProducer<String, String> producer = new KafkaProducer<>(props, new StringSerializer(), new StringSerializer())) {
+                Uuid uuid = producer.clientInstanceId(Duration.ofMillis(0));
+                assertEquals(expectedUuid, uuid);
+            }
+        }
     }
 
     @Test