diff --git a/connect/runtime/src/test/resources/test-plugins/bad-packaging/test/plugins/StaticInitializerThrowsRestExtension.java b/connect/runtime/src/test/resources/test-plugins/bad-packaging/test/plugins/StaticInitializerThrowsRestExtension.java
index 8ef0bdc10e97f..315d51a38966e 100644
--- a/connect/runtime/src/test/resources/test-plugins/bad-packaging/test/plugins/StaticInitializerThrowsRestExtension.java
+++ b/connect/runtime/src/test/resources/test-plugins/bad-packaging/test/plugins/StaticInitializerThrowsRestExtension.java
@@ -18,14 +18,10 @@
 package test.plugins;
 
 import java.io.IOException;
-import java.util.List;
 import java.util.Map;
 
-import org.apache.kafka.common.config.ConfigDef;
-import org.apache.kafka.connect.connector.Task;
 import org.apache.kafka.connect.rest.ConnectRestExtension;
 import org.apache.kafka.connect.rest.ConnectRestExtensionContext;
-import org.apache.kafka.connect.sink.SinkConnector;
 
 /**
  * Fake plugin class for testing classloading isolation.
diff --git a/connect/runtime/src/test/resources/test-plugins/classpath-converter/org/apache/kafka/connect/converters/ByteArrayConverter.java b/connect/runtime/src/test/resources/test-plugins/classpath-converter/org/apache/kafka/connect/converters/ByteArrayConverter.java
index 699d71635a042..8b99ec14bca8f 100644
--- a/connect/runtime/src/test/resources/test-plugins/classpath-converter/org/apache/kafka/connect/converters/ByteArrayConverter.java
+++ b/connect/runtime/src/test/resources/test-plugins/classpath-converter/org/apache/kafka/connect/converters/ByteArrayConverter.java
@@ -19,17 +19,14 @@
 import org.apache.kafka.common.config.ConfigDef;
 import org.apache.kafka.common.utils.AppInfoParser;
 import org.apache.kafka.connect.components.Versioned;
-import org.apache.kafka.connect.connector.Task;
 import org.apache.kafka.connect.data.Schema;
 import org.apache.kafka.connect.data.SchemaAndValue;
 import org.apache.kafka.connect.errors.DataException;
-import org.apache.kafka.connect.sink.SinkConnector;
 import org.apache.kafka.connect.storage.Converter;
 import org.apache.kafka.connect.storage.ConverterConfig;
 import org.apache.kafka.connect.storage.HeaderConverter;
 
 import java.nio.ByteBuffer;
-import java.util.List;
 import java.util.Map;
 
 public class ByteArrayConverter implements Converter, HeaderConverter, Versioned {
diff --git a/connect/runtime/src/test/resources/test-plugins/sampling-config-provider/test/plugins/SamplingConfigProvider.java b/connect/runtime/src/test/resources/test-plugins/sampling-config-provider/test/plugins/SamplingConfigProvider.java
index b0a79a18ef20b..deb9707370712 100644
--- a/connect/runtime/src/test/resources/test-plugins/sampling-config-provider/test/plugins/SamplingConfigProvider.java
+++ b/connect/runtime/src/test/resources/test-plugins/sampling-config-provider/test/plugins/SamplingConfigProvider.java
@@ -27,11 +27,7 @@
 import org.apache.kafka.common.config.provider.ConfigProvider;
 import org.apache.kafka.common.config.ConfigData;
 import org.apache.kafka.common.config.ConfigChangeCallback;
-import org.apache.kafka.connect.data.Schema;
-import org.apache.kafka.connect.data.SchemaAndValue;
-import org.apache.kafka.connect.storage.Converter;
 import org.apache.kafka.connect.runtime.isolation.SamplingTestPlugin;
-import org.apache.kafka.connect.storage.HeaderConverter;
 
 /**
  * Fake plugin class for testing classloading isolation.
diff --git a/connect/runtime/src/test/resources/test-plugins/sampling-connector/test/plugins/SamplingConnector.java b/connect/runtime/src/test/resources/test-plugins/sampling-connector/test/plugins/SamplingConnector.java
index 263b41ef50c88..1b60d6fa52610 100644
--- a/connect/runtime/src/test/resources/test-plugins/sampling-connector/test/plugins/SamplingConnector.java
+++ b/connect/runtime/src/test/resources/test-plugins/sampling-connector/test/plugins/SamplingConnector.java
@@ -17,7 +17,6 @@
 
 package test.plugins;
 
-import java.io.IOException;
 import java.util.Collections;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/connect/runtime/src/test/resources/test-plugins/sampling-header-converter/test/plugins/SamplingHeaderConverter.java b/connect/runtime/src/test/resources/test-plugins/sampling-header-converter/test/plugins/SamplingHeaderConverter.java
index 7f6df858f7758..91259a44dc767 100644
--- a/connect/runtime/src/test/resources/test-plugins/sampling-header-converter/test/plugins/SamplingHeaderConverter.java
+++ b/connect/runtime/src/test/resources/test-plugins/sampling-header-converter/test/plugins/SamplingHeaderConverter.java
@@ -26,7 +26,6 @@
 import org.apache.kafka.common.config.ConfigDef;
 import org.apache.kafka.connect.data.Schema;
 import org.apache.kafka.connect.data.SchemaAndValue;
-import org.apache.kafka.connect.storage.Converter;
 import org.apache.kafka.connect.runtime.isolation.SamplingTestPlugin;
 import org.apache.kafka.connect.storage.HeaderConverter;
 
diff --git a/connect/runtime/src/test/resources/test-plugins/subclass-of-classpath/test/plugins/SubclassOfClasspathOverridePolicy.java b/connect/runtime/src/test/resources/test-plugins/subclass-of-classpath/test/plugins/SubclassOfClasspathOverridePolicy.java
index 935aa7bee60b8..3378d06a29192 100644
--- a/connect/runtime/src/test/resources/test-plugins/subclass-of-classpath/test/plugins/SubclassOfClasspathOverridePolicy.java
+++ b/connect/runtime/src/test/resources/test-plugins/subclass-of-classpath/test/plugins/SubclassOfClasspathOverridePolicy.java
@@ -18,7 +18,6 @@
 package test.plugins;
 
 import org.apache.kafka.connect.connector.policy.AllConnectorClientConfigOverridePolicy;
-import org.apache.kafka.connect.converters.ByteArrayConverter;
 
 /**
  * Fake plugin class for testing classloading isolation.
diff --git a/connect/runtime/src/test/resources/test-plugins/versioned-predicate/test/plugins/VersionedPredicate.java b/connect/runtime/src/test/resources/test-plugins/versioned-predicate/test/plugins/VersionedPredicate.java
index 2e92c79c3517d..2b36647c90b8c 100644
--- a/connect/runtime/src/test/resources/test-plugins/versioned-predicate/test/plugins/VersionedPredicate.java
+++ b/connect/runtime/src/test/resources/test-plugins/versioned-predicate/test/plugins/VersionedPredicate.java
@@ -18,7 +18,6 @@
 package test.plugins;
 
 import org.apache.kafka.common.config.ConfigDef;
-import org.apache.kafka.common.utils.AppInfoParser;
 import org.apache.kafka.connect.components.Versioned;
 import org.apache.kafka.connect.connector.ConnectRecord;
 import org.apache.kafka.connect.transforms.predicates.Predicate;
diff --git a/connect/runtime/src/test/resources/test-plugins/versioned-transformation/test/plugins/VersionedTransformation.java b/connect/runtime/src/test/resources/test-plugins/versioned-transformation/test/plugins/VersionedTransformation.java
index 0422834d027cb..f5549f510e57d 100644
--- a/connect/runtime/src/test/resources/test-plugins/versioned-transformation/test/plugins/VersionedTransformation.java
+++ b/connect/runtime/src/test/resources/test-plugins/versioned-transformation/test/plugins/VersionedTransformation.java
@@ -18,7 +18,6 @@
 package test.plugins;
 
 import org.apache.kafka.common.config.ConfigDef;
-import org.apache.kafka.common.utils.AppInfoParser;
 import org.apache.kafka.connect.components.Versioned;
 import org.apache.kafka.connect.connector.ConnectRecord;
 import org.apache.kafka.connect.transforms.Transformation;
diff --git a/server-common/src/test/java/org/apache/kafka/server/common/MetadataVersionTest.java b/server-common/src/test/java/org/apache/kafka/server/common/MetadataVersionTest.java
index 508d4bd900bb1..9545266a8737e 100644
--- a/server-common/src/test/java/org/apache/kafka/server/common/MetadataVersionTest.java
+++ b/server-common/src/test/java/org/apache/kafka/server/common/MetadataVersionTest.java
@@ -23,7 +23,31 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EnumSource;
 
-import static org.apache.kafka.server.common.MetadataVersion.*;
+import static org.apache.kafka.server.common.MetadataVersion.IBP_3_3_IV3;
+import static org.apache.kafka.server.common.MetadataVersion.IBP_3_4_IV0;
+import static org.apache.kafka.server.common.MetadataVersion.IBP_3_5_IV0;
+import static org.apache.kafka.server.common.MetadataVersion.IBP_3_5_IV1;
+import static org.apache.kafka.server.common.MetadataVersion.IBP_3_5_IV2;
+import static org.apache.kafka.server.common.MetadataVersion.IBP_3_6_IV0;
+import static org.apache.kafka.server.common.MetadataVersion.IBP_3_6_IV1;
+import static org.apache.kafka.server.common.MetadataVersion.IBP_3_6_IV2;
+import static org.apache.kafka.server.common.MetadataVersion.IBP_3_7_IV0;
+import static org.apache.kafka.server.common.MetadataVersion.IBP_3_7_IV1;
+import static org.apache.kafka.server.common.MetadataVersion.IBP_3_7_IV2;
+import static org.apache.kafka.server.common.MetadataVersion.IBP_3_7_IV3;
+import static org.apache.kafka.server.common.MetadataVersion.IBP_3_7_IV4;
+import static org.apache.kafka.server.common.MetadataVersion.IBP_3_8_IV0;
+import static org.apache.kafka.server.common.MetadataVersion.IBP_3_9_IV0;
+import static org.apache.kafka.server.common.MetadataVersion.IBP_4_0_IV0;
+import static org.apache.kafka.server.common.MetadataVersion.IBP_4_0_IV1;
+import static org.apache.kafka.server.common.MetadataVersion.IBP_4_0_IV2;
+import static org.apache.kafka.server.common.MetadataVersion.IBP_4_0_IV3;
+import static org.apache.kafka.server.common.MetadataVersion.IBP_4_1_IV0;
+import static org.apache.kafka.server.common.MetadataVersion.IBP_4_1_IV1;
+import static org.apache.kafka.server.common.MetadataVersion.IBP_4_2_IV0;
+import static org.apache.kafka.server.common.MetadataVersion.IBP_4_2_IV1;
+import static org.apache.kafka.server.common.MetadataVersion.LATEST_PRODUCTION;
+import static org.apache.kafka.server.common.MetadataVersion.MINIMUM_VERSION;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;