diff --git a/clients/src/test/java/org/apache/kafka/clients/admin/MockAdminClient.java b/clients/src/test/java/org/apache/kafka/clients/admin/MockAdminClient.java
index 7c6a9559b8eed..e5ad5754a68e0 100644
--- a/clients/src/test/java/org/apache/kafka/clients/admin/MockAdminClient.java
+++ b/clients/src/test/java/org/apache/kafka/clients/admin/MockAdminClient.java
@@ -51,7 +51,6 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 public class MockAdminClient extends AdminClient {
     public static final String DEFAULT_CLUSTER_ID = "I4ZmrWqfT2e-upky_4fdPA";
@@ -532,9 +531,7 @@ synchronized private Config getResourceDescription(ConfigResource resource) {
                 if (topicMetadata != null && !topicMetadata.markedForDeletion) {
                     if (topicMetadata.fetchesRemainingUntilVisible > 0)
                         topicMetadata.fetchesRemainingUntilVisible = Math.max(0, topicMetadata.fetchesRemainingUntilVisible - 1);
-                    else return new Config(topicMetadata.configs.entrySet().stream()
-                                .map(entry -> new ConfigEntry(entry.getKey(), entry.getValue()))
-                                .collect(Collectors.toList()));
+                    else return toConfigObject(topicMetadata.configs);
 
                 }
                 throw new UnknownTopicOrPartitionException("Resource " + resource + " not found.");